Skip to content

A
amos-boot-biz
Commit a33c4cf3 authored by 任刚's avatar 任刚
Browse files
Options

保存部件数据

parent a3ed6d2c
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 61 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentPar.java
View file @ a33c4cf3
......@@ -15,7 +15,7 @@ public class EquipmentPar {
private EquipmentParams equipmentParams;
private Equipment equipment;
private EquipmentDetail equipmentDetail;
public EquipmentParams getEquipmentParams() {
......@@ -26,12 +26,12 @@ public class EquipmentPar {
this.equipmentParams = equipmentParams;
}
public Equipment getEquipment() {
return equipment;
public EquipmentDetail getEquipmentDetail() {
return equipmentDetail;
}
public void setEquipment(Equipment equipment) {
this.equipment = equipment;
public void setEquipmentDetail(EquipmentDetail equipmentDetail) {
this.equipmentDetail = equipmentDetail;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentController.java
View file @ a33c4cf3
......@@ -92,26 +92,26 @@ public class EquipmentController extends AbstractBaseController {
return iEquipmentService.addEquipmentDef(equipment);
}
@RequestMapping(value = "/saveEqu", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public EquipmentPar saveEqu(@RequestBody EquipmentPar equipmentPar) {
Equipment equ = equipmentPar.getEquipment();
String sysCode = equ.getCode();
EquipmentParams params = equipmentPar.getEquipmentParams();
if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
int code = iEquipmentService.count(new QueryWrapper<Equipment>().eq("code", sysCode.trim()));
if (code != 0 ) {
equipmentPar.getEquipment().setMarkSpecification("设备编码填写重复，请重新输入！");
return equipmentPar;
}
}
iEquipmentService.save(equ);
params.setCode(equ.getCode());
iEquipmentParamsService.saveOne(params);
return equipmentPar;
}
// @RequestMapping(value = "/saveEqu", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
// public EquipmentPar saveEqu(@RequestBody EquipmentPar equipmentPar) {
// EquipmentDetail equ = equipmentPar.getEquipmentDetail();
// String sysCode = equ.getCode();
// EquipmentParams params = equipmentPar.getEquipmentParams();
//
// if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
// int code = iEquipmentService.count(new QueryWrapper<Equipment>().eq("code", sysCode.trim()));
// if (code != 0 ) {
// equipmentPar.getEquipmentDetail().setMarkSpecification("设备编码填写重复，请重新输入！");
// return equipmentPar;
// }
// }
// iEquipmentService.save(equ);
// params.setCode(equ.getCode());
// iEquipmentParamsService.saveOne(params);
// return equipmentPar;
// }
/**
* 根据id删除
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ a33c4cf3
......@@ -12,6 +12,7 @@ import com.yeejoin.equipmanage.common.utils.ExcelUtils;
import com.yeejoin.equipmanage.common.utils.NameUtils;
import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import com.yeejoin.equipmanage.dto.ExcelDto;
import com.yeejoin.equipmanage.fegin.JcsFeign;
import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
......@@ -23,6 +24,7 @@ import com.yeejoin.equipmanage.utils.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.bytebuddy.asm.Advice;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -54,6 +56,13 @@ public class EquipmentDetailController extends AbstractBaseController {
@Autowired
IEquipmentDetailService iEquipmentDetailService;
@Autowired
IEquipmentParamsService iEquipmentParamsService;
@Autowired
IEquipmentParamsService equipmentParamsService;
@Autowired
EquipmentDetailMapper equipmentDetailMapper;
@Autowired
......@@ -104,42 +113,58 @@ public class EquipmentDetailController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
// DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// simpleDateFormat.parse(String.valueOf(equipmentDate.getEquipmentDetail().getUpdateDate()));
// o.setAddTime(simpleDateFormat.parse(equipmentDate.getEquipmentDetail().getProductionDate())));
System.out.println("++++++++++++++++++++");
System.out.println(equipmentDate.getEquipmentDetail());
System.out.println(equipmentDate.getEquipmentDetail().getUpdateDate());
System.out.println(equipmentDate.getEquipmentSpecific());
// if (equipmentDate.getEquipmentSpecific().getSingle() == null) {
// throw new BadRequest("管理方式未输入");
// }
// EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
// String sysCode = vo.getCode();
// if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
// int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
// if (code != 0 ) {
// throw new BadRequest("设备编码填写重复，请重新输入！");
// }
// }
// String iot = vo.getIotCode();
// if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
// int iot_code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
// if (iot_code != 0 ) {
// throw new BadRequest("物联编码填写重复，请重新输入！");
// }
// }
// EquipmentDate date = equipmentSpecificSerivce.equipmentSpecificCreate(equipmentDate, getSelectedOrgInfo(), getUserInfo());
// // TODO 后续判断成功，执行同步
// Long equipmentId = date.getEquipmentDetail().getEquipmentId();
// // 编辑同步redis装备iotcode数据
// syncDataService.saveOrUpdateEquipIotCodeRedisData(null);
// if (syncSwitch) {
// equipmentSpecificSerivce.equipSpecificDataSync(date.getEquipmentSpecific().getId());
// }
EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
String sysCode = vo.getCode();
if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
if (code != 0 ) {
throw new BadRequest("设备编码填写重复，请重新输入！");
}
}
String iot = vo.getIotCode();
if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
int iot_code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
if (iot_code != 0 ) {
throw new BadRequest("物联编码填写重复，请重新输入！");
}
}
EquipmentDate date = equipmentSpecificSerivce.equipmentSpecificCreate(equipmentDate, getSelectedOrgInfo(), getUserInfo());
// TODO 后续判断成功，执行同步
Long equipmentId = date.getEquipmentDetail().getEquipmentId();
// 编辑同步redis装备iotcode数据
syncDataService.saveOrUpdateEquipIotCodeRedisData(null);
if (syncSwitch) {
equipmentSpecificSerivce.equipSpecificDataSync(date.getEquipmentSpecific().getId());
}
return equipmentDate;
}
@RequestMapping(value = "/saveEqu", method = RequestMethod.POST)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public EquipmentPar saveEquipments(@RequestBody EquipmentPar equipmentPar) {
EquipmentDetail vo = equipmentPar.getEquipmentDetail();
EquipmentParams params = equipmentPar.getEquipmentParams();
String sysCode = vo.getCode();
if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
int code = iEquipmentDetailService.count(new QueryWrapper<EquipmentDetail>().eq("code", sysCode.trim()));
if (code != 0 ) {
// throw new BadRequest("设备编码填写重复，请重新输入！");
equipmentPar.getEquipmentDetail().setEquipmentName("设备编码填写重复，请重新输入！");
return equipmentPar;
}
}
params.setCode(equipmentPar.getEquipmentDetail().getCode());
iEquipmentDetailService.saveOne(vo);
iEquipmentParamsService.saveOne(params);
return equipmentPar;
}
/***
*
* 根id查询
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ a33c4cf3
......@@ -69,10 +69,10 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
@Override
public EquipmentDetail saveOne(EquipmentDetail equipmentDetail) {
Equipment equipment = equipmentMapper.selectById(equipmentDetail.getEquipmentId());
equipmentDetail.setCode(equipment.getCode());
// Equipment equipment = equipmentMapper.selectById(equipmentDetail.getEquipmentId());
// equipmentDetail.setCode(equipment.getCode());
this.save(equipmentDetail);
saveFile(equipmentDetail);
// saveFile(equipmentDetail);
return equipmentDetail;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment