|
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
|
|
|
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
+import vip.xiaonuo.coldchain.core.config.JfcloudRedisCacheService;
|
|
|
import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
|
|
|
import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
|
|
|
import vip.xiaonuo.coldchain.modular.monitortarget.entity.StatusCount;
|
|
@@ -64,6 +65,8 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
private MonitorTargetMapper monitorTargetMapper;
|
|
|
@Resource
|
|
|
private TargetRoomService targetRoomService;
|
|
|
+ @Resource
|
|
|
+ private JfcloudRedisCacheService jfcloudRedisCacheService;
|
|
|
|
|
|
@Override
|
|
|
public Page<MonitorTarget> page(MonitorTargetPageParam monitorTargetPageParam) {
|
|
@@ -120,6 +123,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
public void add(MonitorTargetAddParam monitorTargetAddParam) {
|
|
|
MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddParam, MonitorTarget.class);
|
|
|
this.save(monitorTarget);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -128,6 +132,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
MonitorTarget monitorTarget = this.queryEntity(monitorTargetEditParam.getId());
|
|
|
BeanUtil.copyProperties(monitorTargetEditParam, monitorTarget);
|
|
|
this.updateById(monitorTarget);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -142,6 +147,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
public void addWithRoom(MonitorTargetAddWithRoomParam monitorTargetAddWithRoomParam) {
|
|
|
MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddWithRoomParam, MonitorTarget.class);
|
|
|
this.save(monitorTarget);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -150,6 +156,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
MonitorTarget monitorTarget = this.queryEntity(monitorTargetEditWithRoomParam.getId());
|
|
|
BeanUtil.copyProperties(monitorTargetEditWithRoomParam, monitorTarget);
|
|
|
this.updateById(monitorTarget);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -203,6 +210,9 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+// @Cacheable(value = JfcloudColdChainConstants.MONITORTARGET_CACHE_NAME,
|
|
|
+// key = "#monitorTargetPageParam.orgId",
|
|
|
+// unless = "#result == null")
|
|
|
public Page<MonitorTarget> selectMonitorTargetByPage(MonitorTargetPageParam monitorTargetPageParam) {
|
|
|
if (StrUtil.isBlank(monitorTargetPageParam.getOrgId())) {
|
|
|
monitorTargetPageParam.setOrgId(StpLoginUserUtil.getLoginUser().getOrgId());
|
|
@@ -358,6 +368,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
MonitorTarget monitorTarget = this.getById(monitorTargetId);
|
|
|
if (Objects.nonNull(monitorTarget)) {
|
|
|
monitorTarget.setStatus(monitorStatusEnum.getCode());
|
|
|
+
|
|
|
return this.updateById(monitorTarget);
|
|
|
}
|
|
|
}
|