对象类型统一调整

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/ElecAttrController.java

@@ -62,9 +62,18 @@ public class ElecAttrController extends BaseController {
      * 获取服务区用电属性详细信息
      */
     @RequiresPermissions("basecfg:price:query")
-    @GetMapping(value = "/getByArea")
-    public AjaxResult getByArea(@RequestParam(name="areaCode") String areaCode) {
-        return success(attrService.getElecAttrByArea(areaCode));
+    @GetMapping(value = "/getEffectiveListByArea")
+    public AjaxResult getEffectiveListByArea(@RequestParam(name="areaCode") String areaCode) {
+        return success(attrService.getEffectiveListByArea(areaCode));
+    }
+
+    /**
+     * 获取服务区用电属性详细信息
+     */
+    @RequiresPermissions("basecfg:price:query")
+    @GetMapping(value = "/getEffectiveByArea")
+    public AjaxResult getEffectiveByArea(@RequestParam(name="areaCode") String areaCode) {
+        return success(attrService.getEffectiveByArea(areaCode));
     }
 
     /**

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ElecAttr.java

@@ -48,11 +48,6 @@ public class ElecAttr
     @Excel(name = "最大需量（千瓦·月）")
     private Long reqQuantity;
 
-    /**
-     * 状态
-     */
-    private int state;
-
     public Long getId() {
         return id;
     }
@@ -133,14 +128,6 @@ public class ElecAttr
         this.reqQuantity = reqQuantity;
     }
 
-    public int getState() {
-        return state;
-    }
-
-    public void setState(int state) {
-        this.state = state;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IElecAttrService.java

@@ -25,7 +25,14 @@ public interface IElecAttrService {
      * @param areaCode 区域编码
      * @return 服务区用电属性
      */
-    List<ElecAttr> getElecAttrByArea(String areaCode);
+    List<ElecAttr> getEffectiveListByArea(String areaCode);
+
+    /**
+     * 获取区域当前生效的用电属性
+     * @param areaCode 区域代码
+     * @return 用电属性
+     */
+    ElecAttr getEffectiveByArea(String areaCode);
 
     /**
      * 查询服务区用电属性列表

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AreaElectricityAttrServiceImpl.java

@@ -43,7 +43,7 @@ public class AreaElectricityAttrServiceImpl implements IElecAttrService {
     }
 
     @Override
-    public List<ElecAttr> getElecAttrByArea(String areaCode) {
+    public List<ElecAttr> getEffectiveListByArea(String areaCode) {
         List<ElecAttr> elecAttrs = areaAttrMapper.selectElecAttrList(new ElecAttr());
         Map<String, ElecAttr> elecAttrMap = elecAttrs.stream()
             .collect(Collectors.toMap(ElecAttr::getAreaCode, Function.identity()));
@@ -54,19 +54,15 @@ public class AreaElectricityAttrServiceImpl implements IElecAttrService {
         LinkedList<ElecAttr> retList = new LinkedList<>();
         Area area = areaMap.get(areaCode);
         Assert.notNull(area, -1, "区域不存在!");
-        int state = 1;
 
         do {
             ElecAttr elecAttr = elecAttrMap.get(area.getAreaCode());
 
             if (null != elecAttr) {
                 if (retList.isEmpty()) {
-                    elecAttr.setState(state);
                     retList.add(elecAttr);
-                    state = 0;
                 }
                 else {
-                    elecAttr.setState(state);
                     retList.addFirst(elecAttr);
                 }
             }
@@ -78,6 +74,33 @@ public class AreaElectricityAttrServiceImpl implements IElecAttrService {
         return retList;
     }
 
+    @Override
+    public ElecAttr getEffectiveByArea(String areaCode) {
+        ElecAttr elecAttr = null;
+        List<ElecAttr> elecAttrs = areaAttrMapper.selectElecAttrList(new ElecAttr());
+        Map<String, ElecAttr> elecAttrMap = elecAttrs.stream()
+            .collect(Collectors.toMap(ElecAttr::getAreaCode, Function.identity()));
+
+        List<Area> areas = areaService.selectArea(new Area());
+        Map<String, Area> areaMap = areas.stream().collect(Collectors.toMap(Area::getAreaCode, Function.identity()));
+
+        Area area = areaMap.get(areaCode);
+        Assert.notNull(area, -1, "区域不存在!");
+
+        do {
+            elecAttr = elecAttrMap.get(area.getAreaCode());
+
+            if (null != elecAttr) {
+                break;
+            }
+
+            area = areaMap.get(area.getParentCode());
+        }
+        while (null != area);
+
+        return elecAttr;
+    }
+
     /**
      * 查询服务区用电属性列表
      *

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecLoadIndex15minMapper.xml

@@ -47,8 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="objCode != null and objCode != ''">
           i.obj_code,
           CASE
-            WHEN i.obj_type = 1 THEN f.facs_name
-            WHEN i.obj_type = 2 THEN d.device_name
+            WHEN i.obj_type = 1 THEN a2.area_name
+            WHEN i.obj_type = 2 THEN f.facs_name
+            WHEN i.obj_type = 3 THEN d.device_name
           END as obj_name,
         </if>
         <if test="(facsCategory != null and facsCategory != '') or (facsSubCategory != null and facsSubCategory != '')">
@@ -84,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="objCode != null and objCode != ''">
             LEFT JOIN adm_ems_facs f ON i.`obj_code` = f.`facs_code`
             LEFT JOIN adm_ems_device d ON i.`obj_code` = d.`device_code`
+            LEFT JOIN adm_ems_area a2 ON i.`obj_code` = a2.`area_code`
         </if>
         <if test="(facsCategory != null  and facsCategory != '') or (facsSubCategory != null  and facsSubCategory != '')">
             LEFT JOIN adm_ems_facs fa ON i.`obj_code` = fa.`facs_code`

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecUseHMapper.xml

@@ -33,8 +33,9 @@
                u.obj_type,
                u.obj_code,
                CASE
-                   WHEN u.obj_type = 1 THEN f.facs_name
-                   WHEN u.obj_type = 2 THEN d.device_name
+                   WHEN u.obj_type = 1 THEN a2.area_name
+                   WHEN u.obj_type = 2 THEN f.facs_name
+                   WHEN u.obj_type = 3 THEN d.device_name
                END as obj_name,
                f.facs_category,
                f.facs_subcategory,
@@ -45,6 +46,7 @@
                u.elec_quantity
         from adm_ems_obj_use_h u
                  LEFT JOIN adm_area a ON u.`area_code` = a.`area_code`
+                 LEFT JOIN adm_area a2 ON u.`obj_code` = a2.`area_code`
                  LEFT JOIN adm_ems_facs f ON u.`obj_code` = f.`facs_code`
                  LEFT JOIN adm_ems_device d ON u.`obj_code` = d.`device_code`
     </sql>
@@ -80,8 +82,9 @@
         <if test="objCode != null and objCode != ''">
             u.obj_code,
             CASE
-            WHEN u.obj_type = 1 THEN f.facs_name
-            WHEN u.obj_type = 2 THEN d.device_name
+              WHEN u.obj_type = 1 THEN a2.area_name
+              WHEN u.obj_type = 2 THEN f.facs_name
+              WHEN u.obj_type = 3 THEN d.device_name
             END as obj_name,
         </if>
         <if test="(facsCategory != null and facsCategory != '') or (facsSubCategory != null and facsSubCategory != '')">
@@ -104,6 +107,7 @@
             </if>
         </if>
         <if test="objCode != null and objCode != ''">
+            LEFT JOIN adm_area a2 ON u.`obj_code` = a2.`area_code`
             LEFT JOIN adm_ems_facs f ON u.`obj_code` = f.`facs_code`
             LEFT JOIN adm_ems_device d ON u.`obj_code` = d.`device_code`
         </if>
@@ -131,8 +135,9 @@
             <if test="objCode != null and objCode != ''">
               u.obj_code,
               CASE
-                WHEN u.obj_type = 1 THEN f.facs_name
-                WHEN u.obj_type = 2 THEN d.device_name
+                WHEN u.obj_type = 1 THEN a2.area_name
+                WHEN u.obj_type = 2 THEN f.facs_name
+                WHEN u.obj_type = 3 THEN d.device_name
               END as obj_name,
             </if>
             <if test="(facsCategory != null and facsCategory != '') or (facsSubCategory != null and facsSubCategory != '')">
@@ -158,6 +163,7 @@
               </if>
             </if>
             <if test="objCode != null and objCode != ''">
+              LEFT JOIN adm_area a2 ON u.`obj_code` = a2.`area_code`
               LEFT JOIN adm_ems_facs f ON u.`obj_code` = f.`facs_code`
               LEFT JOIN adm_ems_device d ON u.`obj_code` = d.`device_code`
             </if>
@@ -193,7 +199,7 @@
             left join adm_ems_obj_use_h u on f.facs_code = u.obj_code
             <where>
               f.facs_category = 'Z'
-              and u.obj_type = 1
+              and u.obj_type = 2
               <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and f.ref_area = #{areaCode}</if>
               <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
                   and u.record_time &gt;= #{startRecTime} and u.record_time &lt;= #{endRecTime}
@@ -213,7 +219,7 @@
           left join adm_ems_obj_use_h u on f.facs_code = u.obj_code
         <where>
             <if test="facsSubCategory != null and facsSubCategory != ''">and f.facs_subcategory = #{facsSubCategory}</if>
-            and u.obj_type = 1
+            and u.obj_type = 2
             <if test="objCode != null and objCode != ''">and f.facs_code = #{objCode}</if>
             <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and u.area_code = #{areaCode}</if>
             <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime !=''">

ems-cloud/sql/ems_init_data.sql

@@ -689,53 +689,27 @@ INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`
 
 
 -- 设施用能计量demo数据
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 1, 'Z101', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 1, 'Z102', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 1, 'Z110', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 1, 'Z120', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 1, 'Z201', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 1, 'Z202', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 1, 'Z210', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 1, 'Z220', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
-
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 00:00:00', '2024-09-01', '00:00:00', 1, 12);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 01:00:00', '2024-09-01', '01:00:00', 2, 13);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 02:00:00', '2024-09-01', '02:00:00', 3, 10);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 03:00:00', '2024-09-01', '03:00:00', 4, 13);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 04:00:00', '2024-09-01', '04:00:00', 5, 15);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 05:00:00', '2024-09-01', '05:00:00', 6, 12);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 06:00:00', '2024-09-01', '06:00:00', 7, 8);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 07:00:00', '2024-09-01', '07:00:00', 8, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 08:00:00', '2024-09-01', '08:00:00', 9, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 09:00:00', '2024-09-01', '09:00:00', 10, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 10:00:00', '2024-09-01', '10:00:00', 11, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 11:00:00', '2024-09-01', '11:00:00', 12, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 12:00:00', '2024-09-01', '12:00:00', 13, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 13:00:00', '2024-09-01', '13:00:00', 14, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 14:00:00', '2024-09-01', '14:00:00', 15, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 15:00:00', '2024-09-01', '15:00:00', 16, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 16:00:00', '2024-09-01', '16:00:00', 17, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 17:00:00', '2024-09-01', '17:00:00', 18, 0);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 18:00:00', '2024-09-01', '18:00:00', 19, 10);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 19:00:00', '2024-09-01', '19:00:00', 20, 13);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 20:00:00', '2024-09-01', '20:00:00', 21, 20);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 21:00:00', '2024-09-01', '21:00:00', 22, 17);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 22:00:00', '2024-09-01', '22:00:00', 23, 15);
-INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `device_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 'Z101', NULL, '2024-09-01 23:00:00', '2024-09-01', '23:00:00', 24, 13);
-
+INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 2, 'Z101', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
+INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 2, 'Z102', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
+INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 2, 'Z110', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
+INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3001', 2, 'Z120', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
+INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 2, 'Z201', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
+INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 2, 'Z202', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
+INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 2, 'Z210', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
+INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 2, 'Z220', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
 
 -- 电力负荷数据
 ---- 储能负荷
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 1, 'C101', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 1, 'C102', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+--INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'C101', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+--INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'C102', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
 
 ---- 变压器负荷
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'D-B-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'D-N-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+--INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 3, 'D-B-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+--INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 3, 'D-N-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
 
 ---- 空调负荷
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 1, 'Z120', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 1, 'Z220', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+--INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'Z120', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+--INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'Z220', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
 
 
 -- 台账数据