Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/platform/IotShareInterfaceService.java

@@ -8,6 +8,7 @@ import com.yihu.iot.service.useragent.UserAgent;
import com.yihu.jw.entity.iot.company.IotCompanyAppDO;
import com.yihu.jw.entity.iot.company.IotCompanyDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.platform.IotCompanyAppInterfaceDO;
import com.yihu.jw.entity.iot.platform.IotInterfaceAuditDO;
import com.yihu.jw.entity.iot.platform.IotShareInterfaceDO;
import com.yihu.jw.restmodel.iot.company.IotCompanyAppVO;
@@ -209,16 +210,25 @@ public class IotShareInterfaceService extends BaseJpaService<IotShareInterfaceDO
    public MixEnvelop<IotShareInterfaceDO, IotShareInterfaceDO> findCompanyShareInterface(Integer page, Integer size) {
        IotCompanyDO account = iotCompanyDao.findByEhrUserId(userAgent.getUID());
        StringBuffer sql = new StringBuffer("SELECT DISTINCT * from iot_company_app_interface ");
        sql.append("WHERE company_id = '").append(account.getId()).append("'");
        sql.append(" order by update_time desc  limit ").append((page-1)*size).append(",").append(size);
        List<IotInterfaceAuditDO> list = jdbcTemplate.query(sql.toString(),new BeanPropertyRowMapper(IotInterfaceAuditDO.class));
        List<IotCompanyAppInterfaceDO> list = jdbcTemplate.query(sql.toString(),new BeanPropertyRowMapper(IotCompanyAppInterfaceDO.class));
        List<IotShareInterfaceDO> interfaceDOS = new ArrayList<>();
        list.forEach(one->{
            IotShareInterfaceDO shareInterfaceDO = iotShareInterfaceDao.findById(one.getShareInterfaceId());
            interfaceDOS.add(shareInterfaceDO);
        });
        //获取总数
        long count = list.size();
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Platform.message_success_find,list,page, size,count);
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Platform.message_success_find,interfaceDOS,page, size,count);
    }
}