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

svr/svr-iot/src/main/java/com/yihu/iot/controller/iotMessage/IotMessageController.java

@@ -48,7 +48,7 @@ public class IotMessageController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = IotRequestMapping.Message.markRead)
    @ApiOperation(value = "分页查找消息列表", notes = "分页查找消息列表")
    @ApiOperation(value = "设置消息已读", notes = "设置消息已读")
    public MixEnvelop<IotMessageDO,IotMessageDO> markRead(@ApiParam(name = "id", value = "消息ID", defaultValue = "")
                                                         @RequestParam(value = "id", required = false) String id){

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -795,6 +795,9 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
    public MixEnvelop<IotCompanyVO, IotCompanyVO> findCompanyByAccount() {
        IotCompanyDO companyDO = iotCompanyDao.findByEhrUserId(userAgent.getUID());
        if (companyDO==null){
            return MixEnvelop.getSuccess("未入驻企业",-1);
        }
        if (companyDO.getAccountType().equalsIgnoreCase("0")){
            List<IotCompanyAppDO> appDOList = iotCompanyAppDao.findByCompanyId(companyDO.getId());
            companyDO.setAppList(appDOList);
@@ -803,9 +806,6 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
            findType(companyDO);
        }
        IotCompanyVO companyVO = convertToModelVO(companyDO);
        if (companyDO==null){
            return MixEnvelop.getSuccess("未入驻企业",-1);
        }
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,companyVO);
    }

svr/svr-iot/src/main/java/com/yihu/iot/service/message/IotMessageService.java

@@ -50,7 +50,7 @@ public class IotMessageService  extends BaseJpaService<IotMessageDO, IotMessageD
        StringBuffer sql= new StringBuffer("SELECT * FROM iot_message");
        sql.append(sql).append("  ORDER BY read_msg, create_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
        sql.append("  ORDER BY read_msg, create_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
        List<IotMessageDO> list = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(IotMessageDO.class));