Skip to content

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

保存部件数据

parent 64c0b752
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 87 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java
View file @ bf03cece
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
*
*
*
* @author wujiang
* @date 2020-07-07
......@@ -144,13 +144,13 @@ public class EquipmentDetail extends BaseEntity {
@TableField(exist = false)
private List<UploadFile> img;
@TableField(exist = false)
private List<UploadFile> video;
@TableField(exist = false)
private List<UploadFile> certification;
@TableField(exist = false)
private List<UploadFile> instruction;
......@@ -172,7 +172,7 @@ public class EquipmentDetail extends BaseEntity {
@TableField("department_name")
@ApiModelProperty(value = "部门名")
private String departmentName;
@TableField(exist = false)
private String countryName;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentDate.java
View file @ bf03cece
package com.yeejoin.equipmanage.common.vo;
import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
import com.yeejoin.equipmanage.common.entity.EquipmentParams;
import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
import lombok.Data;
/**
* 消防设备
*
* **/
@Data
public class EquipmentDate {
private EquipmentSpecific equipmentSpecific;
private EquipmentDetail equipmentDetail;
public EquipmentSpecific getEquipmentSpecific() {
return equipmentSpecific;
}
public void setEquipmentSpecific(EquipmentSpecific equipmentSpecific) {
this.equipmentSpecific = equipmentSpecific;
}
private EquipmentDetail equipmentDetail;
public EquipmentDetail getEquipmentDetail() {
return equipmentDetail;
}
private EquipmentParams equipmentParams;
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/EquipmentDetailController.java
View file @ bf03cece
......@@ -87,7 +87,7 @@ public class EquipmentDetailController extends AbstractBaseController {
@Autowired
private IWarehouseStructureService warehouseStructureService;
@Autowired
private ISyncDataService syncDataService;
......@@ -114,24 +114,28 @@ public class EquipmentDetailController extends AbstractBaseController {
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
Long aLong = new Long(1481071111);
equipmentDate.getEquipmentDetail().setEquipmentId(aLong);
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()));
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("物联编码填写重复，请重新输入！");
}
}
// 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());
equipmentDate.getEquipmentParams().setCode(equipmentDate.getEquipmentDetail().getCode());
iEquipmentParamsService.saveOne(equipmentDate.getEquipmentParams());
// TODO 后续判断成功，执行同步
Long equipmentId = date.getEquipmentDetail().getEquipmentId();
// 编辑同步redis装备iotcode数据
......@@ -153,7 +157,7 @@ public class EquipmentDetailController extends AbstractBaseController {
if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
int code = iEquipmentDetailService.count(new QueryWrapper<EquipmentDetail>().eq("code", sysCode.trim()));
if (code != 0 ) {
if (code != 0 ) {
// throw new BadRequest("设备编码填写重复，请重新输入！");
equipmentPar.getEquipmentDetail().setEquipmentName("设备编码填写重复，请重新输入！");
return equipmentPar;
......@@ -161,7 +165,7 @@ public class EquipmentDetailController extends AbstractBaseController {
}
params.setCode(equipmentPar.getEquipmentDetail().getCode());
iEquipmentDetailService.saveOne(vo);
iEquipmentParamsService.saveOne(params);
iEquipmentParamsService.saveOne(params);
return equipmentPar;
}
......@@ -557,7 +561,7 @@ public class EquipmentDetailController extends AbstractBaseController {
ExcelEnums excelEnums;
ResponseModel<String[]> result = jcsFeign.getEquipmentInfo(getAppKey(), getProduct(), getToken(), null, "getCompany");
if(200 == result.getStatus()) {
excelEnums= ExcelEnums.getByKey(ExcelEnums.XFZB.getType());
excelEnums= ExcelEnums.getByKey(ExcelEnums.XFZB.getType());
ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
String url = excelDto.getClassUrl();
Class<?> clz = Class.forName(url);
......@@ -599,13 +603,13 @@ public class EquipmentDetailController extends AbstractBaseController {
// throw new BadRequest("请使用指定模板进行上传");
// }
// List<EquipmentDetailDownloadTemplateVO> equipmentDetailDownloadS = ExcelUtils.importExcel(file, 1, 1, EquipmentDetailDownloadTemplateVO.class);
// List<EquipmentDetailDownloadTemplateVO> equipmentDetailDownloadS = ExcelUtils.importExcel(file, 1, 1, EquipmentDetailDownloadTemplateVO.class);
ExcelEnums excelEnums= ExcelEnums.getByKey(type);
ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
excelService.commonUpload(file, excelDto,getSelectedOrgInfo(), getUserInfo());
// return iStockService.uploadListByTemplate(equipmentDetailDownloadS, getSelectedOrgInfo(), getUserInfo());
// return iStockService.uploadListByTemplate(equipmentDetailDownloadS, getSelectedOrgInfo(), getUserInfo());
return ResponseHelper.buildResponse(null);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ bf03cece
......@@ -72,6 +72,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
public EquipmentDetail saveOne(EquipmentDetail equipmentDetail) {
// Equipment equipment = equipmentMapper.selectById(equipmentDetail.getEquipmentId());
// equipmentDetail.setCode(equipment.getCode());
equipmentDetail.setEquipmentId(equipmentDetail.getEquipmentId());
this.save(equipmentDetail);
// saveFile(equipmentDetail);
return equipmentDetail;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ bf03cece
......@@ -12,6 +12,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.service.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -40,25 +42,6 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
import com.yeejoin.equipmanage.common.dto.UserDto;
import com.yeejoin.equipmanage.common.entity.EquProperty;
import com.yeejoin.equipmanage.common.entity.Equipment;
import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
import com.yeejoin.equipmanage.common.entity.EquipmentSystemSourceStatistics;
import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
import com.yeejoin.equipmanage.common.entity.Stock;
import com.yeejoin.equipmanage.common.entity.StockBill;
import com.yeejoin.equipmanage.common.entity.StockBillDetail;
import com.yeejoin.equipmanage.common.entity.StockDetail;
import com.yeejoin.equipmanage.common.entity.UploadFile;
import com.yeejoin.equipmanage.common.entity.Video;
import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
import com.yeejoin.equipmanage.common.entity.Warehouse;
import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
import com.yeejoin.equipmanage.common.entity.vo.AlarmInfoVO;
......@@ -102,27 +85,6 @@ import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
import com.yeejoin.equipmanage.mapper.SignalClassifyMapper;
import com.yeejoin.equipmanage.mapper.UploadFileMapper;
import com.yeejoin.equipmanage.mapper.VideoMapper;
import com.yeejoin.equipmanage.service.IEquPropertyService;
import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
import com.yeejoin.equipmanage.service.IEquipmentDetailService;
import com.yeejoin.equipmanage.service.IEquipmentIndexService;
import com.yeejoin.equipmanage.service.IEquipmentService;
import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
import com.yeejoin.equipmanage.service.IEquipmentSystemSourceStatisticsService;
import com.yeejoin.equipmanage.service.IFireFightingSystemService;
import com.yeejoin.equipmanage.service.IStockBillDetailService;
import com.yeejoin.equipmanage.service.IStockBillService;
import com.yeejoin.equipmanage.service.IStockDetailService;
import com.yeejoin.equipmanage.service.IStockService;
import com.yeejoin.equipmanage.service.ISyncDataService;
import com.yeejoin.equipmanage.service.ISystemDicService;
import com.yeejoin.equipmanage.service.IUploadFileService;
import com.yeejoin.equipmanage.service.IVideoEquipmentSpecificService;
import com.yeejoin.equipmanage.service.IVideoService;
import com.yeejoin.equipmanage.service.IWarehouseService;
import com.yeejoin.equipmanage.service.IWarehouseStructureService;
import com.yeejoin.equipmanage.utils.RelationRedisUtil;
/**
......@@ -136,6 +98,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Autowired
IStockDetailService stockDetailService;
@Autowired
IEquipmentParamsService iEquipmentParamsService;
@Autowired
IStockService stockService;
@Autowired
......@@ -147,7 +113,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
IStockBillDetailService stockBillDetailService;
@Autowired
IStockBillService stockBillService;
@Autowired
EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
@Autowired
......@@ -226,7 +192,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Value("${systemctl.sync.switch}")
private Boolean syncSwitch;
@Value("${window.vedioFormat}")
String vedioFormat;
......@@ -578,7 +544,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
return equipmentSpecific;
}
@Override
public Map<String, Object> getAll(Long id) {
......@@ -1010,7 +976,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
}
if (res > 0 && syncSwitch) {
//数据同步
delEquipmentSpecificSyncData(id);
delEquipmentSpecificSyncData(id);
}
//判断装备表剩余数量，无剩余删除模板
QueryWrapper<EquipmentSpecific> wrapper = new QueryWrapper<>();
......@@ -1049,9 +1015,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
}
}
public void delEquipmentSpecificSyncData(Long id){
//数据同步
//数据同步
syncDataService.syncDeletedEquipmentSpecific(Arrays.asList(id));
List<EquipmentIndexVO> indexBySpecificIdIn = equipmentSpecificIndexSerivce.getEquipIndexBySpecificIdIn(Arrays.asList(String.valueOf(id)));
if (!indexBySpecificIdIn.isEmpty()) {
......@@ -1207,10 +1173,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
EquipmentDetail equipmentDetail = equipmentData.getEquipmentDetail();
Equipment equipment = equipmentService.getById(equipmentDetail.getEquipmentId());
if (equipment != null) {
String equipmentCode = equipment.getCode();
equipmentDetail.setCode(equipmentCode);
equipmentDetail.setEquipmentName(equipment.getName());
equipmentSpecific.setEquipmentCode(equipmentCode);
equipmentDetail.setCode(equipmentDetail.getCode());
equipmentDetail.setEquipmentName(equipmentDetail.getName());
equipmentSpecific.setEquipmentCode(equipmentDetail.getCode());
equipmentSpecific.setName(equipmentDetail.getName());
}
Long warehouseStructureId = null;
......@@ -1227,6 +1192,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
//TODO 非单件管理逻辑
//1.数据制码
equipmentDetail = equipmentDetailService.saveOne(equipmentDetail);
String qrCode = QRCodeUtil.generateQRCode();
//2.插入设备数据
equipmentSpecific.setStock(new Stock().setWarehouseId(0L));
......@@ -1588,10 +1554,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
// 已入库
this.baseMapper.deleteEquipDataByStockDetailId(stockDetail.getId(), specificId);
}
if (syncSwitch) {
//数据同步
delEquipmentSpecificSyncData(specificId);
delEquipmentSpecificSyncData(specificId);
}
return Boolean.TRUE;
......
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