根据广告位置获取广告

common/common-request-mapping/src/main/java/com/yihu/jw/rm/adv/AdvsementMapping.java

@@ -11,6 +11,7 @@ public class AdvsementMapping {
        public static final String UPDATE = "/update";//更新广告内容
        public static final String SEL = "/selectByTit";//根据标题模糊查询所有广告
        public static final String SELECTLike = "/selectByLike";//根据标题模糊查询可投放的广告
        public static final String GET_BY_PUBLISH_LOCATION = "/getByPublishLocation";//根据广告位置获取广告
        }
}

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

@@ -111,7 +111,7 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.SEL)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<AdvertisementPuttingAdminDO> page (
    public PageEnvelop page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -130,8 +130,8 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        PageEnvelop list = advrtisementService.list(title, publishLocation, categoryCode, launchDevice, sorts, page, size);
        return list;
        JSONObject result = advrtisementService.getAdvrtisementByPage(title, publishLocation, categoryCode, launchDevice, sorts, page, size);
        return success(result.getJSONArray("msg"), result.getInteger("count"), page, size);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -9,6 +9,7 @@ import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.service.a3service.MedicineWarrayService;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.service.advrtisement.AdvertisementLaunchService;
import com.yihu.jw.base.service.advrtisement.AdvrtisementService;
import com.yihu.jw.base.service.role.RoleService;
import com.yihu.jw.base.service.user.UserService;
import com.yihu.jw.base.util.ConstantUtils;
@@ -21,7 +22,9 @@ import com.yihu.jw.hospital.httplog.service.WlyyHttpLogService;
import com.yihu.jw.restmodel.base.area.BaseTownVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.adv.AdvsementMapping;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
@@ -70,6 +73,8 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
    private BaseTownService baseTownService;
    @Autowired
    private WlyyHttpLogService wlyyHttpLogService;
    @Autowired
    private AdvrtisementService advrtisementService;
    @Value("${spring.profiles}")
    private String springProfiles;
@@ -473,4 +478,17 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        wlyyHttpLogService.saveHttpLog(code,name,patient,doctor,request,response,status);
        return success("添加成功");
    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.GET_BY_PUBLISH_LOCATION)
    @ApiOperation(value = "根据广告位置获取广告")
    public PageEnvelop list (
            @ApiParam(name = "publishLocation", value = "发布位置（0广告位、1banner位、2动态列表）", required = true)
            @RequestParam(value = "publishLocation") Integer publishLocation,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = advrtisementService.getAdvrtisementByPage(null,publishLocation, null,null,null,page, size);
        return success(result.getJSONArray("msg"), result.getInteger("count"), page, size);
    }
}

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

@@ -2,22 +2,18 @@ package com.yihu.jw.base.service.advrtisement;
import com.alibaba.fastjson.JSONObject;
import com.ibm.disthub2.impl.formats.Envelop;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.advertisement.AdvertisementLaunchDAO;
import com.yihu.jw.base.dao.advertisement.AdvertisementPuttingAdminDAO;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.MediicineDeviceUser;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.lang.StringUtils;
@@ -202,6 +198,8 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
        }
        jsonObject.put("launchDevice",adminDO.getLaunchDevice());
        jsonObject.put("sort",adminDO.getSort());
        jsonObject.put("linkUrl",adminDO.getLinkUrl());
        jsonObject.put("content",adminDO.getContent());
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg","查询单条明细成功");
        result.put("obj",jsonObject);
@@ -251,7 +249,8 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
        return "已取消投放";
    }
    public PageEnvelop list(String title, Integer publishLocation, Integer categoryCode, Integer launchDevice, String sorts, int page, int size) {
    public JSONObject getAdvrtisementByPage(String title, Integer publishLocation, Integer categoryCode, Integer launchDevice, String sorts, int page, int size) throws Exception {
        JSONObject result = new JSONObject();
        String countSql = "select count(a.id)";
        String sql = "SELECT " +
                "a.id, " +
@@ -304,7 +303,9 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
            }
        }
        Long count = jdbcTemplate.queryForObject(countSql+from,Long.class);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,size,count);
        result.put("count",count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }