Przeglądaj źródła

[电表][修改]:优化电表列表接口

release_toaliyun_real
hupeng 6 lat temu
rodzic
commit
aca4ae728e
5 zmienionych plików z 24 dodań i 4 usunięć
  1. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java
  4. +6
    -1
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java
  5. +10
    -2
      mallinkService/src/main/resources/mapper/KwMeterMapper.xml

+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java Wyświetl plik

@@ -90,7 +90,11 @@ public class KwBoxController extends BaseController {
if (kwBox == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND);

kwBox.setMeters(kwBoxService.findMeters(kwBox));
KwMeter kwMeter = new KwMeter();
kwMeter.setBoxId(kwBox.getId());
kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode());
kwMeter.setStatus(EnumMeterStatus.VALID.getCode());
kwBox.setMeters(kwMeterService.findVoList(kwMeter));
return new ResultData(kwBox);
}



+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java Wyświetl plik

@@ -10,6 +10,7 @@ import java.util.List;
public interface KwMeterMapper extends CommonMapper<KwMeter, Long> {

List<KwMeter> findList(KwMeter param);
List<KwMeter> findVoList(KwMeter param); //with merchant info

int onlineBatch(@Param("list")List<KwMeter> list);
int offlineBatch(KwMeter param);


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java Wyświetl plik

@@ -54,6 +54,8 @@ public interface KwMeterService {
*/
List<KwMeter> findList(KwMeter record);

List<KwMeter> findVoList(KwMeter record);

int selectCount(KwMeter record);

int bind(Long boxId, Long meterId);


+ 6
- 1
mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java Wyświetl plik

@@ -26,7 +26,7 @@ public class KwMeterServiceImpl implements KwMeterService {

@Override
public PageInfo<KwMeter> listAsPage(KwMeter record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterMapper.findList(record));
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterMapper.findVoList(record));
}

@Override
@@ -69,6 +69,11 @@ public class KwMeterServiceImpl implements KwMeterService {
return kwMeterMapper.findList(record);
}

@Override
public List<KwMeter> findVoList(KwMeter record) {
return kwMeterMapper.findVoList(record);
}

@Override
public int selectCount(KwMeter record) {
return kwMeterMapper.selectCount(record);


+ 10
- 2
mallinkService/src/main/resources/mapper/KwMeterMapper.xml Wyświetl plik

@@ -86,17 +86,25 @@
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>
<select id="findList" parameterType="com.iformall.domain.po.KwMeter" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from kw_meter
<include refid="dynamicWhereConditions"/>
</select>

<select id="findVoList" parameterType="com.iformall.domain.po.KwMeter" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
,mm.merchant_id as merchant_id, m.name as merchant_name
from kw_meter
left join kw_merchant_meter mm on kw_meter.id = mm.meter_id and mm.status = 0
inner join wx_merchant m on m.id = mm.merchant_id
left join wx_merchant m on m.id = mm.merchant_id
<include refid="dynamicWhereConditions"/>
</select>


<update id="onlineBatch" parameterType="java.util.List" >
update kw_meter
set


Ładowanie…
Anuluj
Zapisz