|
@@ -7,6 +7,7 @@ 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;
|
|
@@ -17,6 +18,7 @@ import com.ruoyi.demo.enums.EquipmentStateEnum;
|
|
|
import com.ruoyi.demo.mapper.*;
|
|
|
import com.ruoyi.demo.service.EquipmentService;
|
|
|
import com.ruoyi.demo.utils.InitMapUtil;
|
|
|
+import com.ruoyi.demo.utils.MtStarUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -60,6 +62,10 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
@Qualifier("equipmentOnStateMap")
|
|
|
HashMap<Integer,String> equipmentOnStateMap;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ MtStarUtil mtStarUtil;
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public Integer addEquipment(EquipmentVo equipmentVo) {
|
|
|
//判断是否已经存在设备Code
|
|
@@ -93,6 +99,17 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
if (equipmentVo.getAddrCode().equals(equipment.getAddrCode()))
|
|
|
equipmentVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipmentVo.getAddrCode())); //更新地区码映射
|
|
|
|
|
|
+ String state = "";
|
|
|
+ if (equipmentVo.getOnState() != equipment.getOnState()){
|
|
|
+ if (equipmentVo.getOnState() == 0){
|
|
|
+ //唤醒
|
|
|
+ state = mtStarUtil.wakeup(equipmentVo.getEquipmentCode());
|
|
|
+ }else {
|
|
|
+ //休眠
|
|
|
+ state = mtStarUtil.dormancy(equipmentVo.getEquipmentCode());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
//2.更新时间
|
|
|
equipmentVo.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
|
|
|
UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
|
|
@@ -113,15 +130,6 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
.set("update_time",equipmentVo.getUpdateTime());
|
|
|
equipmentMapper.update(null,updateWrapper);
|
|
|
|
|
|
- if (equipmentVo.getOnState() != equipment.getOnState()){
|
|
|
- if (equipmentVo.getOnState() == 0){
|
|
|
- //唤醒
|
|
|
- }else {
|
|
|
- //休眠
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
//修改冗余字段
|
|
|
if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode()) || !equipment.getAddrCode().equals(equipmentVo.getAddrCode()) || !equipment.getAddrCodeInfo().equals(equipmentVo.getAddrCodeInfo())){
|
|
|
UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();
|
|
@@ -160,7 +168,8 @@ public class EquipmentServiceImpl implements EquipmentService {
|
|
|
.set("equipment_code",equipmentVo.getEquipmentCode());
|
|
|
planPushStatisticsMapper.update(null,updateWrapper5);
|
|
|
}
|
|
|
- return R.ok("修改成功");
|
|
|
+
|
|
|
+ return R.ok("修改成功,"+state);
|
|
|
}else {
|
|
|
return R.fail("设备不存在");
|
|
|
}
|