|
|
@@ -3,8 +3,7 @@ package com.ruoyi.demo.service.impl;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.lang.Dict;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.github.pagehelper.PageHelper;
|
|
|
-import com.github.pagehelper.PageInfo;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.ruoyi.demo.entity.*;
|
|
|
import com.ruoyi.demo.entity.bo.CallBackBean;
|
|
|
import com.ruoyi.demo.entity.bo.PlanAddBo;
|
|
|
@@ -22,8 +21,6 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.time.LocalDateTime;
|
|
|
-import java.time.ZoneId;
|
|
|
import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
@@ -55,66 +52,64 @@ public class PlanServiceImpl implements PlanService {
|
|
|
StatisticsMapper statisticsMapper;
|
|
|
@Autowired
|
|
|
ExposureMapper exposureMapper;
|
|
|
-// @Autowired
|
|
|
-// SysUserMapper sysUserMapper;
|
|
|
|
|
|
@Override
|
|
|
public String getSign(PlanAddBo bo) {
|
|
|
QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
|
|
|
- appQueryWrapper.eq("appkey",bo.getAppkey());
|
|
|
- appQueryWrapper.eq("state",1);
|
|
|
- appQueryWrapper.eq("deleted","0");
|
|
|
+ appQueryWrapper.eq("appkey", bo.getAppkey());
|
|
|
+ appQueryWrapper.eq("state", 1);
|
|
|
+ appQueryWrapper.eq("deleted", "0");
|
|
|
App app = appMapper.selectOne(appQueryWrapper);
|
|
|
if (app == null)
|
|
|
return "error";
|
|
|
- Map<String,Object> params = Dict.create()
|
|
|
- .set("appkey",bo.getAppkey())
|
|
|
- .set("goodsId",bo.getGoodsId())
|
|
|
- .set("goodsImg",bo.getGoodsImg())
|
|
|
- .set("goodsIntroduce",bo.getGoodsIntroduce())
|
|
|
- .set("goodsLogo",bo.getGoodsLogo())
|
|
|
- .set("goodsName",bo.getGoodsName())
|
|
|
- .set("goodsClassify",bo.getGoodsClassify())
|
|
|
- .set("goodsPrice",bo.getGoodsPrice())
|
|
|
- .set("items",bo.getItems())
|
|
|
- .set("planEndTime",bo.getPlanEndTime())
|
|
|
- .set("planStartTime",bo.getPlanStartTime())
|
|
|
- .set("sign",null)
|
|
|
- .set("vendorId",bo.getVendorId())
|
|
|
- .set("vendorName",bo.getVendorName());
|
|
|
- return SignUtil.sign(params,app.getAppSecret());
|
|
|
+ Map<String, Object> params = Dict.create()
|
|
|
+ .set("appkey", bo.getAppkey())
|
|
|
+ .set("goodsId", bo.getGoodsId())
|
|
|
+ .set("goodsImg", bo.getGoodsImg())
|
|
|
+ .set("goodsIntroduce", bo.getGoodsIntroduce())
|
|
|
+ .set("goodsLogo", bo.getGoodsLogo())
|
|
|
+ .set("goodsName", bo.getGoodsName())
|
|
|
+ .set("goodsClassify", bo.getGoodsClassify())
|
|
|
+ .set("goodsPrice", bo.getGoodsPrice())
|
|
|
+ .set("items", bo.getItems())
|
|
|
+ .set("planEndTime", bo.getPlanEndTime())
|
|
|
+ .set("planStartTime", bo.getPlanStartTime())
|
|
|
+ .set("sign", null)
|
|
|
+ .set("vendorId", bo.getVendorId())
|
|
|
+ .set("vendorName", bo.getVendorName());
|
|
|
+ return SignUtil.sign(params, app.getAppSecret());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public int addPlan(PlanAddBo bo) {
|
|
|
// app是否可用
|
|
|
QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
|
|
|
- appQueryWrapper.eq("appkey",bo.getAppkey());
|
|
|
- appQueryWrapper.eq("state",1);
|
|
|
- appQueryWrapper.eq("deleted","0");
|
|
|
+ appQueryWrapper.eq("appkey", bo.getAppkey());
|
|
|
+ appQueryWrapper.eq("state", 1);
|
|
|
+ appQueryWrapper.eq("deleted", "0");
|
|
|
App app = appMapper.selectOne(appQueryWrapper);
|
|
|
if (app == null)
|
|
|
return -1;
|
|
|
// 校验
|
|
|
- Map<String,Object> params = Dict.create()
|
|
|
- .set("appkey",bo.getAppkey())
|
|
|
- .set("goodsId",bo.getGoodsId())
|
|
|
- .set("goodsImg",bo.getGoodsImg())
|
|
|
- .set("goodsIntroduce",bo.getGoodsIntroduce())
|
|
|
- .set("goodsLogo",bo.getGoodsLogo())
|
|
|
- .set("goodsName",bo.getGoodsName())
|
|
|
- .set("goodsClassify",bo.getGoodsClassify())
|
|
|
- .set("goodsPrice",bo.getGoodsPrice())
|
|
|
- .set("items",bo.getItems())
|
|
|
- .set("planEndTime",bo.getPlanEndTime())
|
|
|
- .set("planStartTime",bo.getPlanStartTime())
|
|
|
- .set("sign",bo.getSign())
|
|
|
- .set("vendorId",bo.getVendorId())
|
|
|
- .set("vendorName",bo.getVendorName());
|
|
|
- if (!SignUtil.verify(params,app.getAppSecret()))
|
|
|
+ Map<String, Object> params = Dict.create()
|
|
|
+ .set("appkey", bo.getAppkey())
|
|
|
+ .set("goodsId", bo.getGoodsId())
|
|
|
+ .set("goodsImg", bo.getGoodsImg())
|
|
|
+ .set("goodsIntroduce", bo.getGoodsIntroduce())
|
|
|
+ .set("goodsLogo", bo.getGoodsLogo())
|
|
|
+ .set("goodsName", bo.getGoodsName())
|
|
|
+ .set("goodsClassify", bo.getGoodsClassify())
|
|
|
+ .set("goodsPrice", bo.getGoodsPrice())
|
|
|
+ .set("items", bo.getItems())
|
|
|
+ .set("planEndTime", bo.getPlanEndTime())
|
|
|
+ .set("planStartTime", bo.getPlanStartTime())
|
|
|
+ .set("sign", bo.getSign())
|
|
|
+ .set("vendorId", bo.getVendorId())
|
|
|
+ .set("vendorName", bo.getVendorName());
|
|
|
+ if (!SignUtil.verify(params, app.getAppSecret()))
|
|
|
return -3;
|
|
|
// 插入广告计划
|
|
|
- Plan plan = new Plan(app,bo);
|
|
|
+ Plan plan = new Plan(app, bo);
|
|
|
planMapper.insert(plan);
|
|
|
// 插入广告计划明细
|
|
|
for (PlanItemAddBo itemAddBo : bo.getItems()) {
|
|
|
@@ -123,11 +118,11 @@ public class PlanServiceImpl implements PlanService {
|
|
|
}
|
|
|
// 插入商品信息
|
|
|
QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
|
|
|
- goodsQueryWrapper.eq("appkey",bo.getAppkey());
|
|
|
- goodsQueryWrapper.eq("goods_id",bo.getGoodsId());
|
|
|
- goodsQueryWrapper.eq("vendor_id",bo.getVendorId());
|
|
|
+ goodsQueryWrapper.eq("appkey", bo.getAppkey());
|
|
|
+ goodsQueryWrapper.eq("goods_id", bo.getGoodsId());
|
|
|
+ goodsQueryWrapper.eq("vendor_id", bo.getVendorId());
|
|
|
Goods query = goodsMapper.selectOne(goodsQueryWrapper);
|
|
|
- if (query == null){
|
|
|
+ if (query == null) {
|
|
|
Goods goods = new Goods(plan);
|
|
|
goodsMapper.insert(goods);
|
|
|
}
|
|
|
@@ -137,38 +132,38 @@ public class PlanServiceImpl implements PlanService {
|
|
|
@Override
|
|
|
public int deletePlan(String id) {
|
|
|
QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
|
|
|
- itemQueryWrapper.eq("plan_id",id);
|
|
|
+ itemQueryWrapper.eq("plan_id", id);
|
|
|
planItemMapper.delete(itemQueryWrapper);
|
|
|
QueryWrapper<Plan> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("plan_id",id);
|
|
|
+ queryWrapper.eq("plan_id", id);
|
|
|
return planMapper.delete(queryWrapper);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public int deletePlans(List<String> ids) {
|
|
|
int i = 0;
|
|
|
- for (String id : ids){
|
|
|
+ for (String id : ids) {
|
|
|
QueryWrapper<Plan> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("plan_id",id);
|
|
|
+ queryWrapper.eq("plan_id", id);
|
|
|
i += planMapper.delete(queryWrapper);
|
|
|
}
|
|
|
return i;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int checkPlan(PlanBo bo,Long userId,String userName) {
|
|
|
+ public int checkPlan(PlanBo bo, Long userId, String userName) {
|
|
|
// 是否有该计划
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
- planQueryWrapper.eq("plan_id",bo.getPlanId());
|
|
|
- planQueryWrapper.eq("deleted","0");
|
|
|
+ planQueryWrapper.eq("plan_id", bo.getPlanId());
|
|
|
+ planQueryWrapper.eq("deleted", "0");
|
|
|
Plan plan = planMapper.selectOne(planQueryWrapper);
|
|
|
if (plan == null)
|
|
|
return -1;
|
|
|
// 没有该app或者该app已经被禁用，则不允许审核
|
|
|
QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
|
|
|
- appQueryWrapper.eq("appkey",plan.getAppkey());
|
|
|
- appQueryWrapper.eq("state",1);
|
|
|
- appQueryWrapper.eq("deleted","0");
|
|
|
+ appQueryWrapper.eq("appkey", plan.getAppkey());
|
|
|
+ appQueryWrapper.eq("state", 1);
|
|
|
+ appQueryWrapper.eq("deleted", "0");
|
|
|
App app = appMapper.selectOne(appQueryWrapper);
|
|
|
if (app == null)
|
|
|
return -1;
|
|
|
@@ -179,9 +174,9 @@ public class PlanServiceImpl implements PlanService {
|
|
|
int i = planMapper.updateById(plan);
|
|
|
if (i == 0) return 0;
|
|
|
// 插入审核记录
|
|
|
- PlanAudit audit = new PlanAudit(bo,userId.toString(),userName);
|
|
|
+ PlanAudit audit = new PlanAudit(bo, userId.toString(), userName);
|
|
|
int insert = planAuditMapper.insert(audit);
|
|
|
- if (insert == 1){ // 审核计划插入成功
|
|
|
+ if (insert == 1) { // 审核计划插入成功
|
|
|
// 启动回调地址
|
|
|
CallBackBean callBackBean = new CallBackBean();
|
|
|
callBackBean.setAuditPerson(userName);
|
|
|
@@ -189,53 +184,54 @@ public class PlanServiceImpl implements PlanService {
|
|
|
callBackBean.setAuditComment("审核通过");
|
|
|
else callBackBean.setAuditComment("审核不通过");
|
|
|
callBackBean.setAuditTime(now);
|
|
|
- SendCallBackUtil.sendCallBack(app.getCallBack(),callBackBean);
|
|
|
+ SendCallBackUtil.sendCallBack(app.getCallBack(), callBackBean);
|
|
|
}
|
|
|
return insert;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public PageInfo<List<PlanListVo>> getPlanList(PlanBo bo) {
|
|
|
- PageHelper.startPage(bo.getPageNum(), bo.getPageSize(),true);
|
|
|
+ public MyPage<PlanListVo> getPlanList(PlanBo bo) {
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
if (bo.getText() != null)
|
|
|
planQueryWrapper.and(planQueryWrapper1 -> {
|
|
|
planQueryWrapper1/*.like("plan_id",bo.getText())
|
|
|
.or()*/
|
|
|
- .like("plan_name",bo.getText())
|
|
|
+ .like("plan_name", bo.getText())
|
|
|
.or()
|
|
|
- .like("principal_name",bo.getText())
|
|
|
+ .like("principal_name", bo.getText())
|
|
|
.or()
|
|
|
- .like("principal_telephone",bo.getText());
|
|
|
+ .like("principal_telephone", bo.getText());
|
|
|
});
|
|
|
if (bo.getStartTime() != null) // 搜索开始时间小于等于广告计划创建时间
|
|
|
- planQueryWrapper.apply("plan_create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
+ planQueryWrapper.apply("plan_create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
|
|
|
if (bo.getEndTime() != null) // 搜索结束时间大于等于广告计划创建时间
|
|
|
- planQueryWrapper.apply("plan_create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
+ planQueryWrapper.apply("plan_create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
|
|
|
planQueryWrapper.eq("state", StateUtil.APPROVED);
|
|
|
- planQueryWrapper.eq("deleted","0");
|
|
|
- List<Plan> plans = planMapper.selectList(planQueryWrapper);
|
|
|
+ planQueryWrapper.eq("deleted", "0");
|
|
|
+ Page<Plan> page = new Page<>(bo.getPageNum(), bo.getPageSize());
|
|
|
+ Page<Plan> planPage = planMapper.selectPage(page, planQueryWrapper);
|
|
|
+ List<Plan> plans = planPage.getRecords();
|
|
|
List<PlanListVo> vos = new ArrayList<>();
|
|
|
- for (Plan plan : plans){
|
|
|
+ for (Plan plan : plans) {
|
|
|
vos.add(new PlanListVo(plan));
|
|
|
}
|
|
|
- return new PageInfo(vos);
|
|
|
+ return new MyPage<>(page, vos);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public PlanDetailVo getPlanDetail(String planId) {
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
- planQueryWrapper.eq("plan_id",planId);
|
|
|
- planQueryWrapper.eq("deleted","0");
|
|
|
+ planQueryWrapper.eq("plan_id", planId);
|
|
|
+ planQueryWrapper.eq("deleted", "0");
|
|
|
Plan plan = planMapper.selectOne(planQueryWrapper);
|
|
|
if (plan == null)
|
|
|
return null;
|
|
|
QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
|
|
|
- itemQueryWrapper.eq("plan_id",planId);
|
|
|
+ itemQueryWrapper.eq("plan_id", planId);
|
|
|
List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
|
|
|
List<PlanItemVo> itemVos = new ArrayList<>();
|
|
|
if (items != null)
|
|
|
- for (PlanItem item : items){
|
|
|
+ for (PlanItem item : items) {
|
|
|
itemVos.add(new PlanItemVo(item));
|
|
|
}
|
|
|
PlanDetailVo vo = new PlanDetailVo(plan, itemVos);
|
|
|
@@ -248,22 +244,22 @@ public class PlanServiceImpl implements PlanService {
|
|
|
// 再根据每个广告计划id，查询其商品信息
|
|
|
List<PlanPushVo> pushVos = new ArrayList<>();
|
|
|
QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
|
|
|
- itemQueryWrapper.eq("equipment_id",equipmentId);
|
|
|
- itemQueryWrapper.eq("deleted","0");
|
|
|
+ itemQueryWrapper.eq("equipment_id", equipmentId);
|
|
|
+ itemQueryWrapper.eq("deleted", "0");
|
|
|
List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
|
|
|
- for (PlanItem item : items){
|
|
|
+ for (PlanItem item : items) {
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
|
// 广告计划开始时间 <= 当前时间 < 广告计划结束时间
|
|
|
- planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",DateUtil.date());
|
|
|
- planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",DateUtil.date());
|
|
|
+ planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", DateUtil.date());
|
|
|
+ planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", DateUtil.date());
|
|
|
|
|
|
- planQueryWrapper.eq("plan_id",item.getPlanId());
|
|
|
- planQueryWrapper.eq("state",StateUtil.APPROVED);
|
|
|
- planQueryWrapper.eq("deleted","0");
|
|
|
+ planQueryWrapper.eq("plan_id", item.getPlanId());
|
|
|
+ planQueryWrapper.eq("state", StateUtil.APPROVED);
|
|
|
+ planQueryWrapper.eq("deleted", "0");
|
|
|
Plan plan = planMapper.selectOne(planQueryWrapper);
|
|
|
if (plan != null)
|
|
|
- pushVos.add(new PlanPushVo(item,plan));
|
|
|
+ pushVos.add(new PlanPushVo(item, plan));
|
|
|
}
|
|
|
return pushVos;
|
|
|
}
|
|
|
@@ -273,25 +269,25 @@ public class PlanServiceImpl implements PlanService {
|
|
|
List<PlanPushVo> pushVos = new ArrayList<>();
|
|
|
// 根据设备编号查询设备下的广告计划子项
|
|
|
QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
|
|
|
- itemQueryWrapper.eq("equipment_code",equipmentCode);
|
|
|
- itemQueryWrapper.eq("deleted","0");
|
|
|
+ itemQueryWrapper.eq("equipment_code", equipmentCode);
|
|
|
+ itemQueryWrapper.eq("deleted", "0");
|
|
|
List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
|
|
|
// 排序
|
|
|
items.sort(Comparator.comparing(PlanItem::getSort).reversed());
|
|
|
- for (PlanItem item : items){ // 根据计划子项查询计划，并补齐返回信息
|
|
|
+ for (PlanItem item : items) { // 根据计划子项查询计划，并补齐返回信息
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
- planQueryWrapper.eq("plan_id",item.getPlanId());
|
|
|
+ planQueryWrapper.eq("plan_id", item.getPlanId());
|
|
|
|
|
|
// 广告计划开始时间 <= 当前时间 < 广告计划结束时间
|
|
|
- planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",DateUtil.date());
|
|
|
- planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",DateUtil.date());
|
|
|
+ planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", DateUtil.date());
|
|
|
+ planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", DateUtil.date());
|
|
|
|
|
|
- planQueryWrapper.eq("state",StateUtil.APPROVED);
|
|
|
+ planQueryWrapper.eq("state", StateUtil.APPROVED);
|
|
|
planQueryWrapper.eq("on_state", OnStateUtil.UP);
|
|
|
- planQueryWrapper.eq("deleted","0");
|
|
|
+ planQueryWrapper.eq("deleted", "0");
|
|
|
Plan plan = planMapper.selectOne(planQueryWrapper);
|
|
|
if (plan != null)
|
|
|
- pushVos.add(new PlanPushVo(item,plan));
|
|
|
+ pushVos.add(new PlanPushVo(item, plan));
|
|
|
}
|
|
|
return pushVos;
|
|
|
}
|
|
|
@@ -300,64 +296,64 @@ public class PlanServiceImpl implements PlanService {
|
|
|
public int planUpDown(String planId) {
|
|
|
// 是否存在该广告计划
|
|
|
QueryWrapper<Plan> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("plan_id",planId);
|
|
|
- queryWrapper.eq("deleted","0");
|
|
|
+ queryWrapper.eq("plan_id", planId);
|
|
|
+ queryWrapper.eq("deleted", "0");
|
|
|
Plan plan = planMapper.selectOne(queryWrapper);
|
|
|
if (plan == null)
|
|
|
return -1;
|
|
|
// 改变状态，1：上架；0：下架
|
|
|
- plan.setOnState(plan.getOnState()+1);
|
|
|
+ plan.setOnState(plan.getOnState() + 1);
|
|
|
if (plan.getOnState() >= 2)
|
|
|
plan.setOnState(0);
|
|
|
return planMapper.updateById(plan);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public PageInfo<List<PlanManageListVo>> getPlanManageList(PlanBo bo) {
|
|
|
- PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
|
|
|
+ public MyPage<PlanManageListVo> getPlanManageList(PlanBo bo) {
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
- planQueryWrapper.eq("state",bo.getState());
|
|
|
+ planQueryWrapper.eq("state", bo.getState());
|
|
|
if (bo.getText() != null)
|
|
|
planQueryWrapper.and(planQueryWrapper1 -> {
|
|
|
planQueryWrapper1/*.like("plan_id",bo.getText())
|
|
|
.or()*/
|
|
|
- .like("app_name",bo.getText())
|
|
|
+ .like("app_name", bo.getText())
|
|
|
.or()
|
|
|
- .like("commercial_name",bo.getText());
|
|
|
+ .like("commercial_name", bo.getText());
|
|
|
});
|
|
|
if (bo.getStartTime() != null)
|
|
|
- planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
+ planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
|
|
|
if (bo.getEndTime() != null)
|
|
|
- planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
- planQueryWrapper.eq("deleted","0");
|
|
|
- List<Plan> plans = planMapper.selectList(planQueryWrapper);
|
|
|
+ planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
|
|
|
+ planQueryWrapper.eq("deleted", "0");
|
|
|
+ Page<Plan> page = new Page<>(bo.getPageNum(), bo.getPageSize());
|
|
|
+ List<Plan> plans = planMapper.selectPage(page, planQueryWrapper).getRecords();
|
|
|
List<PlanManageListVo> vos = new ArrayList<>();
|
|
|
- for (Plan plan : plans){
|
|
|
+ for (Plan plan : plans) {
|
|
|
PlanManageListVo vo = new PlanManageListVo(plan);
|
|
|
// 查询计划的设备数量
|
|
|
Integer count = planItemMapper.selectEquipmentCountByPlanId(plan.getPlanId());
|
|
|
vo.setEquipmentCount(count);
|
|
|
vos.add(vo);
|
|
|
}
|
|
|
- return new PageInfo(vos);
|
|
|
+ return new MyPage<>(page, vos);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public PlanManageDetailVo getPlanManageDetail(String planId) {
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
- planQueryWrapper.eq("plan_id",planId);
|
|
|
- planQueryWrapper.eq("deleted","0");
|
|
|
+ planQueryWrapper.eq("plan_id", planId);
|
|
|
+ planQueryWrapper.eq("deleted", "0");
|
|
|
Plan plan = planMapper.selectOne(planQueryWrapper);
|
|
|
if (plan == null)
|
|
|
return null;
|
|
|
QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
|
|
|
- itemQueryWrapper.eq("plan_id",planId);
|
|
|
- itemQueryWrapper.eq("deleted","0");
|
|
|
+ itemQueryWrapper.eq("plan_id", planId);
|
|
|
+ itemQueryWrapper.eq("deleted", "0");
|
|
|
List<PlanItem> items = planItemMapper.selectList(itemQueryWrapper);
|
|
|
List<PlanManageItemVo> itemVos = new ArrayList<>();
|
|
|
- for (PlanItem item : items){ // 补齐店铺信息
|
|
|
+ for (PlanItem item : items) { // 补齐店铺信息
|
|
|
PlanManageItemVo itemVo = new PlanManageItemVo(item);
|
|
|
- if (item.getStoreId() != null){
|
|
|
+ if (item.getStoreId() != null) {
|
|
|
Store store = storeMapper.selectById(item.getStoreId());
|
|
|
if (store != null)
|
|
|
itemVo.setStoreName(store.getStoreName());
|
|
|
@@ -369,41 +365,40 @@ public class PlanServiceImpl implements PlanService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public PageInfo<List<PlanPushListVo>> getPlanPushList(PlanBo bo) {
|
|
|
- PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
|
|
|
+ public MyPage<PlanPushListVo> getPlanPushList(PlanBo bo) {
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
- planQueryWrapper.eq("appkey",bo.getAppkey());
|
|
|
+ planQueryWrapper.eq("appkey", bo.getAppkey());
|
|
|
// planQueryWrapper.eq("commercial_id",bo.getCommercialId());
|
|
|
if (bo.getText() != null)
|
|
|
planQueryWrapper.and(planQueryWrapper1 -> {
|
|
|
- planQueryWrapper1.like("plan_id",bo.getText())
|
|
|
+ planQueryWrapper1.like("plan_id", bo.getText())
|
|
|
.or()
|
|
|
- .like("plan_name",bo.getText())
|
|
|
+ .like("plan_name", bo.getText())
|
|
|
.or()
|
|
|
- .like("principal_name",bo.getText())
|
|
|
+ .like("principal_name", bo.getText())
|
|
|
.or()
|
|
|
- .like("principal_telephone",bo.getText());
|
|
|
+ .like("principal_telephone", bo.getText());
|
|
|
});
|
|
|
if (bo.getStartTime() != null)
|
|
|
- planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
+ planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
|
|
|
if (bo.getEndTime() != null)
|
|
|
- planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
- planQueryWrapper.eq("deleted","0");
|
|
|
- List<Plan> plans = planMapper.selectList(planQueryWrapper);
|
|
|
+ planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
|
|
|
+ planQueryWrapper.eq("deleted", "0");
|
|
|
+ Page<Plan> page = new Page<>(bo.getPageNum(), bo.getPageSize());
|
|
|
+ List<Plan> plans = planMapper.selectPage(page, planQueryWrapper).getRecords();
|
|
|
List<PlanPushListVo> vos = new ArrayList<>();
|
|
|
- for (Plan plan : plans){
|
|
|
+ for (Plan plan : plans) {
|
|
|
PlanPushListVo vo = new PlanPushListVo(plan);
|
|
|
// 根据计划id获取设备数量
|
|
|
Integer count = planItemMapper.selectEquipmentCountByPlanId(plan.getPlanId());
|
|
|
vo.setEquipmentCount(count);
|
|
|
vos.add(vo);
|
|
|
}
|
|
|
- return new PageInfo(vos);
|
|
|
+ return new MyPage<>(page, vos);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public PageInfo<List<PlanPushStatisticsListVo>> getPlanPushStatisticsList(PlanBo bo) {
|
|
|
- PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
|
|
|
+ public MyPage<PlanPushStatisticsListVo> getPlanPushStatisticsList(PlanBo bo) {
|
|
|
QueryWrapper<PlanPushStatistics> statisticsQueryWrapper = new QueryWrapper<>();
|
|
|
if (bo.getText() != null)
|
|
|
statisticsQueryWrapper.and(planPushStatisticsQueryWrapper -> {
|
|
|
@@ -411,25 +406,26 @@ public class PlanServiceImpl implements PlanService {
|
|
|
.or()
|
|
|
.like("equipment_code",bo.getText())
|
|
|
.or()*/
|
|
|
- .like("equipment_name",bo.getText());
|
|
|
+ .like("equipment_name", bo.getText());
|
|
|
});
|
|
|
if (bo.getStartTime() != null)
|
|
|
- statisticsQueryWrapper.apply("laster_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
+ statisticsQueryWrapper.apply("laster_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
|
|
|
if (bo.getEndTime() != null)
|
|
|
- statisticsQueryWrapper.apply("laster_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
- List<PlanPushStatistics> list = planPushStatisticsMapper.selectList(statisticsQueryWrapper);
|
|
|
+ statisticsQueryWrapper.apply("laster_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
|
|
|
+ Page<PlanPushStatistics> page = new Page<>(bo.getPageNum(), bo.getPageSize());
|
|
|
+ List<PlanPushStatistics> list = planPushStatisticsMapper.selectPage(page, statisticsQueryWrapper).getRecords();
|
|
|
List<PlanPushStatisticsListVo> vos = new ArrayList<>();
|
|
|
- for (PlanPushStatistics statistics : list){
|
|
|
+ for (PlanPushStatistics statistics : list) {
|
|
|
vos.add(new PlanPushStatisticsListVo(statistics));
|
|
|
}
|
|
|
- return new PageInfo(vos);
|
|
|
+ return new MyPage<>(page, vos);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void planPushStatisticsStart() {
|
|
|
// 清除当前月的统计记录
|
|
|
QueryWrapper<PlanPushStatistics> planPushStatisticsQueryWrapper = new QueryWrapper<>();
|
|
|
- planPushStatisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m') = DATE_FORMAT({0},'%Y-%m')",DateUtil.date());
|
|
|
+ planPushStatisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m') = DATE_FORMAT({0},'%Y-%m')", DateUtil.date());
|
|
|
planPushStatisticsMapper.delete(planPushStatisticsQueryWrapper);
|
|
|
// 获取所有设备，遍历
|
|
|
for (Equipment equipment : equipmentMapper.selectList(null)) {
|
|
|
@@ -469,23 +465,23 @@ public class PlanServiceImpl implements PlanService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<AddrCategory> getAddrCategoryLevel(String code,String level) {
|
|
|
- if ("province".equals(level)){
|
|
|
+ public List<AddrCategory> getAddrCategoryLevel(String code, String level) {
|
|
|
+ if ("province".equals(level)) {
|
|
|
QueryWrapper<AddrCategory> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("city","");
|
|
|
+ queryWrapper.eq("city", "");
|
|
|
return addrCategoryMapper.selectList(queryWrapper);
|
|
|
- }else if("city".equals(level)){
|
|
|
+ } else if ("city".equals(level)) {
|
|
|
QueryWrapper<AddrCategory> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.likeRight("addr_code",code.substring(0,2));
|
|
|
+ queryWrapper.likeRight("addr_code", code.substring(0, 2));
|
|
|
queryWrapper.and(categoryQueryWrapper -> {
|
|
|
categoryQueryWrapper.eq("district", "").and(addrCategoryQueryWrapper -> {
|
|
|
addrCategoryQueryWrapper.ne("city", "");
|
|
|
});
|
|
|
});
|
|
|
return addrCategoryMapper.selectList(queryWrapper);
|
|
|
- }else if("zone".equals(level)){
|
|
|
+ } else if ("zone".equals(level)) {
|
|
|
QueryWrapper<AddrCategory> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.likeRight("addr_code",code.substring(0,4));
|
|
|
+ queryWrapper.likeRight("addr_code", code.substring(0, 4));
|
|
|
queryWrapper.and(categoryQueryWrapper -> {
|
|
|
categoryQueryWrapper.ne("district", "");
|
|
|
});
|
|
|
@@ -495,34 +491,34 @@ public class PlanServiceImpl implements PlanService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public PageInfo<List<Equipment>> getEquipments(PlanBo bo) {
|
|
|
- PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
|
|
|
+ public Page<Equipment> getEquipments(PlanBo bo) {
|
|
|
QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
|
|
|
- equipmentQueryWrapper.eq("state",1);
|
|
|
+ equipmentQueryWrapper.eq("state", 1);
|
|
|
if (bo.getText() != null)
|
|
|
equipmentQueryWrapper.and(equipmentQueryWrapper1 -> {
|
|
|
- equipmentQueryWrapper1.like("equipment_id",bo.getText())
|
|
|
+ equipmentQueryWrapper1.like("equipment_id", bo.getText())
|
|
|
.or()
|
|
|
- .like("equipment_code",bo.getText())
|
|
|
+ .like("equipment_code", bo.getText())
|
|
|
.or()
|
|
|
- .like("equipment_name",bo.getText());
|
|
|
+ .like("equipment_name", bo.getText());
|
|
|
});
|
|
|
- if (bo.getAddrCodes() != null){
|
|
|
- for (String addrCode : bo.getAddrCodes()){
|
|
|
+ if (bo.getAddrCodes() != null) {
|
|
|
+ for (String addrCode : bo.getAddrCodes()) {
|
|
|
// 拆分地址码
|
|
|
- String province = String.valueOf(addrCode.charAt(0))+String.valueOf(addrCode.charAt(1));
|
|
|
- String city = String.valueOf(addrCode.charAt(2))+String.valueOf(addrCode.charAt(3));
|
|
|
- String district = String.valueOf(addrCode.charAt(4))+String.valueOf(addrCode.charAt(5));
|
|
|
+ String province = String.valueOf(addrCode.charAt(0)) + String.valueOf(addrCode.charAt(1));
|
|
|
+ String city = String.valueOf(addrCode.charAt(2)) + String.valueOf(addrCode.charAt(3));
|
|
|
+ String district = String.valueOf(addrCode.charAt(4)) + String.valueOf(addrCode.charAt(5));
|
|
|
|
|
|
- if (district.equals("00")){
|
|
|
+ if (district.equals("00")) {
|
|
|
if (city.equals("00"))
|
|
|
- equipmentQueryWrapper.or().likeRight("addr_code",province);
|
|
|
+ equipmentQueryWrapper.or().likeRight("addr_code", province);
|
|
|
else
|
|
|
- equipmentQueryWrapper.or().likeRight("addr_code",province+city);
|
|
|
- }else
|
|
|
- equipmentQueryWrapper.or().likeRight("addr_code",province+city+district);
|
|
|
+ equipmentQueryWrapper.or().likeRight("addr_code", province + city);
|
|
|
+ } else
|
|
|
+ equipmentQueryWrapper.or().likeRight("addr_code", province + city + district);
|
|
|
}
|
|
|
}
|
|
|
- return new PageInfo(equipmentMapper.selectList(equipmentQueryWrapper));
|
|
|
+ Page<Equipment> page = new Page<>(bo.getPageNum(), bo.getPageSize());
|
|
|
+ return equipmentMapper.selectPage(page, equipmentQueryWrapper);
|
|
|
}
|
|
|
}
|
云殇忆