change - 传感器汇总优化

ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js

@@ -51,7 +51,7 @@ const sensorInfoList = function (sensorTypeId) {
                     if (property != "id" && property != "edgeId" && property != "sensorId" && property != 'sensorLocation' && property != 'datatype') {
                         columnsArray.push({
                             field: property,
-                            title: sensorTypeArray.find(array => array.paramTitle === property).paramText,
+                            title: sensorTypeArray.length == 0 ? property : sensorTypeArray.find(array => array.paramTitle === property).paramText,
                             width: property === "imgstr" ? 500 : 160,
                             align: "center",
                         });

ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml

@@ -32,10 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectSysParamConfigByObjId" parameterType="Long" resultMap="SysParamConfigResult">
         <include refid="selectSysParamConfigVo"/>
-        where ObjId = #{ObjId}
+        where ObjId = #{objId}
     </select>
         
-    <insert id="insertSysParamConfig" parameterType="SysParamConfig" useGeneratedKeys="true" keyProperty="ObjId">
+    <insert id="insertSysParamConfig" parameterType="SysParamConfig" useGeneratedKeys="true" keyProperty="objId">
         insert into sys_param_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="paramType != null">Param_Type,</if>
@@ -80,8 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <delete id="deleteSysParamConfigByObjIds" parameterType="String">
         delete from sys_param_config where ObjId in
-        <foreach item="ObjId" collection="array" open="(" separator="," close=")">
-            #{ObjId}
+        <foreach item="objId" collection="array" open="(" separator="," close=")">
+            #{objId}
         </foreach>
     </delete>