广告投放设备

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/adv/AdvertisementPuttingAdminEndPoint.java

@@ -185,24 +185,28 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/open/info")
    @ApiOperation(value = "获取单个设备上的所有广告")
    public ListEnvelop<AdvertisementLaunchDO>solo(
            @ApiParam(name = "machineCode",value = "设备编码")
    public Envelop solo(
            @ApiParam(name = "machineCode",value = "设备编码",required = true)
            @RequestParam(value = "machineCode",required = true)String machineCode){
        return success(launchService.solo(machineCode));
    }
    @GetMapping(value = "/info")
    @ApiOperation(value = "获取单个设备上的所有广告明细")
    public Envelop info(
            @ApiParam(name = "devId",value = "设备id")
            @RequestParam(value = "devId",required = true)String devId){
        List<AdvertisementPuttingAdminDO>list=launchService.info(devId);
        if (list==null||list.size()==0){
            return failed("该设备没有广告或者该设备id不存在");
        List<AdvertisementPuttingAdminDO>list=launchService.solo(machineCode);
        if (null==list){
            return failed("该设备没有广告或者该设备编码不存在");
        }
        return success("获取单个设备上所有广告明细成功",list);
    }
//    @GetMapping(value = "/info")
//    @ApiOperation(value = "获取单个设备上的所有广告明细")
//    public Envelop info(
//            @ApiParam(name = "devId",value = "设备id")
//            @RequestParam(value = "devId",required = true)String devId){
//        List<AdvertisementPuttingAdminDO>list=launchService.info(devId);
//        if (list==null||list.size()==0){
//            return failed("该设备没有广告或者该设备id不存在");
//        }
//        return success("获取单个设备上所有广告明细成功",list);
//    }
    @GetMapping(value = "/devinfo")
    @ApiOperation(value = "获取单条广告投放的所有设备明细")
    public Envelop devInfo(@ApiParam(name = "advId",value = "广告id",required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/service/advrtisement/AdvertisementLaunchService.java

@@ -25,9 +25,12 @@ public class AdvertisementLaunchService extends BaseJpaService<AdvertisementLaun
        return advertisementLaunchDAO.findByAdvId(advId);
    }
    public List<AdvertisementLaunchDO> solo(String machineCode) {
    public List<AdvertisementPuttingAdminDO> solo(String machineCode) {
        Mediicinedevice mediicinedevice =deviceDao.findByMachineCode(machineCode);
        return advertisementLaunchDAO.findByDevId(mediicinedevice.getId());
        if (null==mediicinedevice){
            return null;
        }
        return adminDAO.findByDevIdInfo(mediicinedevice.getId());
    }
    public List<AdvertisementPuttingAdminDO> info(String devId) {