|
|
@@ -1,35 +1,34 @@
|
|
|
package com.ruoyi.demo.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
+import cn.hutool.core.util.ObjUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.github.pagehelper.PageHelper;
|
|
|
-import com.github.pagehelper.PageInfo;
|
|
|
import com.ruoyi.common.core.domain.R;
|
|
|
-import com.ruoyi.demo.config.MtStarProperties;
|
|
|
import com.ruoyi.demo.entity.*;
|
|
|
import com.ruoyi.demo.entity.bo.EquipmentBo;
|
|
|
-import com.ruoyi.demo.entity.bo.PlanBo;
|
|
|
import com.ruoyi.demo.entity.bo.PlanItemBo;
|
|
|
import com.ruoyi.demo.entity.vo.EquipmentVo;
|
|
|
import com.ruoyi.demo.entity.vo.PlanItemVo;
|
|
|
-import com.ruoyi.demo.enums.EquipmentStateEnum;
|
|
|
import com.ruoyi.demo.mapper.*;
|
|
|
import com.ruoyi.demo.service.EquipmentService;
|
|
|
+import com.ruoyi.demo.service.SysCodeService;
|
|
|
import com.ruoyi.demo.utils.InitMapUtil;
|
|
|
import com.ruoyi.demo.utils.MtStarUtil;
|
|
|
+import com.ruoyi.demo.utils.UuidUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.time.LocalDateTime;
|
|
|
-import java.time.ZoneId;
|
|
|
-import java.util.*;
|
|
|
-import java.util.concurrent.CompletableFuture;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
@@ -59,18 +58,22 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
@Autowired
|
|
|
@Qualifier("equipmentStateMap")
|
|
|
- HashMap<Integer,String> equipmentStateMap;
|
|
|
+ HashMap<Integer, String> equipmentStateMap;
|
|
|
|
|
|
@Autowired
|
|
|
@Qualifier("equipmentOnStateMap")
|
|
|
- HashMap<Integer,String> equipmentOnStateMap;
|
|
|
+ HashMap<Integer, String> equipmentOnStateMap;
|
|
|
|
|
|
@Autowired
|
|
|
MtStarUtil mtStarUtil;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SysCodeService sysCodeService;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 添加设备
|
|
|
+ *
|
|
|
* @param equipmentVo
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -80,10 +83,9 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
QueryWrapper<Equipment> equipmentCode = new QueryWrapper<>();
|
|
|
equipmentCode.eq("equipment_code", equipmentVo.getEquipmentCode());
|
|
|
Long aLong = equipmentMapper.selectCount(equipmentCode);
|
|
|
- if (aLong == 0){
|
|
|
+ if (aLong == 0) {
|
|
|
Equipment equipment = new Equipment(equipmentVo);
|
|
|
//1.新增地区码映射
|
|
|
- //equipment.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipment.getAddrCode()));
|
|
|
|
|
|
//2.新增创建时间
|
|
|
equipment.setEnterTime(DateUtil.date());
|
|
|
@@ -95,6 +97,7 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
/**
|
|
|
* 修改设备信息
|
|
|
+ *
|
|
|
* @param equipmentVo
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -102,72 +105,72 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
public R updateEquipment(EquipmentVo equipmentVo) {
|
|
|
//查找是否存在该设备
|
|
|
QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.select("equipment_name","equipment_code","addr_info","addr_code","addr_code_info");
|
|
|
- queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
+ queryWrapper.select("equipment_name", "equipment_code", "addr_info", "addr_code", "addr_code_info");
|
|
|
+ queryWrapper.eq("equipment_id", equipmentVo.getEquipmentId());
|
|
|
Equipment equipment = equipmentMapper.selectOne(queryWrapper);
|
|
|
|
|
|
- if (equipment != null){
|
|
|
+ if (equipment != null) {
|
|
|
//2.更新时间
|
|
|
equipmentVo.setUpdateTime(DateUtil.date());
|
|
|
UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
|
|
|
- updateWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
- updateWrapper.set("equipment_name",equipmentVo.getEquipmentName())
|
|
|
- .set("equipment_code",equipmentVo.getEquipmentCode())
|
|
|
- .set("annotation",equipmentVo.getAnnotation())
|
|
|
- .set("addr_info",equipmentVo.getAddrInfo())
|
|
|
- .set("addr_code",equipmentVo.getAddrCode())
|
|
|
- .set("addr_code_info",equipmentVo.getAddrCode())
|
|
|
- .set("state",equipmentVo.getState())
|
|
|
- .set("on_state",equipmentVo.getOnState())
|
|
|
- .set("lat",equipmentVo.getLat())
|
|
|
- .set("lng",equipmentVo.getLng())
|
|
|
- .set("manufacturers",equipmentVo.getManufacturers())
|
|
|
- .set("maintain_name",equipmentVo.getMaintainName())
|
|
|
- .set("maintain_telephone",equipmentVo.getMaintainTelephone())
|
|
|
- .set("update_time",equipmentVo.getUpdateTime());
|
|
|
- equipmentMapper.update(null,updateWrapper);
|
|
|
+ updateWrapper.eq("equipment_id", equipmentVo.getEquipmentId());
|
|
|
+ updateWrapper.set("equipment_name", equipmentVo.getEquipmentName())
|
|
|
+ .set("equipment_code", equipmentVo.getEquipmentCode())
|
|
|
+ .set("annotation", equipmentVo.getAnnotation())
|
|
|
+ .set("addr_info", equipmentVo.getAddrInfo())
|
|
|
+ .set("addr_code", equipmentVo.getAddrCode())
|
|
|
+ .set("addr_code_info", equipmentVo.getAddrCodeInfo())
|
|
|
+ .set("state", equipmentVo.getState())
|
|
|
+ .set("on_state", equipmentVo.getOnState())
|
|
|
+ .set("lat", equipmentVo.getLat())
|
|
|
+ .set("lng", equipmentVo.getLng())
|
|
|
+ .set("manufacturers", equipmentVo.getManufacturers())
|
|
|
+ .set("maintain_name", equipmentVo.getMaintainName())
|
|
|
+ .set("maintain_telephone", equipmentVo.getMaintainTelephone())
|
|
|
+ .set("update_time", equipmentVo.getUpdateTime());
|
|
|
+ equipmentMapper.update(null, updateWrapper);
|
|
|
|
|
|
//修改冗余字段
|
|
|
- if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode()) || !equipment.getAddrCode().equals(equipmentVo.getAddrCode())){
|
|
|
+ if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode()) || !equipment.getAddrCode().equals(equipmentVo.getAddrCode())) {
|
|
|
UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();
|
|
|
- updateWrapper1.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
- updateWrapper1.set("equipment_name",equipmentVo.getEquipmentName())
|
|
|
- .set("equipment_code",equipmentVo.getEquipmentCode())
|
|
|
- .set("addr_info",equipmentVo.getAddrInfo())
|
|
|
- .set("addr_code",equipmentVo.getAddrCode())
|
|
|
- .set("addr_code_info",equipmentVo.getAddrCode());
|
|
|
- planItemMapper.update(null,updateWrapper1);
|
|
|
+ updateWrapper1.eq("equipment_id", equipmentVo.getEquipmentId());
|
|
|
+ updateWrapper1.set("equipment_name", equipmentVo.getEquipmentName())
|
|
|
+ .set("equipment_code", equipmentVo.getEquipmentCode())
|
|
|
+ .set("addr_info", equipmentVo.getAddrInfo())
|
|
|
+ .set("addr_code", equipmentVo.getAddrCode())
|
|
|
+ .set("addr_code_info", equipmentVo.getAddrCodeInfo());
|
|
|
+ planItemMapper.update(null, updateWrapper1);
|
|
|
}
|
|
|
|
|
|
|
|
|
- if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode())){
|
|
|
+ if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode())) {
|
|
|
UpdateWrapper<Statistics> updateWrapper2 = new UpdateWrapper<>();
|
|
|
- updateWrapper2.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
- updateWrapper2.set("equipment_name",equipmentVo.getEquipmentName())
|
|
|
- .set("equipment_code",equipmentVo.getEquipmentCode());
|
|
|
- statisticsMapper.update(null,updateWrapper2);
|
|
|
+ updateWrapper2.eq("equipment_id", equipmentVo.getEquipmentId());
|
|
|
+ updateWrapper2.set("equipment_name", equipmentVo.getEquipmentName())
|
|
|
+ .set("equipment_code", equipmentVo.getEquipmentCode());
|
|
|
+ statisticsMapper.update(null, updateWrapper2);
|
|
|
|
|
|
UpdateWrapper<DlUser> updateWrapper3 = new UpdateWrapper<>();
|
|
|
- updateWrapper3.eq("start_equipment_id",equipmentVo.getEquipmentId());
|
|
|
- updateWrapper3.set("start_equipment_name",equipmentVo.getEquipmentName())
|
|
|
- .set("start_equipment_code",equipmentVo.getEquipmentCode());
|
|
|
- dlUserMapper.update(null,updateWrapper3);
|
|
|
+ updateWrapper3.eq("start_equipment_id", equipmentVo.getEquipmentId());
|
|
|
+ updateWrapper3.set("start_equipment_name", equipmentVo.getEquipmentName())
|
|
|
+ .set("start_equipment_code", equipmentVo.getEquipmentCode());
|
|
|
+ dlUserMapper.update(null, updateWrapper3);
|
|
|
|
|
|
UpdateWrapper<DlUser> updateWrapper4 = new UpdateWrapper<>();
|
|
|
- updateWrapper4.eq("end_equipment_id",equipmentVo.getEquipmentId());
|
|
|
- updateWrapper4.set("end_equipment_name",equipmentVo.getEquipmentName())
|
|
|
- .set("end_equipment_code",equipmentVo.getEquipmentCode());
|
|
|
- dlUserMapper.update(null,updateWrapper4);
|
|
|
+ updateWrapper4.eq("end_equipment_id", equipmentVo.getEquipmentId());
|
|
|
+ updateWrapper4.set("end_equipment_name", equipmentVo.getEquipmentName())
|
|
|
+ .set("end_equipment_code", equipmentVo.getEquipmentCode());
|
|
|
+ dlUserMapper.update(null, updateWrapper4);
|
|
|
|
|
|
UpdateWrapper<PlanPushStatistics> updateWrapper5 = new UpdateWrapper<>();
|
|
|
- updateWrapper5.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
- updateWrapper5.set("equipment_name",equipmentVo.getEquipmentName())
|
|
|
- .set("equipment_code",equipmentVo.getEquipmentCode());
|
|
|
- planPushStatisticsMapper.update(null,updateWrapper5);
|
|
|
+ updateWrapper5.eq("equipment_id", equipmentVo.getEquipmentId());
|
|
|
+ updateWrapper5.set("equipment_name", equipmentVo.getEquipmentName())
|
|
|
+ .set("equipment_code", equipmentVo.getEquipmentCode());
|
|
|
+ planPushStatisticsMapper.update(null, updateWrapper5);
|
|
|
}
|
|
|
|
|
|
return R.ok("修改成功");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
return R.fail("设备不存在");
|
|
|
}
|
|
|
|
|
|
@@ -176,6 +179,7 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
/**
|
|
|
* 获取设备详细信息
|
|
|
+ *
|
|
|
* @param equipmentId
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -188,30 +192,33 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
/**
|
|
|
* 删除设备（需要考虑设备下有没有广告计划存在）
|
|
|
+ *
|
|
|
* @param equipmentIds
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public String deleteEquipment(String[] equipmentIds) {
|
|
|
+ public R deleteEquipment(String[] equipmentIds) {
|
|
|
//1.查询设备下身份有广告
|
|
|
QueryWrapper<PlanItemBo> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.in("equipment_id",equipmentIds);
|
|
|
+ queryWrapper.in("equipment_id", equipmentIds);
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
- planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
|
|
|
+ planItemBoQueryWrapper.eq("dl_plan_item.deleted", 0);
|
|
|
});
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
- planItemBoQueryWrapper.gt("plan_end_time",DateUtil.date());
|
|
|
+ planItemBoQueryWrapper.gt("plan_end_time", DateUtil.date());
|
|
|
});
|
|
|
Integer count = planItemMapper.getEuipmentPlanCont(queryWrapper);
|
|
|
- if (count > 0)
|
|
|
- return "设备下存在广告计划，请移除广告后在删除设备";
|
|
|
+ if (count > 0) {
|
|
|
+ return R.fail("设备下存在广告计划，请移除广告后在删除设备");
|
|
|
+ }
|
|
|
equipmentMapper.deleteBatchIds(Arrays.asList(equipmentIds));
|
|
|
- return "移除成功";
|
|
|
+ return R.ok("移除成功");
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 获取没有绑定店铺的设备
|
|
|
+ *
|
|
|
* @param equipmentVo
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -219,11 +226,11 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
public Page<Equipment> getEquipmentBySelect(EquipmentVo equipmentVo) {
|
|
|
QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.isNull("store_id");
|
|
|
- if (equipmentVo.getSearchText() != null && !equipmentVo.getSearchText().equals("")){
|
|
|
+ if (ObjUtil.isNotNull(equipmentVo.getSearchText())) {
|
|
|
queryWrapper.and(queryWrapper1 -> {
|
|
|
- queryWrapper1.likeRight("equipment_id",equipmentVo.getSearchText());
|
|
|
- queryWrapper1.or().like("equipment_name",equipmentVo.getSearchText());
|
|
|
- queryWrapper1.or().like("equipment_code",equipmentVo.getSearchText());
|
|
|
+ queryWrapper1.likeRight("equipment_id", equipmentVo.getSearchText());
|
|
|
+ queryWrapper1.or().like("equipment_name", equipmentVo.getSearchText());
|
|
|
+ queryWrapper1.or().like("equipment_code", equipmentVo.getSearchText());
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -236,25 +243,27 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
/**
|
|
|
* 绑定设备
|
|
|
+ *
|
|
|
* @param equipmentVo
|
|
|
*/
|
|
|
@Override
|
|
|
public void addStoreEquipment(EquipmentVo equipmentVo) {
|
|
|
UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
|
|
|
- updateWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
- updateWrapper.set("store_id",equipmentVo.getStoreId());
|
|
|
- equipmentMapper.update(null,updateWrapper);
|
|
|
+ updateWrapper.eq("equipment_id", equipmentVo.getEquipmentId());
|
|
|
+ updateWrapper.set("store_id", equipmentVo.getStoreId());
|
|
|
+ equipmentMapper.update(null, updateWrapper);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取店铺下的设备列表
|
|
|
+ *
|
|
|
* @param equipmentVo
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
public Page<Equipment> getEquipmentByStoreId(EquipmentVo equipmentVo) {
|
|
|
QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("store_id",equipmentVo.getStoreId());
|
|
|
+ queryWrapper.eq("store_id", equipmentVo.getStoreId());
|
|
|
Page<Equipment> page = new Page<>();
|
|
|
page.setCurrent(equipmentVo.getPageNum());
|
|
|
page.setSize(equipmentVo.getPageSize());
|
|
|
@@ -264,6 +273,7 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
/**
|
|
|
* 获取设备下的计划列表
|
|
|
+ *
|
|
|
* @param equipmentVo
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -274,25 +284,25 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
page.setSize(equipmentVo.getPageSize());
|
|
|
|
|
|
QueryWrapper<PlanItemBo> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
+ queryWrapper.eq("equipment_id", equipmentVo.getEquipmentId());
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
- planItemBoQueryWrapper.eq("dl_plan_item.deleted",0); //没有删除
|
|
|
+ planItemBoQueryWrapper.eq("dl_plan_item.deleted", 0); //没有删除
|
|
|
});
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
- planItemBoQueryWrapper.eq("dl_plan.state",1); //审核通过
|
|
|
+ planItemBoQueryWrapper.eq("dl_plan.state", 1); //审核通过
|
|
|
});
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
- planItemBoQueryWrapper.eq("dl_plan.on_state",1); //上架
|
|
|
+ planItemBoQueryWrapper.eq("dl_plan.on_state", 1); //上架
|
|
|
});
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
- planItemBoQueryWrapper.gt("plan_end_time",DateUtil.date()); //结束时间大于当前时间
|
|
|
+ planItemBoQueryWrapper.gt("plan_end_time", DateUtil.date()); //结束时间大于当前时间
|
|
|
});
|
|
|
|
|
|
queryWrapper.apply("dl_plan.`plan_id` = dl_plan_item.`plan_id`");
|
|
|
- if (equipmentVo.getSearchText() != null && !equipmentVo.getSearchText().equals("")){
|
|
|
+ if (ObjUtil.isNotNull(equipmentVo.getSearchText())) {
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
- planItemBoQueryWrapper.likeRight("plan_id",equipmentVo.getSearchText()).or()
|
|
|
- .like("plan_name",equipmentVo.getSearchText());
|
|
|
+ planItemBoQueryWrapper.likeRight("plan_id", equipmentVo.getSearchText()).or()
|
|
|
+ .like("plan_name", equipmentVo.getSearchText());
|
|
|
});
|
|
|
}
|
|
|
queryWrapper.orderByDesc("sort");
|
|
|
@@ -303,61 +313,64 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
/**
|
|
|
* 修改设备下的计划排序
|
|
|
+ *
|
|
|
* @param planItemVo
|
|
|
*/
|
|
|
@Override
|
|
|
public void updateEquipmentPlan(PlanItemVo planItemVo) {
|
|
|
UpdateWrapper<PlanItem> updateWrapper = new UpdateWrapper<>();
|
|
|
- updateWrapper.eq("item_id",planItemVo.getItemId());
|
|
|
- updateWrapper.set("sort",planItemVo.getSort());
|
|
|
- planItemMapper.update(null,updateWrapper);
|
|
|
+ updateWrapper.eq("item_id", planItemVo.getItemId());
|
|
|
+ updateWrapper.set("sort", planItemVo.getSort());
|
|
|
+ planItemMapper.update(null, updateWrapper);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取设备数量
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
public HashMap getEquipmentCount() {
|
|
|
QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.select("state","count(*) as onState");
|
|
|
+ queryWrapper.select("state", "count(*) as onState");
|
|
|
queryWrapper.groupBy("state");
|
|
|
List<Equipment> equipment = equipmentMapper.selectList(queryWrapper);
|
|
|
HashMap<String, Integer> objectObjectHashMap = new HashMap<>();
|
|
|
int total = 0;
|
|
|
for (Equipment equipment1 : equipment) {
|
|
|
- objectObjectHashMap.put(String.valueOf(equipment1.getState()),equipment1.getOnState());
|
|
|
- total+=equipment1.getOnState();
|
|
|
+ objectObjectHashMap.put(String.valueOf(equipment1.getState()), equipment1.getOnState());
|
|
|
+ total += equipment1.getOnState();
|
|
|
}
|
|
|
- objectObjectHashMap.put("total",total);
|
|
|
+ objectObjectHashMap.put("total", total);
|
|
|
return objectObjectHashMap;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取设备列表
|
|
|
+ *
|
|
|
* @param equipmentVo
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
public HashMap getEquipmentList(EquipmentVo equipmentVo) {
|
|
|
QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
|
|
|
- if (equipmentVo.getSearchText() != null && !equipmentVo.getSearchText().equals("")){
|
|
|
- queryWrapper.likeRight("equipment_id",equipmentVo.getSearchText());
|
|
|
- queryWrapper.or().like("equipment_name",equipmentVo.getSearchText());
|
|
|
- queryWrapper.or().like("equipment_code",equipmentVo.getSearchText());
|
|
|
- queryWrapper.or().like("maintain_name",equipmentVo.getSearchText());
|
|
|
- queryWrapper.or().likeRight("maintain_telephone",equipmentVo.getSearchText());
|
|
|
+ if (ObjUtil.isNotNull(equipmentVo.getSearchText())) {
|
|
|
+ queryWrapper.likeRight("equipment_id", equipmentVo.getSearchText());
|
|
|
+ queryWrapper.or().like("equipment_name", equipmentVo.getSearchText());
|
|
|
+ queryWrapper.or().like("equipment_code", equipmentVo.getSearchText());
|
|
|
+ queryWrapper.or().like("maintain_name", equipmentVo.getSearchText());
|
|
|
+ queryWrapper.or().likeRight("maintain_telephone", equipmentVo.getSearchText());
|
|
|
}
|
|
|
|
|
|
- if (equipmentVo.getState() != null){
|
|
|
+ if (equipmentVo.getState() != null) {
|
|
|
queryWrapper.and(equipmentQueryWrapper -> {
|
|
|
- equipmentQueryWrapper.eq("state",equipmentVo.getState());
|
|
|
+ equipmentQueryWrapper.eq("state", equipmentVo.getState());
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- if (equipmentVo.getOnState() != null){
|
|
|
+ if (equipmentVo.getOnState() != null) {
|
|
|
queryWrapper.and(equipmentQueryWrapper -> {
|
|
|
- equipmentQueryWrapper.eq("on_state",equipmentVo.getOnState());
|
|
|
+ equipmentQueryWrapper.eq("on_state", equipmentVo.getOnState());
|
|
|
});
|
|
|
}
|
|
|
queryWrapper.orderByDesc("enter_time");
|
|
|
@@ -374,23 +387,23 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
HashMap<String, Integer> hashMap = new HashMap<>();
|
|
|
List<EquipmentBo> result = new ArrayList<>();
|
|
|
- if(!collect.isEmpty()){
|
|
|
+ if (!collect.isEmpty()) {
|
|
|
QueryWrapper<PlanItem> queryWrapper1 = new QueryWrapper<>();
|
|
|
- queryWrapper1.select("equipment_id","count(*) as sort");
|
|
|
- queryWrapper1.in("equipment_id",collect);
|
|
|
+ queryWrapper1.select("equipment_id", "count(*) as sort");
|
|
|
+ queryWrapper1.in("equipment_id", collect);
|
|
|
queryWrapper1.groupBy("equipment_id");
|
|
|
List<PlanItem> planItems = planItemMapper.selectList(queryWrapper1);
|
|
|
for (PlanItem planItem : planItems) {
|
|
|
- hashMap.put(planItem.getEquipmentId(),planItem.getSort());
|
|
|
+ hashMap.put(planItem.getEquipmentId(), planItem.getSort());
|
|
|
}
|
|
|
|
|
|
//组装
|
|
|
for (Equipment equipment1 : equipmentPage.getRecords()) {
|
|
|
EquipmentBo equipmentBo = new EquipmentBo(equipment1);
|
|
|
Integer integer = hashMap.get(equipmentBo.getEquipmentId());
|
|
|
- if (integer == null){
|
|
|
+ if (integer == null) {
|
|
|
equipmentBo.setPlanCounnt(0);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
equipmentBo.setPlanCounnt(integer);
|
|
|
}
|
|
|
result.add(equipmentBo);
|
|
|
@@ -400,25 +413,27 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
|
|
|
equipmentPage.setRecords(null);
|
|
|
- objectObjectHashMap.put("page",equipmentPage);
|
|
|
- objectObjectHashMap.put("data",result);
|
|
|
+ objectObjectHashMap.put("page", equipmentPage);
|
|
|
+ objectObjectHashMap.put("data", result);
|
|
|
return objectObjectHashMap;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 解除店铺绑定的设备
|
|
|
+ *
|
|
|
* @param equipmentIds
|
|
|
*/
|
|
|
@Override
|
|
|
public void deleteStoreEquipment(String[] equipmentIds) {
|
|
|
UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
|
|
|
- updateWrapper.in("equipment_id",equipmentIds);
|
|
|
- updateWrapper.set("store_id",null);
|
|
|
- equipmentMapper.update(null,updateWrapper);
|
|
|
+ updateWrapper.in("equipment_id", equipmentIds);
|
|
|
+ updateWrapper.set("store_id", null);
|
|
|
+ equipmentMapper.update(null, updateWrapper);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 删除设备下的广告推广
|
|
|
+ *
|
|
|
* @param planItemIds
|
|
|
*/
|
|
|
@Override
|
|
|
@@ -428,7 +443,7 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
//查询已无推广设备广告的计划
|
|
|
List<String> plans = planItemMapper.selectDeletePlanId(Arrays.asList(planItemIds));
|
|
|
- if (!plans.isEmpty()){
|
|
|
+ if (!plans.isEmpty()) {
|
|
|
//删除广告计划
|
|
|
planMapper.deleteBatchIds(plans);
|
|
|
}
|
|
|
@@ -436,6 +451,7 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
/**
|
|
|
* 休眠设备
|
|
|
+ *
|
|
|
* @param equipmentCode
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -447,6 +463,7 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
|
|
|
/**
|
|
|
* 唤醒设备
|
|
|
+ *
|
|
|
* @param equipmentCode
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -455,5 +472,26 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
return mtStarUtil.wakeup(equipmentCode);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public String getCode() {
|
|
|
+ QueryWrapper<SysCode> sysCodeQueryWrapper = new QueryWrapper<>();
|
|
|
+ List<SysCode> list = sysCodeService.list(sysCodeQueryWrapper);
|
|
|
+ String uuid;
|
|
|
+ SysCode sysCode = new SysCode();
|
|
|
+ if (CollUtil.isEmpty(list)) {
|
|
|
+ uuid = UuidUtil.getUUID();
|
|
|
+ sysCode.setCode(uuid);
|
|
|
+ sysCodeService.save(sysCode);
|
|
|
+ return uuid;
|
|
|
+ }
|
|
|
+
|
|
|
+ do {
|
|
|
+ uuid = UuidUtil.getUUID();
|
|
|
+ } while (list.contains(uuid));
|
|
|
+ sysCode.setCode(uuid);
|
|
|
+ sysCodeService.save(sysCode);
|
|
|
+ return uuid;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|
云殇忆
Yangyz
JensionDzero