广告投放对接完成

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

@@ -18,8 +18,8 @@ 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 b.equ_num=?1",nativeQuery = true)
    Mediicinedevice findByEquNum(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/endpoint/adv/AdvertisementPuttingAdminEndPoint.java

@@ -67,8 +67,10 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    public Envelop launchAdvertisement(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开",required = true)
                                          @RequestParam(value = "advIds",required = true) String advIds,
                                      @ApiParam(name = "devIds",value = "设备id,多个中间用,隔开,所有设备不传",required = false)
                                      @RequestParam(value = "devIds",required = false)String devIds){
        JSONObject result =launchService.allotDevice(advIds,devIds);
                                      @RequestParam(value = "devIds",required = false)String devIds,
                                       @ApiParam(name = "isAll",value = "是否全部设备",required = true)
                                       @RequestParam(value = "isAll",required = true)Boolean isAll){
        JSONObject result =launchService.allotDevice(advIds,devIds,isAll);
        if (StringUtils.isEmpty(result.getString("该广告状态错误"))){
            return success(result.get("response"));
        }
@@ -201,10 +203,6 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取单条广告投放的所有设备明细")
    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){
            return failed("该广告未投放或者广告id错误");
        }
        List<Mediicinedevice> mediicinedeviceList=launchService.devInfo(advId);
        return success("获取单条广告所有投放设备明细成功",mediicinedeviceList);
    }

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

@@ -41,9 +41,9 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/devinfo")
    @ApiOperation(value = "获取单个设备上的所有广告")
    public Envelop solo(
            @ApiParam(name = "machineCode",value = "设备编码",required = true)
            @RequestParam(value = "machineCode",required = true)String machineCode){
        List<AdvertisementPuttingAdminDO> list=launchService.solo(machineCode);
            @ApiParam(name = "equNum",value = "设备编码",required = true)
            @RequestParam(value = "equNum",required = true)String equNum){
        List<AdvertisementPuttingAdminDO> list=launchService.solo(equNum);
        if (null==list){
            return failed("该设备没有广告或者该设备编码不存在");
        }

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

@@ -35,8 +35,8 @@ public class AdvertisementLaunchService extends BaseJpaService<AdvertisementLaun
        return advertisementLaunchDAO.findByAdvId(advId);
    }
    public List<AdvertisementPuttingAdminDO> solo(String machineCode) {
        Mediicinedevice mediicinedevice =deviceDao.findByMachineCode(machineCode);
    public List<AdvertisementPuttingAdminDO> solo(String equNum) {
        Mediicinedevice mediicinedevice =deviceDao.findByEquNum(equNum);
        if (null==mediicinedevice){
            return null;
        }
@@ -52,7 +52,7 @@ public class AdvertisementLaunchService extends BaseJpaService<AdvertisementLaun
    }
    @Transactional
    public JSONObject allotDevice(String advIds, String devIds) {
    public JSONObject allotDevice(String advIds, String devIds,Boolean isAll) {
        JSONObject result = new JSONObject();
        if (StringUtils.isEmpty(advIds)) {
            result.put("response", ConstantUtils.FAIL);
@@ -62,7 +62,7 @@ public class AdvertisementLaunchService extends BaseJpaService<AdvertisementLaun
        for (String advId : advIds.split(",")) {
            if (!StringUtils.isEmpty(advId)) {
                //全部设备
                if(StringUtils.isEmpty(devIds)) {
                if(isAll) {
                    Iterable<Mediicinedevice> lists = deviceDao.findAll();
                    Iterator iterator = lists.iterator();
                    while(iterator.hasNext()){

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/med/MedicinedrugsDao.java

@@ -0,0 +1,16 @@
package com.yihu.jw.hospital.dao.med;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface MedicinedrugsDao extends PagingAndSortingRepository<Mediicinedrugs, String> {
    //返回订单明细
    @Query("select a from Mediicinedrugs a  ")
    List<Mediicinedrugs> getorderdetail();
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/med/MedicineorderDao.java

@@ -0,0 +1,30 @@
package com.yihu.jw.hospital.dao.med;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
public interface MedicineorderDao extends PagingAndSortingRepository<Mediicineorder, Long>, JpaSpecificationExecutor<Mediicineorder> {
    //统计时间段的销售额
    @Query("select sum(a.amount) from Mediicineorder a where a.prescribeTime >=?1 and a.prescribeTime<=?2")
    float getsumamount(Date beg , Date end);
    //统计时间段的天的订单数量
    @Query("select count(1) from Mediicineorder a where a.prescribeTime >= ?1 and a.prescribeTime<=?2")
    int getcount(Date beg , Date end);
    @Query("select a from Mediicineorder a where a.prescribeNum = ?1")
    Mediicineorder findMediicineorderByPrescribeNum(String prescribeNum);
    @Query("select a from Mediicineorder a where a.id=?1")
    Mediicineorder findById(String id);
    @Query("select a from Mediicineorder a where a.orderNum=?1")
    Mediicineorder findByOrderNum(String order);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/med/MedicineDrugsService.java

@@ -0,0 +1,16 @@
package com.yihu.jw.hospital.service.med;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.hospital.dao.med.MedicinedrugsDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, MedicinedrugsDao> {
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/med/MedicineOrderService.java

@@ -0,0 +1,19 @@
package com.yihu.jw.hospital.service.med;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.hospital.dao.med.MedicineorderDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by Bing on 2021/9/23.
 */
@Service
public class MedicineOrderService extends BaseJpaService<Mediicineorder, MedicineorderDao> {
    @Autowired
    private MedicineorderDao orderDao;
}