|
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.github.zuihou.base.R;
|
|
import com.github.zuihou.base.R;
|
|
|
|
+import com.github.zuihou.business.advertisement.entity.Advertisement;
|
|
|
|
+import com.github.zuihou.business.advertisement.service.AdvertisementService;
|
|
import com.github.zuihou.business.barrel.entity.EquBarrel;
|
|
import com.github.zuihou.business.barrel.entity.EquBarrel;
|
|
import com.github.zuihou.business.barrel.service.EquBarrelService;
|
|
import com.github.zuihou.business.barrel.service.EquBarrelService;
|
|
import com.github.zuihou.business.formula.entity.Formula;
|
|
import com.github.zuihou.business.formula.entity.Formula;
|
|
@@ -99,6 +101,9 @@ public class AndroidApi
|
|
@Resource
|
|
@Resource
|
|
private MemberService memberService;
|
|
private MemberService memberService;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private AdvertisementService advertisementService;
|
|
|
|
+
|
|
@ApiOperation("获取商品列表")
|
|
@ApiOperation("获取商品列表")
|
|
@GetMapping({"/goodsList"})
|
|
@GetMapping({"/goodsList"})
|
|
public R<List<EquGoodsDto>> goodsList(@RequestParam(name = "equId") Long equId)
|
|
public R<List<EquGoodsDto>> goodsList(@RequestParam(name = "equId") Long equId)
|
|
@@ -536,4 +541,21 @@ public class AndroidApi
|
|
redisTemplate.expire("wangyuanbo" + 123456789, 4, TimeUnit.SECONDS);
|
|
redisTemplate.expire("wangyuanbo" + 123456789, 4, TimeUnit.SECONDS);
|
|
return R.success(true, "成功");
|
|
return R.success(true, "成功");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 获取广告管理列表数据
|
|
|
|
+ *
|
|
|
|
+ * @return 广告管理列表数据
|
|
|
|
+ */
|
|
|
|
+ @GetMapping("/getAdList")
|
|
|
|
+ public R<List<Advertisement>> getAdList(@RequestParam(name = "equId") Long equId,
|
|
|
|
+ @RequestParam(name = "adStatus", required = false) String adStatus) {
|
|
|
|
+ BaseContextHandler.setTenant("0000");
|
|
|
|
+ LbqWrapper<Advertisement> queryWrap = Wraps.lbQ();
|
|
|
|
+ queryWrap.eq(Advertisement::getAdStatus, adStatus)
|
|
|
|
+ .eq(Advertisement::getDeliveryEquipmentId, equId)
|
|
|
|
+ .orderByDesc(Advertisement::getCreateTime);
|
|
|
|
+ List<Advertisement> list = advertisementService.list(queryWrap);
|
|
|
|
+ return R.success(list);
|
|
|
|
+ }
|
|
}
|
|
}
|