| @@ -90,7 +90,11 @@ public class KwBoxController extends BaseController { | |||||
| if (kwBox == null) | if (kwBox == null) | ||||
| return new ResultData(ErrorCode.DEVICE_NOT_FOUND); | 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); | return new ResultData(kwBox); | ||||
| } | } | ||||
| @@ -10,6 +10,7 @@ import java.util.List; | |||||
| public interface KwMeterMapper extends CommonMapper<KwMeter, Long> { | public interface KwMeterMapper extends CommonMapper<KwMeter, Long> { | ||||
| List<KwMeter> findList(KwMeter param); | List<KwMeter> findList(KwMeter param); | ||||
| List<KwMeter> findVoList(KwMeter param); //with merchant info | |||||
| int onlineBatch(@Param("list")List<KwMeter> list); | int onlineBatch(@Param("list")List<KwMeter> list); | ||||
| int offlineBatch(KwMeter param); | int offlineBatch(KwMeter param); | ||||
| @@ -54,6 +54,8 @@ public interface KwMeterService { | |||||
| */ | */ | ||||
| List<KwMeter> findList(KwMeter record); | List<KwMeter> findList(KwMeter record); | ||||
| List<KwMeter> findVoList(KwMeter record); | |||||
| int selectCount(KwMeter record); | int selectCount(KwMeter record); | ||||
| int bind(Long boxId, Long meterId); | int bind(Long boxId, Long meterId); | ||||
| @@ -26,7 +26,7 @@ public class KwMeterServiceImpl implements KwMeterService { | |||||
| @Override | @Override | ||||
| public PageInfo<KwMeter> listAsPage(KwMeter record, Integer pageIndex, Integer pageSize) { | 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 | @Override | ||||
| @@ -69,6 +69,11 @@ public class KwMeterServiceImpl implements KwMeterService { | |||||
| return kwMeterMapper.findList(record); | return kwMeterMapper.findList(record); | ||||
| } | } | ||||
| @Override | |||||
| public List<KwMeter> findVoList(KwMeter record) { | |||||
| return kwMeterMapper.findVoList(record); | |||||
| } | |||||
| @Override | @Override | ||||
| public int selectCount(KwMeter record) { | public int selectCount(KwMeter record) { | ||||
| return kwMeterMapper.selectCount(record); | return kwMeterMapper.selectCount(record); | ||||
| @@ -86,17 +86,25 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.KwMeter" resultMap="BaseResultMap"> | <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 | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| ,mm.merchant_id as merchant_id, m.name as merchant_name | ,mm.merchant_id as merchant_id, m.name as merchant_name | ||||
| from kw_meter | from kw_meter | ||||
| left join kw_merchant_meter mm on kw_meter.id = mm.meter_id and mm.status = 0 | 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"/> | <include refid="dynamicWhereConditions"/> | ||||
| </select> | </select> | ||||
| <update id="onlineBatch" parameterType="java.util.List" > | <update id="onlineBatch" parameterType="java.util.List" > | ||||
| update kw_meter | update kw_meter | ||||
| set | set | ||||