Explorar el Código

[电表][优化]:电表字段冗余

release_toaliyun_real
hupeng hace 6 años
padre
commit
86c395555f
Se han modificado 4 ficheros con 3 adiciones y 31 borrados
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
  2. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
  3. +2
    -26
      mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml
  4. +1
    -1
      mallinkService/src/main/resources/mapper/KwMeterMapper.xml

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java Ver fichero

@@ -129,7 +129,6 @@ public class KwMeterController extends BaseController {
KwMeter kwMeter = kwMeterService.getById(id); KwMeter kwMeter = kwMeterService.getById(id);
if (kwMeter == null) if (kwMeter == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND); return new ResultData(ErrorCode.DEVICE_NOT_FOUND);
kwMeter.setLatestRecord(kwMeterDataService.findLastRecord(id));
return new ResultData(kwMeter); return new ResultData(kwMeter);
} }




+ 0
- 3
mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java Ver fichero

@@ -93,7 +93,4 @@ public class KwMeter extends BaseEntity {
@Transient @Transient
private Integer merchantMeterStatus; private Integer merchantMeterStatus;


@Transient
protected KwMeterData latestRecord;

} }

+ 2
- 26
mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml Ver fichero

@@ -55,32 +55,8 @@
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>


<resultMap id="MeterBaseResultMap" type="com.iformall.domain.po.KwMeter">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="address" jdbcType="BIGINT" property="address"/>
<result column="brand" jdbcType="VARCHAR" property="brand"/>
<result column="place" jdbcType="VARCHAR" property="place"/>
<result column="model" jdbcType="VARCHAR" property="model"/>
<result column="last_online_time" jdbcType="TIMESTAMP" property="lastOnlineTime"/>
<result column="total_power" jdbcType="INTEGER" property="totalPower"/>
<result column="online_status" jdbcType="INTEGER" property="onlineStatus"/>
<result column="config" jdbcType="VARCHAR" property="config"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="box_id" jdbcType="BIGINT" property="boxId"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="bind_status" jdbcType="INTEGER" property="bindStatus"/>

<association column="{meterId=id}" property="latestRecord"
select="com.iformall.mapper.KwMeterDataMapper.findLastRecordList">
</association >

</resultMap>


<select id="findSimpleMeterList" parameterType="java.util.Map" resultType="com.iformall.domain.po.KwMeter"> <select id="findSimpleMeterList" parameterType="java.util.Map" resultType="com.iformall.domain.po.KwMeter">
select m.`id`, m.`last_total_power` from kw_merchant_meter mm
select m.`id`, m.`total_power` from kw_merchant_meter mm
left join kw_meter m on mm.`meter_id` = m.id left join kw_meter m on mm.`meter_id` = m.id
where mm.`status` = 0 where mm.`status` = 0
<if test=" null != merchantId "> <if test=" null != merchantId ">
@@ -156,7 +132,7 @@


</select> </select>


<select id="findMeterList" parameterType="java.util.Map" resultMap="MeterBaseResultMap">
<select id="findMeterList" parameterType="java.util.Map" resultType="com.iformall.domain.po.KwMeter">
select m.* from kw_merchant_meter mm select m.* from kw_merchant_meter mm
left join kw_meter m on mm.`meter_id` = m.id left join kw_meter m on mm.`meter_id` = m.id
where mm.`status` = 0 where mm.`status` = 0


+ 1
- 1
mallinkService/src/main/resources/mapper/KwMeterMapper.xml Ver fichero

@@ -20,7 +20,7 @@
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`address`,`brand`,`model`,`place`,`last_online_time`,`last_total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status`
`id`,`tenant_id`,`address`,`brand`,`model`,`place`,`last_online_time`,`total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status`
</sql> </sql>
<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Cargando…
Cancelar
Guardar