|
@@ -82,13 +82,15 @@ public class IndexController { ;
|
|
Integer eqeStatus = equipmentVo.getEqeStatus();
|
|
Integer eqeStatus = equipmentVo.getEqeStatus();
|
|
Boolean is_sleep = equipmentVo.getIs_sleep();
|
|
Boolean is_sleep = equipmentVo.getIs_sleep();
|
|
String netWorkingMode = equipmentVo.getNetWorkingMode();
|
|
String netWorkingMode = equipmentVo.getNetWorkingMode();
|
|
|
|
+ String numberOne = equipmentVo.getNumberOne();
|
|
|
|
+ String candyGeneratorTm = equipmentVo.getCandyGeneratorTm();
|
|
|
|
+ String outsideTm = equipmentVo.getOutsideTm();
|
|
|
|
+ String outsideHd = equipmentVo.getOutsideHd();
|
|
|
|
+
|
|
//有记录,则进行修改
|
|
//有记录,则进行修改
|
|
LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
|
|
query.eq(TEquipment::getClientId,clientId);
|
|
query.eq(TEquipment::getClientId,clientId);
|
|
-// List<TEquipment> list = equipmentService.list(query);
|
|
|
|
-// TEquipment _new = list.get(0);
|
|
|
|
TEquipment _new = equipmentService.getOne(query);
|
|
TEquipment _new = equipmentService.getOne(query);
|
|
-// Equipment _new = equipmentService.findByClientId(clientId);
|
|
|
|
if (_new != null) {
|
|
if (_new != null) {
|
|
_new.setNetWorkingMode(netWorkingMode);
|
|
_new.setNetWorkingMode(netWorkingMode);
|
|
if(StringUtils.isNotEmpty(cabinetTm)){
|
|
if(StringUtils.isNotEmpty(cabinetTm)){
|
|
@@ -158,6 +160,18 @@ public class IndexController { ;
|
|
if(StringUtils.isNotEmpty(equipmentVo.getCornGeneratorTm())){
|
|
if(StringUtils.isNotEmpty(equipmentVo.getCornGeneratorTm())){
|
|
equipmentDesc.setCornGeneratorTm(equipmentVo.getCornGeneratorTm());
|
|
equipmentDesc.setCornGeneratorTm(equipmentVo.getCornGeneratorTm());
|
|
}
|
|
}
|
|
|
|
+ if(StringUtils.isNotEmpty(numberOne)){
|
|
|
|
+ equipmentDesc.setNumberOne(numberOne);
|
|
|
|
+ }
|
|
|
|
+ if(StringUtils.isNotEmpty(candyGeneratorTm)){
|
|
|
|
+ equipmentDesc.setCandyGeneratorTm(candyGeneratorTm);
|
|
|
|
+ }
|
|
|
|
+ if(StringUtils.isNotEmpty(outsideHd)){
|
|
|
|
+ equipmentDesc.setOutsideHd(outsideHd);
|
|
|
|
+ }
|
|
|
|
+ if(StringUtils.isNotEmpty(outsideTm)){
|
|
|
|
+ equipmentDesc.setOutsideTm(outsideTm);
|
|
|
|
+ }
|
|
equipmentDescService.updateById(equipmentDesc);
|
|
equipmentDescService.updateById(equipmentDesc);
|
|
// return JsonMessage.success("心跳成功");
|
|
// return JsonMessage.success("心跳成功");
|
|
return "心跳成功";
|
|
return "心跳成功";
|
|
@@ -1316,12 +1330,11 @@ public class IndexController { ;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 修改设备共同参数/进阶参数
|
|
* 修改设备共同参数/进阶参数
|
|
- * code 0:通用参数;1:进阶参数;2:调试页参数
|
|
|
|
|
|
+ * code 0:通用参数;1:进阶参数;2:调试页参数;3:湿度参数
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/updateParamNew", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/updateParamNew", method = RequestMethod.POST)
|
|
-// @PostMapping(value = "/updateParamNew", produces = "text/html;charset=utf-8")
|
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public String updateParamNew(Integer code, String clientId, @RequestBody List<CommonParamVo> commonParamVos) {
|
|
public String updateParamNew(Integer code, String clientId, @RequestBody List<CommonParamVo> commonParamVos) {
|
|
LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
|
|
@@ -1337,9 +1350,9 @@ public class IndexController { ;
|
|
queryParameters.eq(TParameters::getClientId,clientId);
|
|
queryParameters.eq(TParameters::getClientId,clientId);
|
|
queryParameters.eq(TParameters::getStatus,code);
|
|
queryParameters.eq(TParameters::getStatus,code);
|
|
queryParameters.eq(TParameters::getEquipmentId,equipment.getId());
|
|
queryParameters.eq(TParameters::getEquipmentId,equipment.getId());
|
|
- List<TParameters> list1 = parametersService.list(queryParameters);
|
|
|
|
- if(list1.size()>0){
|
|
|
|
- for(TParameters parameters:list1){
|
|
|
|
|
|
+ List<TParameters> list = parametersService.list(queryParameters);
|
|
|
|
+ if(list.size()>0){
|
|
|
|
+ for(TParameters parameters:list){
|
|
//删除旧的参数
|
|
//删除旧的参数
|
|
parametersService.removeById(parameters.getId());
|
|
parametersService.removeById(parameters.getId());
|
|
}
|
|
}
|
|
@@ -1361,7 +1374,7 @@ public class IndexController { ;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 修改单个设备共同参数/进阶参数
|
|
* 修改单个设备共同参数/进阶参数
|
|
- * code 0:通用参数;1:进阶参数;2:调试页参数
|
|
|
|
|
|
+ * code 0:通用参数;1:进阶参数;2:调试页参数;3:湿度参数
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|