广告投放设备

business/base-service/src/main/java/com/yihu/jw/hospital/dict/WlyyHospitalSysDictDao.java

@@ -45,11 +45,7 @@ public interface WlyyHospitalSysDictDao extends PagingAndSortingRepository<WlyyH
    @Query("from WlyyHospitalSysDictDO where dictName = ?1  and  dictCode=?2 ")
    WlyyHospitalSysDictDO findOneByDictNameAndDictCode(String dictName,String dictCode);
    @Query("from WlyyHospitalSysDictDO where dictName = ?1 and imgUrl is not null order by sort asc")
    List<WlyyHospitalSysDictDO> findByDictNameOrderBySort(String dictName);
    WlyyHospitalSysDictDO findByDictNameAndSort(String dictName, Integer sort);
    @Query("from WlyyHospitalSysDictDO where dictName = ?1 and sort>?2")
    List<WlyyHospitalSysDictDO> findByDictNameAndSortNear(String dictName,Integer sort);
    List<WlyyHospitalSysDictDO> findByDictNameOrderBySort(String dictName);
}

business/base-service/src/main/java/com/yihu/jw/hospital/dict/service/WlyyHospitalSysDictService.java

@@ -94,93 +94,79 @@ public class WlyyHospitalSysDictService extends BaseJpaService<WlyyHospitalSysDi
    }
    //根据id修改或新增字典
    public WlyyHospitalSysDictDO updateOrCreateDict(String json) throws  Exception{
        WlyyHospitalSysDictDO  wlyyHospitalSysDictDO = objectMapper.readValue(json, WlyyHospitalSysDictDO.class);
    public WlyyHospitalSysDictDO updateOrCreateDict(String json) throws  Exception {
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = objectMapper.readValue(json, WlyyHospitalSysDictDO.class);
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO1=new WlyyHospitalSysDictDO();
        String modelName = "";
        if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictName())){
            List<WlyyHospitalSysDictDO> modelNameList=wlyyHospitalSysDictDao.findByDictName(wlyyHospitalSysDictDO.getDictName());
            if (modelNameList!=null&&modelNameList.size()>0){
                modelName= modelNameList.get(0).getModelName();
        if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getDictName())) {
            List<WlyyHospitalSysDictDO> modelNameList = wlyyHospitalSysDictDao.findByDictName(wlyyHospitalSysDictDO.getDictName());
            if (modelNameList != null && modelNameList.size() > 0) {
                modelName = modelNameList.get(0).getModelName();
            }
        }
        wlyyHospitalSysDictDO.setModelName(modelName);
        if(StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getId())){
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO1 = wlyyHospitalSysDictDao.findById(wlyyHospitalSysDictDO.getId());
            List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOList=new ArrayList<>();
            if (wlyyHospitalSysDictDO1!=null){
        if (StringUtils.isNoneBlank(wlyyHospitalSysDictDO.getId())) {
            wlyyHospitalSysDictDO1 = wlyyHospitalSysDictDao.findById(wlyyHospitalSysDictDO.getId());
            List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOList = new ArrayList<>();
            if (wlyyHospitalSysDictDO1 != null) {
                wlyyHospitalSysDictDO1.setDictValue(wlyyHospitalSysDictDO.getDictValue());
                wlyyHospitalSysDictDO1.setDictCode(wlyyHospitalSysDictDO.getDictCode());
                wlyyHospitalSysDictDO1.setDictName(wlyyHospitalSysDictDO.getDictName());
                wlyyHospitalSysDictDO1.setHospital(wlyyHospitalSysDictDO.getHospital());
                wlyyHospitalSysDictDO1.setPyCode(wlyyHospitalSysDictDO.getPyCode());
                wlyyHospitalSysDictDO1.setImgUrl(wlyyHospitalSysDictDO.getImgUrl());
                if (wlyyHospitalSysDictDO.getDictName().equalsIgnoreCase("ONLINE_HOSPITAL_BANNER")){
                    if (wlyyHospitalSysDictDO.getSort()==null||wlyyHospitalSysDictDO.getSort()<=0){
                if (wlyyHospitalSysDictDO.getDictName().equalsIgnoreCase("ONLINE_HOSPITAL_BANNER")) {
                    if (wlyyHospitalSysDictDO.getSort() == null || wlyyHospitalSysDictDO.getSort() <= 0) {
                        return null;
                    }
                    WlyyHospitalSysDictDO wlyyHospitalSysDictDOs = wlyyHospitalSysDictDao.findByDictNameAndSort(wlyyHospitalSysDictDO.getDictName(),wlyyHospitalSysDictDO.getSort());
                    wlyyHospitalSysDictDOList= wlyyHospitalSysDictDao.findByDictNameAndSortNear("ONLINE_HOSPITAL_BANNER",wlyyHospitalSysDictDO.getSort());
                    if (wlyyHospitalSysDictDOs==null&&wlyyHospitalSysDictDOList.size()==0){
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else if (wlyyHospitalSysDictDOs==null&&wlyyHospitalSysDictDOList.size()>0){
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else if (wlyyHospitalSysDictDOs!=null&&wlyyHospitalSysDictDOList.size()==0){
                        wlyyHospitalSysDictDOs.setSort(wlyyHospitalSysDictDOs.getSort()+1);
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else {
                        for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO2 : wlyyHospitalSysDictDOList) {
                            wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                            Integer sort = wlyyHospitalSysDictDO2.getSort();
                            sort++;
                            wlyyHospitalSysDictDO2.setSort(sort);
                    wlyyHospitalSysDictDOList = wlyyHospitalSysDictDao.findByDictNameOrderBySort("ONLINE_HOSPITAL_BANNER");
                    boolean isAdd = false;
                    List<WlyyHospitalSysDictDO> dictDOS = new ArrayList<>();
                    for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO2 : wlyyHospitalSysDictDOList) {
                        if (isAdd) {
                            wlyyHospitalSysDictDO2.setSort(wlyyHospitalSysDictDO2.getSort() + 1);
                        }
                        if (wlyyHospitalSysDictDO2.getSort() == wlyyHospitalSysDictDO.getSort()) {
                            wlyyHospitalSysDictDO2.setSort(wlyyHospitalSysDictDO2.getSort() + 1);
                            isAdd = true;
                        }
                        if (!wlyyHospitalSysDictDO1.getId().equals(wlyyHospitalSysDictDO2.getId())) {
                            dictDOS.add(wlyyHospitalSysDictDO2);
                        }
                        if (!wlyyHospitalSysDictDO1.getId().equals(wlyyHospitalSysDictDO2.getId())) {
                            dictDOS.add(wlyyHospitalSysDictDO2);
                        }
                        wlyyHospitalSysDictDao.save(wlyyHospitalSysDictDOList);
                    }
                }else {
                    wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    dictDOS.add(wlyyHospitalSysDictDO1);
                    wlyyHospitalSysDictDao.save(dictDOS);
                }
                wlyyHospitalSysDictDO1.setModelName(modelName);
            }else {
                wlyyHospitalSysDictDO1 = new WlyyHospitalSysDictDO();
                wlyyHospitalSysDictDO1.setDictValue(wlyyHospitalSysDictDO.getDictValue());
                wlyyHospitalSysDictDO1.setDictCode(wlyyHospitalSysDictDO.getDictCode());
                wlyyHospitalSysDictDO1.setDictName(wlyyHospitalSysDictDO.getDictName());
                wlyyHospitalSysDictDO1.setHospital(wlyyHospitalSysDictDO.getHospital());
                wlyyHospitalSysDictDO1.setPyCode(wlyyHospitalSysDictDO.getPyCode());
                wlyyHospitalSysDictDO1.setImgUrl(wlyyHospitalSysDictDO.getImgUrl());
                if (wlyyHospitalSysDictDO.getDictName().equalsIgnoreCase("ONLINE_HOSPITAL_BANNER")){
                    if (wlyyHospitalSysDictDO.getSort()==null||wlyyHospitalSysDictDO.getSort()<=0){
                        return null;
            }
        } else {
            List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOList = new ArrayList<>();
            if (wlyyHospitalSysDictDO.getDictName().equals("ONLINE_HOSPITAL_BANNER")) {
                if (wlyyHospitalSysDictDO.getSort() == 0||wlyyHospitalSysDictDO.getSort()==null || wlyyHospitalSysDictDO.getSort() <= 0) {
                    return null;
                }
                wlyyHospitalSysDictDOList = wlyyHospitalSysDictDao.findByDictNameOrderBySort("ONLINE_HOSPITAL_BANNER");
                boolean isAdd = false;
                List<WlyyHospitalSysDictDO> dictDOS = new ArrayList<>();
                for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO2 : wlyyHospitalSysDictDOList) {
                    if (isAdd) {
                        wlyyHospitalSysDictDO2.setSort(wlyyHospitalSysDictDO2.getSort() + 1);
                        dictDOS.add(wlyyHospitalSysDictDO2);
                    }
                    WlyyHospitalSysDictDO wlyyHospitalSysDictDOs = wlyyHospitalSysDictDao.findByDictNameAndSort(wlyyHospitalSysDictDO.getDictName(),wlyyHospitalSysDictDO.getSort());
                     wlyyHospitalSysDictDOList= wlyyHospitalSysDictDao.findByDictNameAndSortNear("ONLINE_HOSPITAL_BANNER",wlyyHospitalSysDictDO.getSort());
                    if (wlyyHospitalSysDictDOs==null&&wlyyHospitalSysDictDOList.size()==0){
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else if (wlyyHospitalSysDictDOs==null&&wlyyHospitalSysDictDOList.size()>0){
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else if (wlyyHospitalSysDictDOs!=null&&wlyyHospitalSysDictDOList.size()==0){
                        wlyyHospitalSysDictDOs.setSort(wlyyHospitalSysDictDOs.getSort()+1);
                        wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                    }else {
                        for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO2 : wlyyHospitalSysDictDOList) {
                            wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                            Integer sort = wlyyHospitalSysDictDO2.getSort();
                            sort++;
                            wlyyHospitalSysDictDO2.setSort(sort);
                        }
                        wlyyHospitalSysDictDao.save(wlyyHospitalSysDictDOList);
                    if (wlyyHospitalSysDictDO2.getSort() == wlyyHospitalSysDictDO.getSort()) {
                        wlyyHospitalSysDictDO2.setSort(wlyyHospitalSysDictDO2.getSort() + 1);
                        dictDOS.add(wlyyHospitalSysDictDO2);
                        isAdd = true;
                    }
                }else {
                    wlyyHospitalSysDictDO1.setSort(wlyyHospitalSysDictDO.getSort());
                }
                wlyyHospitalSysDictDO1.setModelName(modelName);
                wlyyHospitalSysDictDao.save(dictDOS);
            }
            return wlyyHospitalSysDictDao.save(wlyyHospitalSysDictDO1);
        }
        return wlyyHospitalSysDictDao.save(wlyyHospitalSysDictDO);
        return wlyyHospitalSysDictDao.save(wlyyHospitalSysDictDO1);
    }
    //根据id删除字典
    public String  deleteDictById(String id){
        String msg = "";

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorder.java

@@ -88,18 +88,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
     */
    private String info;
    public String getAttr() {
        return attr;
    }
    public void setAttr(String attr) {
        this.attr = attr;
    }
    /*
    * 订单属性
    * */
    private String attr;
    /**
     * 订单金额
@@ -192,53 +181,9 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    * */
    private String deptNum;
    private String deptName;
    /*医生信息*/
    private String doctorNum;
    private String doctorName;
    /*医嘱*/
    private String doctorAdvice;
    /*过敏史*/
    private String allergyInfo;
    /*商户id*/
    private String userId;
    /*门店编号*/
    private String shopNo;
    /*
    社保卡号
     */
    private String socialSecurityCardNum;
    public String getSocialSecurityCardNum() {
        return socialSecurityCardNum;
    }
    public void setSocialSecurityCardNum(String socialSecurityCardNum) {
        this.socialSecurityCardNum = socialSecurityCardNum;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getShopNo() {
        return shopNo;
    }
    public void setShopNo(String shopNo) {
        this.shopNo = shopNo;
    }
    public String getAllergyInfo() {
        return allergyInfo;
    }
    public void setAllergyInfo(String allergyInfo) {
        this.allergyInfo = allergyInfo;
    }
    /**
     *订单属性
@@ -252,22 +197,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
     *门店编号
     */
    private String shopNo;
    /**
     *医院信息
     */
    private String hospitalInfo;
    /**
     *出生日期
     */
    private String birth;
    /**
     *科室信息
     */
    private String deptNum;
    /**
     *科室名称
     */
    private String deptName;
    /**
     *医生信息
     */
@@ -284,10 +214,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
     *过敏史
     */
    private String allergyInfo;
    /**
     *诊断信息
     */
    private String info;
    /**
     *社保卡号
     */
@@ -310,62 +237,12 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
        return orderState;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getBirth() {
        return birth;
    }
    public String getDoctorAdvice() {
        return doctorAdvice;
    }
    public void setDoctorAdvice(String doctorAdvice) {
        this.doctorAdvice = doctorAdvice;
    }
    public String getDoctorNum() {
        return doctorNum;
    }
    public void setDoctorNum(String doctorNum) {
        this.doctorNum = doctorNum;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public String getDeptNum() {
        return deptNum;
    }
    public void setDeptNum(String deptNum) {
        this.deptNum = deptNum;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public void setBirth(Date birth) {
        this.birth = birth;
    }
    public String getHospitalInfo() {
        return hospitalInfo;
    }
    public void setHospitalInfo(String hospitalInfo) {
        this.hospitalInfo = hospitalInfo;
    }
    public void setOrderState(String orderState) {
        this.orderState = orderState;
@@ -395,13 +272,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
        this.prescribeTime = prescribeTime;
    }
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
    public String getPrescribeNum() {
        return prescribeNum;
@@ -619,13 +490,6 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
        this.hospitalInfo = hospitalInfo;
    }
    public String getBirth() {
        return birth;
    }
    public void setBirth(String birth) {
        this.birth = birth;
    }
    public String getDeptNum() {
        return deptNum;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicineDeviceDao.java

@@ -5,6 +5,8 @@ import com.yihu.jw.entity.a1entity.Mediicinedevice;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface MediicineDeviceDao extends PagingAndSortingRepository<Mediicinedevice, String> {
@@ -16,4 +18,10 @@ public interface MediicineDeviceDao extends PagingAndSortingRepository<Mediicine
    @Query("select count(1) from Mediicinedevice a where a.del = 1 and a.status = 1 ")
    long countOnline();
    @Query(value = "select b.* from adv_launch as a left join t_mediicine_device as b on a.dev_id=b.id where b.machine_code=?1",nativeQuery = true)
    Mediicinedevice findByMachineCode(String machineCode);
    @Query(value = "select b.* from adv_launch as a  left join t_mediicine_device as b on a.dev_id=b.id where a.adv_id=?1",nativeQuery = true)
    List<Mediicinedevice> findByAdvIdInfo(String advId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/advertisement/AdvertisementLaunchDAO.java

@@ -9,10 +9,10 @@ import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
public interface AdvertisementLaunchDAO extends PagingAndSortingRepository<AdvertisementLaunchDO, String>, JpaSpecificationExecutor<AdvertisementLaunchDO> {
    @Query(value = "delete from AdvertisementLaunchDO a where a.advId=?1")
    @Modifying
    @Transactional
@@ -22,14 +22,10 @@ public interface AdvertisementLaunchDAO extends PagingAndSortingRepository<Adver
    List<AdvertisementLaunchDO> findByDevId(String devId);
    AdvertisementLaunchDO findByAdvIdAndDevId(String advId,String devId);
    @Query("select a from AdvertisementLaunchDO a where a.advId=?1 and a.devId=?2")
    Iterable<AdvertisementLaunchDO> findByAdvIdAndDevId(String advId,String devId);
    @Query(value = "select b from AdvertisementLaunchDO a join AdvertisementPuttingAdminDO b on a.advId=b.id where a.devId=?1")
    List<AdvertisementPuttingAdminDO> findByDevIdInfo(String devId);
    @Query(value = "select b from AdvertisementLaunchDO a join Mediicinedevice b on a.devId=b.id where a.advId=?1")
    List<Mediicinedevice> findByAdvIdInfo(String advId);
    @Query(value = "select b from AdvertisementLaunchDO a join Mediicinedevice b on a.devId=b.id where b.machineCode=?1")
    Mediicinedevice findByMachineCode(String machineCode);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/advertisement/AdvertisementPuttingAdminDAO.java

@@ -57,6 +57,9 @@ public interface AdvertisementPuttingAdminDAO extends PagingAndSortingRepository
    @Query(value = "update AdvertisementPuttingAdminDO set playId = ?1 where id is not null",nativeQuery = true)
    void updatePlayId(Integer playId);
    @Query(value = "select b.* from adv_launch as a left join advertisement_putting_admin as b on a.adv_id=b.id where a.dev_id=?1",nativeQuery = true)
    List<AdvertisementPuttingAdminDO> findByDevIdInfo(String devId);
//    @Transactional
//    @Modifying

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

@@ -51,7 +51,7 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/single")
    @ApiOperation(value = "获取单条广告信息")
    public Envelop single(
            @ApiParam(name = "id", value = "广告id")
            @ApiParam(name = "id", value = "广告id",required = true)
            @RequestParam(value = "id", required = true) String id) throws Exception {
        JSONObject jsonObject = advrtisementService.getOneAdvInfo(id);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
@@ -64,10 +64,10 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.LAUNCHADVERTISEMENT )
    @ApiOperation(value = "投放广告")
    public Envelop launchAdvertisement(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开")
    public Envelop launchAdvertisement(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开",required = true)
                                          @RequestParam(value = "advIds",required = true) String advIds,
                                      @ApiParam(name = "devIds",value = "设备id,多个中间用,隔开,所有设备不传",required = true)
                                      @RequestParam(value = "ids",required = false)String devIds){
                                      @ApiParam(name = "devIds",value = "设备id,多个中间用,隔开,所有设备不传",required = false)
                                      @RequestParam(value = "devIds",required = false)String devIds){
        if (StringUtils.isBlank(advIds)){
            return failed("请确认该广告是否存在！");
        }
@@ -75,7 +75,7 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "/unlaunch")
    @ApiOperation(value = "取消投放广告")
    public Envelop unLaunch(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开")
    public Envelop unLaunch(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开",required = true)
                            @RequestParam(value = "advIds",required = true)String advIds){
        if (StringUtils.isBlank(advIds)){
            return failed("请确认该广告是否存在！");
@@ -205,7 +205,7 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/devinfo")
    @ApiOperation(value = "获取单条广告投放的所有设备明细")
    public Envelop devInfo(@ApiParam(name = "advId",value = "广告id")
    public Envelop devInfo(@ApiParam(name = "advId",value = "广告id",required = true)
                               @RequestParam(value = "advId",required = true)String advId) {
        List<AdvertisementLaunchDO> list = launchService.one(advId);
        if (list==null||list.size()==0){

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@@ -81,9 +81,9 @@ public class MedOrderService {
                mediicineorderdetail.setDrugSku(jsonObject.getString("drug_sku "));
                mediicineorderdetail.setDrugCode(jsonObject.getString("drug_code"));
                mediicineorderdetail.setSpecif(jsonObject.getString("drug_specs"));
                mediicineorderdetail.setDrugNum(jsonObject.getFloat("drug_num"));
                mediicineorderdetail.setDrugNum(jsonObject.getString("drug_num"));
                mediicineorderdetail.setPrice(jsonObject.getFloat("drug_price"));
                mediicineorderdetail.setUseNum(jsonObject.getFloat("drug_use_num"));
                mediicineorderdetail.setUseNum(jsonObject.getString("drug_use_num"));
                mediicineorderdetail.setOrderNo(ord.getOrderNum());
                mediicineorderdetail.setUseWay(jsonObject.getString("drug_use_way"));
                mediicineorderdetail.setUseRate(jsonObject.getString("drug_use_rate"));

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

@@ -1,6 +1,8 @@
package com.yihu.jw.base.service.advrtisement;
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.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
@@ -14,21 +16,25 @@ import java.util.List;
public class AdvertisementLaunchService extends BaseJpaService<AdvertisementLaunchDO, AdvertisementLaunchDAO> {
    @Autowired
    AdvertisementLaunchDAO advertisementLaunchDAO;
    @Autowired
    MediicineDeviceDao deviceDao;
    @Autowired
    AdvertisementPuttingAdminDAO adminDAO;
    public List<AdvertisementLaunchDO> one(String advId) {
        return advertisementLaunchDAO.findByAdvId(advId);
    }
    public List<AdvertisementLaunchDO> solo(String machineCode) {
        Mediicinedevice mediicinedevice = advertisementLaunchDAO.findByMachineCode(machineCode);
        Mediicinedevice mediicinedevice =deviceDao.findByMachineCode(machineCode);
        return advertisementLaunchDAO.findByDevId(mediicinedevice.getId());
    }
    public List<AdvertisementPuttingAdminDO> info(String devId) {
        return advertisementLaunchDAO.findByDevIdInfo(devId);
        return adminDAO.findByDevIdInfo(devId);
    }
    public List<Mediicinedevice> devInfo(String advId) {
        return advertisementLaunchDAO.findByAdvIdInfo(advId);
        return deviceDao.findByAdvIdInfo(advId);
    }
}

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

@@ -38,8 +38,7 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
    @Autowired
    AdvertisementLaunchDAO launchDAO;
    @Autowired
    private MediicineDeviceDao deviceDao;
    MediicineDeviceDao deviceDao;
    //按照分页查询
    public List<AdvertisementPuttingAdminDO>findAllAdvertisement(int page, int size){
@@ -93,18 +92,24 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
                if (advertisementExist(strings[i]).getForbidden() == 1) {
                    return "广告id:" + strings[i] + "已禁用！";
                }
                for (int j = 0; j < str.length; i++) {
                for (int j = 0; j < str.length; j++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setAdvId(strings[i]);
                    launchDO.setDevId(str[j]);
                    list.add(launchDO);
                    Iterable <AdvertisementLaunchDO> iterable=launchDAO.findByAdvIdAndDevId(strings[i],str[j]);
                    List<AdvertisementLaunchDO> list1=IterableUtils.toList(iterable);
                    if (list1==null||list1.size()==0) {
                        list.add(launchDO);
                    }
                }
                advertisementPuttingAdminDAO.updateLaunStatusTo1(strings[i]);
                for (int j = 0; j < str.length; i++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setAdvId(strings[i]);
                    launchDO.setDevId(str[j]);
                    list.add(launchDO);
            }
            for (int i = 0; i <list.size() ; i++) {
                for (int j = 1; j <list.size() ; j++) {
                    if (list.get(i).getAdvId().equals(list.get(j).getAdvId())
                            && list.get(i).getDevId().equals(list.get(j).getDevId())){
                        list.remove(j);
                    }
                }
            }
            launchDAO.save(list);
@@ -112,7 +117,7 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
            Iterable<Mediicinedevice> iterable = deviceDao.findAll();
            List<Mediicinedevice> mediicinedevices=IterableUtils.toList(iterable);
            for (int i = 0; i <mediicinedevices.size() ; i++) {
                for (int j = 0; j <strings.length ; i++) {
                for (int j = 0; j <strings.length ; j++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setDevId(mediicinedevices.get(i).getId());
                    launchDO.setAdvId(strings[j]);
@@ -229,7 +234,7 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
        for (int i = 0; i <str.length ; i++) {
            launchDAO.deleteByAdvId(str[i]);
        }
        return "删除成功";
        return "已取消投放";
    }