绑定关系增加字段

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

@@ -27,6 +27,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-08-15
  */
+@Deprecated
 @RestController
 @RequestMapping("/elec/use")
 @Api(value = "ElecUseHController", description = "用电计量数据接口")

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

@@ -1,29 +1,25 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+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.MeterBoundaryRel;
+import com.ruoyi.ems.service.IMeterBoundaryRelService;
 import io.swagger.annotations.Api;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-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.MeterBoundaryRel;
-import com.ruoyi.ems.service.IMeterBoundaryRelService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+
+import java.util.List;
 
 /**
  * 计量设备绑定边界对象关系Controller
@@ -44,8 +40,8 @@ public class MeterBoundaryRelController extends BaseController {
     @RequiresPermissions("ems:meterBoundaryRel:list")
     @GetMapping("/listByObj")
     public AjaxResult list(@RequestParam(value = "objType") Integer objType,
-        @RequestParam(value = "boundaryObj") String boundaryObj) {
-        List<MeterBoundaryRel> list = relService.selectRelByObj(objType, boundaryObj);
+        @RequestParam(value = "boundaryObj") String boundaryObj, @RequestParam(value = "meterCls") Integer meterCls) {
+        List<MeterBoundaryRel> list = relService.selectRelByObj(objType, boundaryObj, meterCls);
         return success(list);
     }
 
@@ -54,19 +50,39 @@ public class MeterBoundaryRelController extends BaseController {
      */
     @RequiresPermissions("ems:meterBoundaryRel:add")
     @Log(title = "计量设备绑定边界对象关系", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody List<MeterBoundaryRel> list) {
+    @PostMapping("/addBatch")
+    public AjaxResult addBatch(@RequestBody List<MeterBoundaryRel> list) {
         return toAjax(relService.insertRelBatch(list));
     }
 
     /**
+     * 新增计量设备绑定边界对象关系
+     */
+    @RequiresPermissions("ems:meterBoundaryRel:add")
+    @Log(title = "计量设备绑定边界对象关系", businessType = BusinessType.UPDATE)
+    @PutMapping("/merge")
+    public AjaxResult merge(@RequestParam(value = "objType") Integer objType,
+        @RequestParam(value = "boundaryObj") String boundaryObj, @RequestParam(value = "meterCls") Integer meterCls,
+        @RequestBody List<MeterBoundaryRel> list) {
+
+        relService.deleteRelByObj(objType, boundaryObj, meterCls);
+        int cnt = 0;
+
+        if (CollectionUtils.isNotEmpty(list)) {
+            cnt = relService.insertRelBatch(list);
+        }
+
+        return toAjax(cnt);
+    }
+
+    /**
      * 删除计量设备绑定边界对象关系
      */
     @RequiresPermissions("ems:meterBoundaryRel:remove")
     @Log(title = "计量设备绑定边界对象关系", businessType = BusinessType.DELETE)
     @DeleteMapping("/delByObj")
     public AjaxResult delByObj(@RequestParam(value = "objType") Integer objType,
-        @RequestParam(value = "boundaryObj") String boundaryObj) {
-        return toAjax(relService.deleteRelByObj(objType, boundaryObj));
+        @RequestParam(value = "boundaryObj") String boundaryObj, @RequestParam(value = "meterCls") Integer meterCls) {
+        return toAjax(relService.deleteRelByObj(objType, boundaryObj, meterCls));
     }
 }

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

@@ -14,6 +14,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-15
  */
+@Deprecated
 public class ElecUseH extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

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

@@ -14,59 +14,66 @@ public class MeterBoundaryRel
     /** 序号 */
     private Long id;
 
-    /** 计量设备 */
-    private String meterDevice;
+    /** 设备类型 */
+    private Integer objType;
 
     /** 边界对象 */
     private String boundaryObj;
 
-    /** 设备类型 */
-    private Integer objType;
+    /** 计量介质 */
+    private Integer meterCls;
+
+    /** 计量设备 */
+    private String meterDevice;
+
+    public Long getId() {
+        return id;
+    }
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
-        return id;
+    public Integer getObjType() {
+        return objType;
     }
