|
@@ -4,14 +4,21 @@ package com.szwl.controller;
|
|
import cn.com.crbank.ommo.bean.ResultMessage;
|
|
import cn.com.crbank.ommo.bean.ResultMessage;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
+import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage;
|
|
import com.szwl.model.bean.CommonParamVo;
|
|
import com.szwl.model.bean.CommonParamVo;
|
|
|
|
+import com.szwl.model.bo.R;
|
|
|
|
+import com.szwl.model.bo.ResponseModel;
|
|
import com.szwl.model.entity.TEquipment;
|
|
import com.szwl.model.entity.TEquipment;
|
|
|
|
+import com.szwl.model.entity.TEquipmentDesc;
|
|
import com.szwl.model.entity.TParameters;
|
|
import com.szwl.model.entity.TParameters;
|
|
import com.szwl.model.entity.TProduct;
|
|
import com.szwl.model.entity.TProduct;
|
|
import com.szwl.model.utils.PushUtils;
|
|
import com.szwl.model.utils.PushUtils;
|
|
|
|
+import com.szwl.service.TEquipmentDescService;
|
|
import com.szwl.service.TEquipmentService;
|
|
import com.szwl.service.TEquipmentService;
|
|
import com.szwl.service.TParametersService;
|
|
import com.szwl.service.TParametersService;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.http.HttpStatus;
|
|
import org.springframework.http.HttpStatus;
|
|
import org.springframework.http.ResponseEntity;
|
|
import org.springframework.http.ResponseEntity;
|
|
@@ -21,7 +28,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Objects;
|
|
|
|
+
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
@@ -41,6 +51,9 @@ public class TParametersController {
|
|
@Autowired
|
|
@Autowired
|
|
private TEquipmentService tEquipmentService;
|
|
private TEquipmentService tEquipmentService;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private TEquipmentDescService equipmentDescService;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 获取设备参数
|
|
* 获取设备参数
|
|
*
|
|
*
|
|
@@ -91,5 +104,40 @@ public class TParametersController {
|
|
.setData("SUCCESS")
|
|
.setData("SUCCESS")
|
|
.setMessage("SUCCESS"));
|
|
.setMessage("SUCCESS"));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ @ApiOperation(value = "启用物料监控")
|
|
|
|
+ @PostMapping("/enableMaterial")
|
|
|
|
+ public ResponseModel<?> enableMaterial(@RequestBody TParameters parameters) {
|
|
|
|
+ Long equipmentId = parameters.getEquipmentId();
|
|
|
|
+ if (equipmentId == null) {
|
|
|
|
+ return R.fail("设备id不能为空");
|
|
|
|
+ }
|
|
|
|
+// TParameters tParameters = tParametersService.getById(equipmentId);
|
|
|
|
+// if (Objects.isNull(tParameters)) {
|
|
|
|
+// TParameters tParameters1 = new TParameters();
|
|
|
|
+// }
|
|
|
|
+ TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipmentId);
|
|
|
|
+ if (Objects.isNull(equipmentDesc)) {
|
|
|
|
+ TEquipmentDesc tEquipmentDesc = new TEquipmentDesc();
|
|
|
|
+ tEquipmentDesc.setEquipmentId(equipmentId);
|
|
|
|
+ tEquipmentDesc.setIsMaterialUse("1");
|
|
|
|
+ equipmentDescService.saveOrUpdate(tEquipmentDesc);
|
|
|
|
+ } else {
|
|
|
|
+ String isMaterialUse = equipmentDesc.getIsMaterialUse();
|
|
|
|
+ if (isMaterialUse.equals("1")) {
|
|
|
|
+ return R.ok("已开启ENABLED");
|
|
|
|
+ } else {
|
|
|
|
+ equipmentDesc.setIsMaterialUse("1");
|
|
|
|
+ equipmentDescService.saveOrUpdate(equipmentDesc);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ TEquipment equipment = tEquipmentService.getById(equipmentId);
|
|
|
|
+ tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("Param", "M502" + ":" + "1").toString());
|
|
|
|
+
|
|
|
|
+ return R.ok("开启物料监控功能成功SUCCESS");
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|