Browse Source

属性值模型增加name

lv.wenbin 10 months ago
parent
commit
61d07bbc09

+ 34 - 32
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/ElecStoreHController.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/ElecStoreController.java

@@ -3,6 +3,7 @@ package com.ruoyi.ems.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.ems.domain.vo.ElecStoreAnalyze;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,12 +13,13 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.ems.domain.ElecStoreH;
-import com.ruoyi.ems.service.IElecStoreHService;
+import com.ruoyi.ems.service.IElecStoreService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -30,34 +32,39 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  * @date 2024-08-09
  */
 @RestController
-@RequestMapping("/elec/store/hour")
+@RequestMapping("/elec/store")
 @Api(value = "ElecStoreHController", description = "能计量-小时数据接口")
-public class ElecStoreHController extends BaseController
-{
+public class ElecStoreController extends BaseController {
     @Autowired
-    private IElecStoreHService elecStoreHService;
+    private IElecStoreService elecStoreService;
 
     /**
      * 查询储能计量-小时列表
      */
-    @RequiresPermissions("power-mgr:gs:list")
-    @GetMapping("/list")
-    public TableDataInfo list(ElecStoreH admEmsElecStoreH)
-    {
+    @GetMapping("/hour/list")
+    public TableDataInfo listHour(ElecStoreH admEmsElecStoreH) {
         startPage();
-        List<ElecStoreH> list = elecStoreHService.selectElecStoreHList(admEmsElecStoreH);
+        List<ElecStoreH> list = elecStoreService.selectHourList(admEmsElecStoreH);
         return getDataTable(list);
     }
 
     /**
+     * 查询储能计量-小时列表
+     */
+    @GetMapping("/day/analyze")
+    public AjaxResult getDayAnalyze(@RequestParam(name = "date") String date,
+        @RequestParam(name = "areaCode", required = false) String areaCode) {
+        ElecStoreAnalyze analyze = elecStoreService.getDayAnalysis(date, areaCode);
+        return success(analyze);
+    }
+
+    /**
      * 导出储能计量-小时列表
      */
-    @RequiresPermissions("power-mgr:gs:export")
     @Log(title = "储能计量-小时", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ElecStoreH admEmsElecStoreH)
-    {
-        List<ElecStoreH> list = elecStoreHService.selectElecStoreHList(admEmsElecStoreH);
+    @PostMapping("/hour/export")
+    public void export(HttpServletResponse response, ElecStoreH admEmsElecStoreH) {
+        List<ElecStoreH> list = elecStoreService.selectHourList(admEmsElecStoreH);
         ExcelUtil<ElecStoreH> util = new ExcelUtil<ElecStoreH>(ElecStoreH.class);
         util.exportExcel(response, list, "储能计量-小时数据");
     }
@@ -65,11 +72,9 @@ public class ElecStoreHController extends BaseController
     /**
      * 获取储能计量-小时详细信息
      */
-    @RequiresPermissions("power-mgr:gs:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(elecStoreHService.selectElecStoreHById(id));
+    @GetMapping(value = "/hour/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(elecStoreService.selectHourById(id));
     }
 
     /**
@@ -77,10 +82,9 @@ public class ElecStoreHController extends BaseController
      */
     @RequiresPermissions("power-mgr:gs:add")
     @Log(title = "储能计量-小时", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ElecStoreH admEmsElecStoreH)
-    {
-        return toAjax(elecStoreHService.insertElecStoreH(admEmsElecStoreH));
+    @PostMapping("/hour")
+    public AjaxResult add(@RequestBody ElecStoreH admEmsElecStoreH) {
+        return toAjax(elecStoreService.insertHour(admEmsElecStoreH));
     }
 
     /**
@@ -88,10 +92,9 @@ public class ElecStoreHController extends BaseController
      */
     @RequiresPermissions("power-mgr:gs:edit")
     @Log(title = "储能计量-小时", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ElecStoreH admEmsElecStoreH)
-    {
-        return toAjax(elecStoreHService.updateElecStoreH(admEmsElecStoreH));
+    @PutMapping("/hour")
+    public AjaxResult edit(@RequestBody ElecStoreH admEmsElecStoreH) {
+        return toAjax(elecStoreService.updateHour(admEmsElecStoreH));
     }
 
     /**
@@ -99,9 +102,8 @@ public class ElecStoreHController extends BaseController
      */
     @RequiresPermissions("power-mgr:gs:remove")
     @Log(title = "储能计量-小时", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(elecStoreHService.deleteElecStoreHByIds(ids));
+    @DeleteMapping("/hour/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(elecStoreService.deleteHourByIds(ids));
     }
 }

+ 14 - 1
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsObjAttrValue.java

@@ -25,6 +25,9 @@ public class EmsObjAttrValue
     /** 属性标识 */
     private String attrKey;
 
+    /** 属性名称 */
+    private String attrName;
+
     /** 属性值 */
     private String attrValue;
 
@@ -67,7 +70,16 @@ public class EmsObjAttrValue
     {
         return attrKey;
     }
-    public void setAttrValue(String attrValue) 
+
+    public String getAttrName() {
+        return attrName;
+    }
+
+    public void setAttrName(String attrName) {
+        this.attrName = attrName;
+    }
+
+    public void setAttrValue(String attrValue)
     {
         this.attrValue = attrValue;
     }
@@ -93,6 +105,7 @@ public class EmsObjAttrValue
             .append("objCode", getObjCode())
             .append("objType", getObjType())
             .append("attrKey", getAttrKey())
+            .append("attrName", getAttrName())
             .append("attrValue", getAttrValue())
             .append("modelCode", getModelCode())
             .toString();

+ 23 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/vo/ElecStoreAnalyze.java

@@ -0,0 +1,23 @@
+/*
+ * 文 件 名:  ElecStoreAnalyze
+ * 版    权:  浩鲸云计算科技股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2024/9/29
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.domain.vo;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2024/9/29]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+public class ElecStoreAnalyze {
+}

+ 6 - 6
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsElecStoreHMapper.java

@@ -17,7 +17,7 @@ public interface EmsElecStoreHMapper
      * @param id 储能计量-小时主键
      * @return 储能计量-小时
      */
-     ElecStoreH selectEmsElecStoreHById(Long id);
+     ElecStoreH selectStoreHById(Long id);
 
     /**
      * 查询储能计量-小时列表
@@ -25,7 +25,7 @@ public interface EmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 储能计量-小时集合
      */
-     List<ElecStoreH> selectEmsElecStoreHList(ElecStoreH admEmsElecStoreH);
+     List<ElecStoreH> selectStoreHList(ElecStoreH admEmsElecStoreH);
 
     /**
      * 新增储能计量-小时
@@ -33,7 +33,7 @@ public interface EmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 结果
      */
-     int insertEmsElecStoreH(ElecStoreH admEmsElecStoreH);
+     int insertStoreH(ElecStoreH admEmsElecStoreH);
 
     /**
      * 修改储能计量-小时
@@ -41,7 +41,7 @@ public interface EmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 结果
      */
-     int updateEmsElecStoreH(ElecStoreH admEmsElecStoreH);
+     int updateStoreH(ElecStoreH admEmsElecStoreH);
 
     /**
      * 删除储能计量-小时
@@ -49,7 +49,7 @@ public interface EmsElecStoreHMapper
      * @param id 储能计量-小时主键
      * @return 结果
      */
-     int deleteEmsElecStoreHById(Long id);
+     int deleteStoreHById(Long id);
 
     /**
      * 批量删除储能计量-小时
@@ -57,5 +57,5 @@ public interface EmsElecStoreHMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteEmsElecStoreHByIds(Long[] ids);
+     int deleteStoreHByIds(Long[] ids);
 }

+ 24 - 15
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecStoreHService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecStoreService.java

@@ -1,61 +1,70 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
+
 import com.ruoyi.ems.domain.ElecStoreH;
+import com.ruoyi.ems.domain.vo.ElecStoreAnalyze;
 
 /**
  * 储能计量-小时Service接口
- * 
+ *
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface IElecStoreHService
-{
+public interface IElecStoreService {
     /**
      * 查询储能计量-小时
-     * 
+     *
      * @param id 储能计量-小时主键
      * @return 储能计量-小时
      */
-     ElecStoreH selectElecStoreHById(Long id);
+    ElecStoreH selectHourById(Long id);
+
+    /**
+     * 获取日分析
+     * @param date 日期
+     * @param areaCode 区域编码
+     * @return 日分析
+     */
+    ElecStoreAnalyze getDayAnalysis(String date, String areaCode);
 
     /**
      * 查询储能计量-小时列表
-     * 
+     *
      * @param elecStoreH 储能计量-小时
      * @return 储能计量-小时集合
      */
-     List<ElecStoreH> selectElecStoreHList(ElecStoreH elecStoreH);
+    List<ElecStoreH> selectHourList(ElecStoreH elecStoreH);
 
     /**
      * 新增储能计量-小时
-     * 
+     *
      * @param elecStoreH 储能计量-小时
      * @return 结果
      */
-     int insertElecStoreH(ElecStoreH elecStoreH);
+    int insertHour(ElecStoreH elecStoreH);
 
     /**
      * 修改储能计量-小时
-     * 
+     *
      * @param elecStoreH 储能计量-小时
      * @return 结果
      */
-     int updateElecStoreH(ElecStoreH elecStoreH);
+    int updateHour(ElecStoreH elecStoreH);
 
     /**
      * 批量删除储能计量-小时
-     * 
+     *
      * @param ids 需要删除的储能计量-小时主键集合
      * @return 结果
      */
-     int deleteElecStoreHByIds(Long[] ids);
+    int deleteHourByIds(Long[] ids);
 
     /**
      * 删除储能计量-小时信息
-     * 
+     *
      * @param id 储能计量-小时主键
      * @return 结果
      */
-     int deleteElecStoreHById(Long id);
+    int deleteHourById(Long id);
 }

+ 21 - 14
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/ElecStoreHServiceImpl.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/ElecStoreServiceImpl.java

@@ -1,11 +1,13 @@
 package com.ruoyi.ems.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.ems.domain.vo.ElecStoreAnalyze;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.ems.mapper.EmsElecStoreHMapper;
 import com.ruoyi.ems.domain.ElecStoreH;
-import com.ruoyi.ems.service.IElecStoreHService;
+import com.ruoyi.ems.service.IElecStoreService;
 
 /**
  * 储能计量-小时Service业务层处理
@@ -14,7 +16,7 @@ import com.ruoyi.ems.service.IElecStoreHService;
  * @date 2024-08-09
  */
 @Service
-public class ElecStoreHServiceImpl implements IElecStoreHService
+public class ElecStoreServiceImpl implements IElecStoreService
 {
     @Autowired
     private EmsElecStoreHMapper elecStoreHMapper;
@@ -26,9 +28,14 @@ public class ElecStoreHServiceImpl implements IElecStoreHService
      * @return 储能计量-小时
      */
     @Override
-    public ElecStoreH selectElecStoreHById(Long id)
+    public ElecStoreH selectHourById(Long id)
     {
-        return elecStoreHMapper.selectEmsElecStoreHById(id);
+        return elecStoreHMapper.selectStoreHById(id);
+    }
+
+    @Override
+    public ElecStoreAnalyze getDayAnalysis(String date, String areaCode) {
+        return null;
     }
 
     /**
@@ -38,9 +45,9 @@ public class ElecStoreHServiceImpl implements IElecStoreHService
      * @return 储能计量-小时
      */
     @Override
-    public List<ElecStoreH> selectElecStoreHList(ElecStoreH admEmsElecStoreH)
+    public List<ElecStoreH> selectHourList(ElecStoreH admEmsElecStoreH)
     {
-        return elecStoreHMapper.selectEmsElecStoreHList(admEmsElecStoreH);
+        return elecStoreHMapper.selectStoreHList(admEmsElecStoreH);
     }
 
     /**
@@ -50,9 +57,9 @@ public class ElecStoreHServiceImpl implements IElecStoreHService
      * @return 结果
      */
     @Override
-    public int insertElecStoreH(ElecStoreH admEmsElecStoreH)
+    public int insertHour(ElecStoreH admEmsElecStoreH)
     {
-        return elecStoreHMapper.insertEmsElecStoreH(admEmsElecStoreH);
+        return elecStoreHMapper.insertStoreH(admEmsElecStoreH);
     }
 
     /**
@@ -62,9 +69,9 @@ public class ElecStoreHServiceImpl implements IElecStoreHService
      * @return 结果
      */
     @Override
-    public int updateElecStoreH(ElecStoreH admEmsElecStoreH)
+    public int updateHour(ElecStoreH admEmsElecStoreH)
     {
-        return elecStoreHMapper.updateEmsElecStoreH(admEmsElecStoreH);
+        return elecStoreHMapper.updateStoreH(admEmsElecStoreH);
     }
 
     /**
@@ -74,9 +81,9 @@ public class ElecStoreHServiceImpl implements IElecStoreHService
      * @return 结果
      */
     @Override
-    public int deleteElecStoreHByIds(Long[] ids)
+    public int deleteHourByIds(Long[] ids)
     {
-        return elecStoreHMapper.deleteEmsElecStoreHByIds(ids);
+        return elecStoreHMapper.deleteStoreHByIds(ids);
     }
 
     /**
@@ -86,8 +93,8 @@ public class ElecStoreHServiceImpl implements IElecStoreHService
      * @return 结果
      */
     @Override
-    public int deleteElecStoreHById(Long id)
+    public int deleteHourById(Long id)
     {
-        return elecStoreHMapper.deleteEmsElecStoreHById(id);
+        return elecStoreHMapper.deleteStoreHById(id);
     }
 }

+ 10 - 10
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsElecStoreHMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ems.mapper.EmsElecStoreHMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.ElecStoreH" id="EmsElecStoreHResult">
+    <resultMap type="com.ruoyi.ems.domain.ElecStoreH" id="StoreHResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
         <result property="areaName"       column="area_name"    />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dischargeElecQuantity"    column="discharge_elec_quantity"    />
     </resultMap>
 
-    <sql id="selectEmsElecStoreHVo">
+    <sql id="selectStoreHVo">
         SELECT
             st.id,
             st.area_code,
@@ -39,8 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN adm_service_area area ON st.area_code = area.area_code
     </sql>
 
-    <select id="selectEmsElecStoreHList" parameterType="com.ruoyi.ems.domain.ElecStoreH" resultMap="EmsElecStoreHResult">
-        <include refid="selectEmsElecStoreHVo"/>
+    <select id="selectStoreHList" parameterType="com.ruoyi.ems.domain.ElecStoreH" resultMap="StoreHResult">
+        <include refid="selectStoreHVo"/>
         <where>
             <if test="areaCode != null  and areaCode != ''"> and st.area_code = #{areaCode}</if>
             <if test="facsCode != null  and facsCode != ''"> and st.facs_code = #{facsCode}</if>
@@ -50,12 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectEmsElecStoreHById" parameterType="Long" resultMap="EmsElecStoreHResult">
-        <include refid="selectEmsElecStoreHVo"/>
+    <select id="selectStoreHById" parameterType="Long" resultMap="StoreHResult">
+        <include refid="selectStoreHVo"/>
         where st.id = #{id}
     </select>
 
-    <insert id="insertEmsElecStoreH" parameterType="com.ruoyi.ems.domain.ElecStoreH" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertStoreH" parameterType="com.ruoyi.ems.domain.ElecStoreH" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_elec_store_h
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateEmsElecStoreH" parameterType="com.ruoyi.ems.domain.ElecStoreH">
+    <update id="updateStoreH" parameterType="com.ruoyi.ems.domain.ElecStoreH">
         update adm_ems_elec_store_h
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -94,11 +94,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteEmsElecStoreHById" parameterType="Long">
+    <delete id="deleteStoreHById" parameterType="Long">
         delete from adm_ems_elec_store_h where id = #{id}
     </delete>
 
-    <delete id="deleteEmsElecStoreHByIds" parameterType="String">
+    <delete id="deleteStoreHByIds" parameterType="String">
         delete from adm_ems_elec_store_h where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

+ 7 - 3
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsObjAttrValueMapper.xml

@@ -9,12 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="objCode"    column="obj_code"    />
         <result property="objType"    column="obj_type"    />
         <result property="attrKey"    column="attr_key"    />
+        <result property="attrName"    column="attr_name"    />
         <result property="attrValue"    column="attr_value"    />
         <result property="modelCode"    column="model_code"    />
     </resultMap>
 
     <sql id="selectObjAttrValueVo">
-        select id, obj_code, obj_type, attr_key, attr_value, model_code from adm_ems_obj_attr_value
+        select id, obj_code, obj_type, attr_key, attr_name, attr_value, model_code from adm_ems_obj_attr_value
     </sql>
 
     <select id="selectObjAttrValueList" parameterType="com.ruoyi.ems.domain.EmsObjAttrValue" resultMap="objAttrValueResult">
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="objCode != null and objCode != ''">obj_code,</if>
             <if test="objType != null">obj_type,</if>
             <if test="attrKey != null and attrKey != ''">attr_key,</if>
+            <if test="attrName != null and attrName != ''">attr_name,</if>
             <if test="attrValue != null">attr_value,</if>
             <if test="modelCode != null">model_code,</if>
          </trim>
@@ -50,16 +52,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="objCode != null and objCode != ''">#{objCode},</if>
             <if test="objType != null">#{objType},</if>
             <if test="attrKey != null and attrKey != ''">#{attrKey},</if>
+            <if test="attrName != null and attrName != ''">#{attrName},</if>
             <if test="attrValue != null">#{attrValue},</if>
             <if test="modelCode != null">#{modelCode},</if>
          </trim>
     </insert>
 
     <insert id="insertBatch" parameterType="java.util.List" >
-        insert into adm_ems_obj_attr_value (obj_code, obj_type, attr_key, attr_value, model_code)
+        insert into adm_ems_obj_attr_value (obj_code, obj_type, attr_key, attr_name, attr_value, model_code)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.objCode}, #{item.objType}, #{item.attrKey}, #{item.attrValue}, #{item.modelCode})
+            (#{item.objCode}, #{item.objType}, #{item.attrKey}, #{item.attrName}, #{item.attrValue}, #{item.modelCode})
         </foreach>
     </insert>
 
@@ -69,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="objCode != null and objCode != ''">obj_code = #{objCode},</if>
             <if test="objType != null">obj_type = #{objType},</if>
             <if test="attrKey != null and attrKey != ''">attr_key = #{attrKey},</if>
+            <if test="attrName != null and attrName != ''">attr_name = #{attrName},</if>
             <if test="attrValue != null">attr_value = #{attrValue},</if>
             <if test="modelCode != null">model_code = #{modelCode},</if>
         </trim>

+ 13 - 12
ems-cloud/sql/ems_init_data.sql

@@ -128,18 +128,19 @@ INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`) VALUES
 INSERT INTO `adm_ems_obj_attr` (`model_code`, `attr_type`, `attr_key`, `attr_name`, `attr_unit`) VALUES ('M_Z010', 0, 'power',   '功率', 'kW-h');
 
 -- 对象属性DEMO数据
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-B-1001-QR_00', 3, 'onOffState', 'on', 'M_W2_QR');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-B-1001-QF_01', 3, 'onOffState', 'off', 'M_W2_QF');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-B-1001-QF_02', 3, 'onOffState', 'on', 'M_W2_QF');
-
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-B-T-1001', 2, 'ratedCapacity', '1000', 'M_W2_T');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-B-T-1001', 2, 'ratedVoltage', '10', 'M_W2_T');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-B-T-1001', 2, 'ratedFrequency', '50', 'M_W2_T');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-B-T-1001', 2, 'phaseNumber', '3', 'M_W2_T');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-N-T-1002', 2, 'ratedCapacity', '1000', 'M_W2_T');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-N-T-1002', 2, 'ratedVoltage', '10', 'M_W2_T');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-N-T-1002', 2, 'ratedFrequency', '50', 'M_W2_T');
-INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_value`, `model_code`) VALUES ('D-N-T-1002', 2, 'phaseNumber', '3', 'M_W2_T');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-B-1001-QR_00', 3, 'onOffState', '开关状态', 'on', 'M_W2_QR');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-B-1001-QF_01', 3, 'onOffState', '开关状态', 'off', 'M_W2_QF');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-B-1001-QF_02', 3, 'onOffState', '开关状态', 'on', 'M_W2_QF');
+
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-B-T-1001', 2, 'ratedCapacity', '额定容量', '1000', 'M_W2_T');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-B-T-1001', 2, 'ratedVoltage', '额定电压', '10', 'M_W2_T');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-B-T-1001', 2, 'ratedFrequency', '额定频率', '50', 'M_W2_T');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-B-T-1001', 2, 'phaseNumber', '相数', '3', 'M_W2_T');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-N-T-1002', 2, 'ratedCapacity', '额定容量', '1000', 'M_W2_T');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-N-T-1002', 2, 'ratedVoltage', '额定电压', '10', 'M_W2_T');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-N-T-1002', 2, 'ratedFrequency', '额定频率', '50', 'M_W2_T');
+INSERT INTO `adm_ems_obj_attr_value` (`obj_code`, `obj_type`, `attr_key`, `attr_name`, `attr_value`, `model_code`) VALUES ('D-N-T-1002', 2, 'phaseNumber', '3', '相数', 'M_W2_T');
+
 
 -- 对象能力DEMO数据
 INSERT INTO `adm_ems_obj_ability` (`model_code`, `ability_key`, `ability_name`, `ability_desc`, `ability_param`)VALUES ('M_W2_QR', '漏电保护器模型', 2);

+ 1 - 0
ems-cloud/sql/ems_server.sql

@@ -592,6 +592,7 @@ create table adm_ems_obj_attr_value  (
   `obj_code`        varchar(64)     not null                     comment '对象代码',
   `obj_type`        int             not null                     comment '对象类型',
   `attr_key`        varchar(128)    not null                     comment '属性标识',
+  `attr_name`       varchar(256)    default null                 comment '属性名称',
   `attr_value`      varchar(32)     default null                 comment '属性值',
   `model_code`      varchar(64)     default null                 comment '模型code',
   primary key (`id`),