|
@@ -24,12 +24,15 @@ import com.ruoyi.demo.utils.InitMapUtil;
|
|
|
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.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
+@Transactional
|
|
|
public class EquipmentServiceImpl implements EquipmentService {
|
|
|
@Autowired
|
|
|
EquipmentMapper equipmentMapper;
|
|
@@ -54,7 +57,7 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
//1.新增地区码映射
|
|
|
equipment.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipment.getAddrCode()));
|
|
|
//2.新增创建时间
|
|
|
- equipment.setEnterTime(LocalDateTime.now());
|
|
|
+ equipment.setEnterTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
equipmentMapper.insert(equipment);
|
|
|
}
|
|
|
|
|
@@ -63,7 +66,7 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
//1.更新地区码映射
|
|
|
equipmentVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipmentVo.getAddrCode()));
|
|
|
//2.更新时间
|
|
|
- equipmentVo.setUpdateTime(LocalDateTime.now());
|
|
|
+ equipmentVo.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
|
|
|
updateWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
|
|
|
updateWrapper.set("equipment_name",equipmentVo.getEquipmentName())
|
|
@@ -99,9 +102,25 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
return equipmentBo;
|
|
|
}
|
|
|
|
|
|
+ /*
|
|
|
+ * TODO 需要考虑上面有没有广告
|
|
|
+ * */
|
|
|
@Override
|
|
|
- public void deleteEquipment(String[] equipmentIds) {
|
|
|
+ public String deleteEquipment(String[] equipmentIds) {
|
|
|
+ //1.查询设备下身份有广告
|
|
|
+ QueryWrapper<PlanItemBo> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.in("equipment_id",equipmentIds);
|
|
|
+ queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
+ planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
|
|
|
+ });
|
|
|
+ queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
+ planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
+ });
|
|
|
+ Integer count = planItemMapper.getEuipmentPlanCont(queryWrapper);
|
|
|
+ if (count > 0)
|
|
|
+ return "设备下存在广告计划,请移除广告后在删除设备";
|
|
|
equipmentMapper.deleteBatchIds(Arrays.asList(equipmentIds));
|
|
|
+ return "移除成功";
|
|
|
}
|
|
|
|
|
|
|
|
@@ -159,6 +178,9 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
|
|
|
});
|
|
|
+ queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
+ planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
+ });
|
|
|
if (equipmentVo.getSearchText() != null && !equipmentVo.getSearchText().equals("")){
|
|
|
queryWrapper.and(planItemBoQueryWrapper -> {
|
|
|
planItemBoQueryWrapper.likeRight("plan_id",equipmentVo.getSearchText()).or()
|