设备新增字段

Administrator

2021-05-13 3193235953657c1c6c9c9b01aa421f7b7edd6dea

设备新增字段

 blade-service/blade-jfpts/pom.xml

@@ -39,6 +39,21 @@
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-common</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-dict-api</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-scope-api</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-jfpts-api</artifactId>
            <version>${bladex.project.version}</version>
        </dependency>

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java

@@ -415,7 +415,7 @@
//            catalogService.updateCatalog(deviceName,deviceNumber,pId);
//        }

		

        return R.status(equipmentService.saveOrUpdate(equipment));
    }


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java

@@ -141,4 +141,33 @@
     */
    private String manufacturers;

    /**
     * 设备型号
     */
    @TableField("eq_model")
    private String eqModel;

    /**
     * 产品id，onenetstudio 平台生成
     */
    @TableField("pro_id")
    private String proId;

    /**
     * 设备秘钥，onenetstudio 平台生成
     */
    @TableField("eq_secret")
    private String eqSecret;

    /**
     * 设备名称，onenetstudio 平台生成
     */
    @TableField("eq_name")
    private String eqName;

    /**
     * 联网方式
     */
    @TableField("net_type")
    private String netType;
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java

@@ -109,4 +109,5 @@
     * @param equipmentListl 设备信息集合
     */
    void updateEqListl(@Param("equipmentListl") List<Long> equipmentListl);

}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -31,6 +31,10 @@
        <result column="reason" property="reason"/>
        <result column="jtype" property="jtype"/>
        <result column="manufacturers" property="manufacturers"/>
        <result column="eqModel" property="eqModel"/>
        <result column="proId" property="proId"/>
        <result column="eqSecret" property="eqSecret"/>
        <result column="eqName" property="eqName"/>
    </resultMap>

    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -503,4 +507,5 @@
            #{id}
        </foreach>
    </update>

</mapper>