弹出窗口修改

This commit is contained in:
86182
2022-12-15 11:55:04 +08:00
parent 79b9b43f20
commit ab5dab4488
3 changed files with 45 additions and 2 deletions

View File

@@ -39,6 +39,15 @@ public class PopupApi extends ApiBaseController {
return success(list);
}
@GetMapping("/find-user")
public JsonResponse<List<Popup>> findForUser(String aid){
if(StringUtil.isBlank(aid)){
aid=this.getCurrent().getAccountId();
}
List<Popup> forUser = service.findForUser(aid);
return success(forUser);
}
/**
* 添加弹窗

View File

@@ -0,0 +1,9 @@
package com.xboe.module.popup.dao;
import com.xboe.core.orm.BaseDao;
import com.xboe.module.popup.entity.PopupUser;
import org.springframework.stereotype.Repository;
@Repository
public class PopupUserDao extends BaseDao<PopupUser> {
}

View File

@@ -6,12 +6,16 @@ import com.xboe.core.orm.FieldFilters;
import com.xboe.core.orm.LikeMatchMode;
import com.xboe.core.orm.QueryBuilder;
import com.xboe.module.popup.dao.PopupDao;
import com.xboe.module.popup.dao.PopupUserDao;
import com.xboe.module.popup.entity.Popup;
import com.xboe.module.popup.entity.PopupUser;
import com.xboe.module.popup.service.IPopupService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@Service
@@ -21,6 +25,10 @@ public class PopupServiceImpl implements IPopupService {
@Resource
PopupDao popupDao;
@Resource
PopupUserDao popupUserDao;
@Override
public List<Popup> list(Popup popup) {
@@ -74,7 +82,24 @@ public class PopupServiceImpl implements IPopupService {
@Override
public List<Popup> findForUser(String aid) {
//根据时间查询,在时间内的。
//如果一个用户只弹一次,还要结合 PopupUser 查询,
return null;
System.out.println(aid);
String from ="Popup p,PopupUser pu";
QueryBuilder builder = QueryBuilder.from(from);
builder.addFilter(FieldFilters.eqField("p.id","pu.popupId"));
//当前时间在时间内的
LocalDateTime now = LocalDateTime.now();
System.out.println(now);
// builder.addFilter(FieldFilters.ge("p.startTime",now));
// builder.addFilter(FieldFilters.lt("p.endTime",now));
if(StringUtil.isNotBlank(aid)){
builder.addFilter(FieldFilters.eq("pu.aid",aid));
}
builder.addFilter(FieldFilters.eq("pu.status",false));
// builder.addFilter(FieldFilters.eq("p.once",true));
builder.addFields("p");
List<Popup> list = popupDao.findList(builder.builder());
//如果一个用户只弹一次,还要结合 PopupUser 查询,
return list;
}
}