-    public void setMeterDevice(String meterDevice) 
-    {
-        this.meterDevice = meterDevice;
+
+    public void setObjType(Integer objType) {
+        this.objType = objType;
     }
 
-    public String getMeterDevice() 
-    {
-        return meterDevice;
+    public String getBoundaryObj() {
+        return boundaryObj;
     }
-    public void setBoundaryObj(String boundaryObj) 
-    {
+
+    public void setBoundaryObj(String boundaryObj) {
         this.boundaryObj = boundaryObj;
     }
 
-    public String getBoundaryObj() 
-    {
-        return boundaryObj;
+    public Integer getMeterCls() {
+        return meterCls;
     }
-    public void setObjType(Integer objType)
-    {
-        this.objType = objType;
+
+    public void setMeterCls(Integer meterCls) {
+        this.meterCls = meterCls;
     }
 
-    public Integer getObjType()
-    {
-        return objType;
+    public String getMeterDevice() {
+        return meterDevice;
+    }
+
+    public void setMeterDevice(String meterDevice) {
+        this.meterDevice = meterDevice;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("meterDevice", getMeterDevice())
-            .append("boundaryObj", getBoundaryObj())
             .append("objType", getObjType())
+            .append("boundaryObj", getBoundaryObj())
+            .append("meterCls", getMeterCls())
+            .append("meterDevice", getMeterDevice())
             .toString();
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/ElecUseHMapper.java

@@ -12,6 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-08-15
  */
+@Deprecated
 public interface ElecUseHMapper {
     /**
      * 查询用能计量-小时

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/MeterBoundaryRelMapper.java

@@ -17,10 +17,10 @@ public interface MeterBoundaryRelMapper {
      *
      * @param objType     计量对象类型
      * @param boundaryObj 计量对象编号
-     *
      * @return 计量设备绑定边界对象关系集合
      */
-    List<MeterBoundaryRel> selectByObj(@Param("objType") Integer objType, @Param("boundaryObj") String boundaryObj);
+    List<MeterBoundaryRel> selectByObj(@Param("objType") Integer objType, @Param("boundaryObj") String boundaryObj,
+        @Param("meterCls") Integer meterCls);
 
     /**
      * 删除计量设备绑定边界对象关系
@@ -29,7 +29,7 @@ public interface MeterBoundaryRelMapper {
      * @param boundaryObj 计量对象编号
      * @return 结果
      */
-    int deleteByObj(@Param("objType") Integer objType, @Param("boundaryObj") String boundaryObj);
+    int deleteByObj(@Param("objType") Integer objType, @Param("boundaryObj") String boundaryObj, @Param("meterCls") Integer meterCls);
 
     /**
      * 新增计量设备绑定边界对象关系

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

@@ -12,6 +12,7 @@ import com.ruoyi.ems.model.QueryIndex;
  * @author ruoyi
  * @date 2024-08-15
  */
+@Deprecated
 public interface IElecUseHService {
     /**
      * 查询用能计量-小时

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

@@ -18,7 +18,7 @@ public interface IMeterBoundaryRelService {
      * @param objType     计量对象类型
      * @return 计量设备绑定边界对象关系集合
      */
-    List<MeterBoundaryRel> selectRelByObj(Integer objType, String boundaryObj);
+    List<MeterBoundaryRel> selectRelByObj(Integer objType, String boundaryObj, Integer meterCls);
 
     /**
      * 删除计量设备绑定边界对象关系信息
@@ -27,7 +27,7 @@ public interface IMeterBoundaryRelService {
      * @param boundaryObj 计量对象编号
      * @return 结果
      */
-    int deleteRelByObj(Integer objType, String boundaryObj);
+    int deleteRelByObj(Integer objType, String boundaryObj, Integer meterCls);
 
     /**
      * 新增计量设备绑定边界对象关系

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

@@ -17,6 +17,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2024-08-15
  */
+@Deprecated
 @Service
 public class ElecUseHServiceImpl implements IElecUseHService {
     @Autowired

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

@@ -20,13 +20,13 @@ public class MeterBoundaryRelServiceImpl implements IMeterBoundaryRelService {
     private MeterBoundaryRelMapper relMapper;
 
     @Override
-    public List<MeterBoundaryRel> selectRelByObj(Integer objType, String boundaryObj) {
-        return relMapper.selectByObj(objType, boundaryObj);
+    public List<MeterBoundaryRel> selectRelByObj(Integer objType, String boundaryObj, Integer meterCls) {
+        return relMapper.selectByObj(objType, boundaryObj, meterCls);
     }
 
     @Override
-    public int deleteRelByObj(Integer objType, String boundaryObj) {
-        return relMapper.deleteByObj(objType, boundaryObj);
+    public int deleteRelByObj(Integer objType, String boundaryObj, Integer meterCls) {
+        return relMapper.deleteByObj(objType, boundaryObj, meterCls);
     }
 
     @Override

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

@@ -6,32 +6,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="com.ruoyi.ems.domain.MeterBoundaryRel" id="relResult">
         <result property="id"    column="id"    />
-        <result property="meterDevice"    column="meter_device"    />
-        <result property="boundaryObj"    column="boundary_obj"    />
         <result property="objType"    column="obj_type"    />
+        <result property="boundaryObj"    column="boundary_obj"    />
+        <result property="meterCls"    column="meter_cls"    />
+        <result property="meterDevice"    column="meter_device"    />
     </resultMap>
 
     <sql id="selectMeterBoundaryRelVo">
-        select id, meter_device, boundary_obj, obj_type from adm_meter_boundary_rel
+        select id, obj_type, boundary_obj, meter_cls, meter_device from adm_meter_boundary_rel
     </sql>
 
     <select id="selectByObj"  resultMap="relResult">
         <include refid="selectMeterBoundaryRelVo"/>
         <where>
-            <if test="boundaryObj != null  and boundaryObj != ''"> and boundary_obj = #{boundaryObj}</if>
             <if test="objType != null "> and obj_type = #{objType}</if>
+            <if test="boundaryObj != null  and boundaryObj != ''"> and boundary_obj = #{boundaryObj}</if>
+            <if test="meterCls != null "> and meter_cls = #{meterCls}</if>
         </where>
     </select>
 
     <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
-        insert into adm_meter_boundary_rel (meter_device, boundary_obj, obj_type)
+        insert into adm_meter_boundary_rel (obj_type, boundary_obj, meter_cls, meter_device)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.meterDevice}, #{item.boundaryObj}, #{item.objType})
+            (#{item.objType}, #{item.boundaryObj}, #{item.meterCls}, #{item.meterDevice})
         </foreach>
     </insert>
 
     <delete id="deleteByObj" >
-        delete from adm_meter_boundary_rel where boundary_obj = #{boundaryObj} and obj_type = #{objType}
+        delete from adm_meter_boundary_rel where obj_type = #{objType} and boundary_obj = #{boundaryObj} and meter_cls = #{meterCls}
     </delete>
 </mapper>

ems-cloud/sql/ems_init_data.sql

@@ -525,9 +525,11 @@ INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `devi
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-108', '北区/综合楼B-108', '北区综合楼一楼设备间', 45, 1, 4, 1, 1, '直采表');
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-109', '北区/综合楼B-109', '北区综合楼一楼设备间', 45, 1, 4, 1, 1, '直采表');
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-110', '北区/综合楼B-110', '北区综合楼一楼设备间', 45, 1, 4, 1, 1, '直采表');
-INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-Z101', '北区/综合楼照明（Z101）', '北区综合楼一楼设备间', 45, 0, 4, 1, 1, '直采表');
-INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-Z120', '北区/综合楼空调（Z120）', '北区综合楼一楼设备间', 45, 0, 4, 1, 50, '互感器表');
-INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-G001', '北区/广场照明', '北区广场1#配电柜', 45, 0, 4, 0, 1, '智能断路器表');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-Z101', '北区/综合楼内照明（Z101）', '北区综合楼一楼设备间', 45, 0, 4, 0, 1, '智能断路器');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-Z102', '北区/综合楼室外照明（Z102）', '北区综合楼2#箱', 45, 0, 4, 0, 1, '智能断路器');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-Z110', '北区/综合楼公共设施（Z110）', '北区综合楼1#箱', 45, 0, 4, 0, 1, '智能断路器');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-Z120', '北区/综合楼空调（Z120）', '北区综合楼1#箱', 45, 0, 4, 0, 50, '智能断路器');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-G001', '北区/广场照明', '北区广场1#配电柜', 45, 0, 4, 0, 1, '智能断路器');
 
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-101', '南区/综合楼N-101', '南区综合楼一楼设备间', 45, 1, 4, 1, 1, '直采表');
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-102', '南区/综合楼N-103', '南区综合楼一楼设备间', 45, 1, 4, 1, 1, '直采表');
@@ -539,36 +541,48 @@ INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `devi
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-108', '南区/综合楼N-113', '南区综合楼一楼设备间', 45, 1, 4, 1, 1, '直采表');
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-109', '南区/综合楼N-114', '南区综合楼一楼设备间', 45, 1, 4, 1, 1, '直采表');
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-110', '南区/综合楼N-115', '南区综合楼一楼设备间', 45, 0, 4, 1, 1, '直采表');
-INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-G001', '南区/广场照明', '南区广场1#配电柜', 45, 0, 4, 1, 1, '智能断路器表');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-Z201', '南区/综合楼内照明（Z201）', '南区综合楼一楼设备间', 45, 0, 4, 0, 1, '智能断路器');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-Z202', '南区/综合楼室外照明（Z202）', '南区综合楼2#箱', 45, 0, 4, 0, 1, '智能断路器');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-Z210', '南区/综合楼公共设施（Z210）', '南区综合楼1#箱', 45, 0, 4, 0, 1, '智能断路器');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-Z220', '南区/综合楼空调（Z220）', '南区综合楼1#箱', 45, 0, 4, 0, 50, '智能断路器');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-G001', '南区/广场照明', '南区广场1#配电柜', 45, 0, 4, 0, 1, '智能断路器表');
 
 -- 水表
-INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-B-01', '北区/综合楼B-102', '北区综合楼后院1号井', 70, 0, 4, 1, 1, '直采表');
-INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-D-N-02', '北区/综合楼盥洗室', '北区综合楼后院1号井', 70, 0, 4, 0, 1, '直采表');
-INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-D-N-03', '南区/综合楼盥洗室', '南区综合楼后院1号井', 70, 0, 4, 0, 1, '直采表');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-S-B-01', '北区/综合楼B-102', '北区综合楼后院1号井', 70, 0, 4, 1, 1, '直采表');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-S-N-02', '北区/综合楼盥洗室', '北区综合楼后院1号井', 70, 0, 4, 0, 1, '直采表');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_name`, `device_location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-S-N-03', '南区/综合楼盥洗室', '南区综合楼后院1号井', 70, 0, 4, 0, 1, '直采表');
 
 -- 表计绑定关系
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-102', 'B-102', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-103', 'B-103', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-104', 'B-104', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-105', 'B-105', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-106', 'B-106', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-107', 'B-107', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-108', 'B-108', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-109', 'B-109', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-110', 'B-110', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-Z101', 'B-Z101', 2);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-B-Z120', 'B-Z101', 2);
-
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-101', 'N-101', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-102', 'N-102', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-103', 'N-103', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-104', 'N-104', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-105', 'N-105', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-106', 'N-106', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-107', 'N-107', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-108', 'N-108', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-109', 'N-109', 1);
-INSERT INTO `adm_meter_boundary_rel` (`meter_device`, `boundary_obj`, `obj_type`) VALUES ('J-D-N-110', 'N-110', 1);
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-102', 45, 'J-D-B-102');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-103', 45, 'J-D-B-103');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-104', 45, 'J-D-B-104');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-105', 45, 'J-D-B-105');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-106', 45, 'J-D-B-106');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-107', 45, 'J-D-B-107');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-108', 45, 'J-D-B-108');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-109', 45, 'J-D-B-109');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'B-110', 45, 'J-D-B-110');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z101', 45, 'J-D-B-Z101');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z102', 45, 'J-D-B-Z102');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z101', 45, 'J-D-B-Z110');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z120', 45, 'J-D-B-Z120');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z102', 45, 'J-D-B-G001');
+
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-101', 45, 'J-D-N-101');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-102', 45, 'J-D-N-102');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-103', 45, 'J-D-N-103');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-104', 45, 'J-D-N-104');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-105', 45, 'J-D-N-105');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-106', 45, 'J-D-N-106');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-107', 45, 'J-D-N-107');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-108', 45, 'J-D-N-108');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-109', 45, 'J-D-N-109');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, 'N-110', 45, 'J-D-N-110');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z201', 45, 'J-D-N-Z201');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z202', 45, 'J-D-N-Z202');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z210', 45, 'J-D-N-Z210');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z220', 45, 'J-D-N-Z220');
+INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (2, 'Z202', 45, 'J-D-N-G001');
 
 
 -- 抄表demo数据

ems-cloud/sql/ems_server.sql

@@ -594,11 +594,12 @@ create table adm_meter_device  (
 drop table if exists adm_meter_boundary_rel;
 create table adm_meter_boundary_rel  (
   `id`              bigint(20)      not null auto_increment      comment '序号',
-  `meter_device`    varchar(64)     not null                     comment '计量设备',
+  `obj_type`        int             not null                     comment '对象类型',
   `boundary_obj`    varchar(64)     not null                     comment '边界对象',
-  `obj_type`        int             not null                     comment '设备类型',
+  `meter_cls`       int             not null                     comment '计量介质',
+  `meter_device`    varchar(64)     not null                     comment '计量设备',
   primary key (`id`),
-  unique key ux_meter_device(`meter_device`,`boundary_obj`,`obj_type`)
+  unique key ux_meter_device(`obj_type`,`boundary_obj`,`meter_cls`,`meter_device`)
 ) engine=innodb auto_increment=1 comment = '计量设备绑定边界对象关系表';