重构
This commit is contained in:
@ -1,46 +0,0 @@
|
||||
package com.xkrs.service.impl;
|
||||
|
||||
import com.xkrs.dao.DataDictDao;
|
||||
import com.xkrs.encapsulation.PromptMessageEnum;
|
||||
import com.xkrs.model.entity.DataDict;
|
||||
import com.xkrs.model.qo.DataDictQo;
|
||||
import com.xkrs.service.DataDictService;
|
||||
import org.springframework.context.i18n.LocaleContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
|
||||
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
|
||||
|
||||
/**
|
||||
* @Author: XinYi Song
|
||||
* @Date: 2022/1/19 10:28
|
||||
*/
|
||||
@Service
|
||||
public class DataDictServiceImpl implements DataDictService {
|
||||
|
||||
@Resource
|
||||
private DataDictDao dataDictDao;
|
||||
|
||||
/**
|
||||
* 添加字典数据
|
||||
*
|
||||
* @param dataDictQo
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public String insertDataDict(DataDictQo dataDictQo) {
|
||||
Locale locale = LocaleContextHolder.getLocale();
|
||||
Optional<DataDict> byInspectionItemCode = dataDictDao.findByInspectionItemCode(dataDictQo.getInspectionItemCode());
|
||||
if (byInspectionItemCode.isPresent()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该产品变量已存在，请勿重复添加！", locale);
|
||||
}
|
||||
DataDict dataDict = new DataDict();
|
||||
dataDict.setInspectionItemName(dataDictQo.getInspectionItemName());
|
||||
dataDict.setInspectionItemCode(dataDictQo.getInspectionItemCode());
|
||||
dataDictDao.save(dataDict);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
}
|
||||
@ -1,71 +0,0 @@
|
||||
package com.xkrs.service.impl;
|
||||
|
||||
import com.xkrs.dao.DataDictDao;
|
||||
import com.xkrs.dao.DataSourceDao;
|
||||
import com.xkrs.encapsulation.PromptMessageEnum;
|
||||
import com.xkrs.model.entity.DataDict;
|
||||
import com.xkrs.model.entity.DataSource;
|
||||
import com.xkrs.model.qo.DataSourceQo;
|
||||
import com.xkrs.service.DataSourceService;
|
||||
import org.springframework.context.i18n.LocaleContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
|
||||
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
|
||||
|
||||
/**
|
||||
* @Author: XinYi Song
|
||||
* @Date: 2022/1/19 16:43
|
||||
*/
|
||||
@Service
|
||||
public class DataSourceServiceImpl implements DataSourceService {
|
||||
|
||||
@Resource
|
||||
private DataSourceDao dataSourceDao;
|
||||
|
||||
@Resource
|
||||
private DataDictDao dataDictDao;
|
||||
|
||||
/**
|
||||
* 添加测量数据
|
||||
*
|
||||
* @param dataSourceQo
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public String insertDataSource(DataSourceQo dataSourceQo) {
|
||||
Locale locale = LocaleContextHolder.getLocale();
|
||||
Optional<DataDict> byInspectionItemCode = dataDictDao.findByInspectionItemCode(dataSourceQo.getInspectionItemCode());
|
||||
if (byInspectionItemCode.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该字典类型！", locale);
|
||||
}
|
||||
DataSource dataSource = new DataSource();
|
||||
initDataSource(dataSource);
|
||||
dataSource.setLotNo(dataSourceQo.getLotNo());
|
||||
dataSource.setMachineNo(dataSourceQo.getMachineNo());
|
||||
dataSource.setMaterialNo(dataSourceQo.getMaterialNo());
|
||||
dataSource.setModelNo(dataSourceQo.getModelNo());
|
||||
dataSource.setMachineTypeNo(dataSourceQo.getMachineTypeNo());
|
||||
dataSource.setCraftItemName(dataSourceQo.getCraftItemName());
|
||||
dataSource.setInspectionItemCode(dataSourceQo.getInspectionItemCode());
|
||||
dataSource.setInspectValue(dataSourceQo.getInspectValue());
|
||||
dataSourceDao.save(dataSource);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
|
||||
private void initDataSource(DataSource dataSource) {
|
||||
dataSource.setLotNo("");
|
||||
dataSource.setMachineNo("");
|
||||
dataSource.setMaterialNo("");
|
||||
dataSource.setModelNo("");
|
||||
dataSource.setMachineTypeNo("");
|
||||
dataSource.setInspectionItemCode("");
|
||||
dataSource.setCraftItemName("");
|
||||
dataSource.setInspectValue("");
|
||||
dataSource.setPicturePath("");
|
||||
}
|
||||
|
||||
}
|
||||
@ -2,11 +2,9 @@ package com.xkrs.service.impl;
|
||||
|
||||
import com.xkrs.dao.FileDao;
|
||||
import com.xkrs.encapsulation.PromptMessageEnum;
|
||||
import com.xkrs.model.entity.DataSource;
|
||||
import com.xkrs.model.entity.FileEntity;
|
||||
import com.xkrs.model.qo.FileQo;
|
||||
import com.xkrs.service.FileService;
|
||||
import com.xkrs.util.DataSourceQuery;
|
||||
import com.xkrs.util.ExcelUploadUtil;
|
||||
import com.xkrs.util.ExportExcel;
|
||||
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
||||
@ -31,8 +29,8 @@ public class FileServiceImpl implements FileService {
|
||||
@Resource
|
||||
private FileDao fileDao;
|
||||
|
||||
@Resource
|
||||
private DataSourceQuery dataSourceQuery;
|
||||
// @Resource
|
||||
// private DataSourceQuery dataSourceQuery;
|
||||
|
||||
/**
|
||||
* 添加模板信息
|
||||
@ -77,28 +75,29 @@ public class FileServiceImpl implements FileService {
|
||||
@Transactional(rollbackOn = Exception.class)
|
||||
@Override
|
||||
public String exportExcel(FileQo fileQo) throws IOException, InvalidFormatException {
|
||||
String lotNo = fileQo.getLotNo();
|
||||
String machineNo = fileQo.getMachineNo();
|
||||
String materialNo = fileQo.getMaterialNo();
|
||||
String modelNo = fileQo.getModelNo();
|
||||
String machineTypeNo = fileQo.getMachineTypeNo();
|
||||
String craftItemName = fileQo.getCraftItemName();
|
||||
Locale locale = LocaleContextHolder.getLocale();
|
||||
Optional<FileEntity> fileEntity = fileDao.selectFile(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
|
||||
if (fileEntity.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的模板，请添加！", locale);
|
||||
}
|
||||
String fileUploadPath = fileEntity.get().getFileUploadPath();
|
||||
List<DataSource> dataSources = dataSourceQuery.selectDataSource(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
|
||||
if (dataSources == null || dataSources.size() == 0) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的信息！", locale);
|
||||
}
|
||||
Map<String, String> map = new HashMap<>();
|
||||
for (DataSource dataSource : dataSources) {
|
||||
map.put(dataSource.getInspectionItemCode(), dataSource.getInspectValue());
|
||||
}
|
||||
String fill = ExportExcel.exportToProveExcel(map, fileUploadPath);
|
||||
fileDao.updateFileDownloadPath(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName, fill);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, fill, locale);
|
||||
return null;
|
||||
// String lotNo = fileQo.getLotNo();
|
||||
// String machineNo = fileQo.getMachineNo();
|
||||
// String materialNo = fileQo.getMaterialNo();
|
||||
// String modelNo = fileQo.getModelNo();
|
||||
// String machineTypeNo = fileQo.getMachineTypeNo();
|
||||
// String craftItemName = fileQo.getCraftItemName();
|
||||
// Locale locale = LocaleContextHolder.getLocale();
|
||||
// Optional<FileEntity> fileEntity = fileDao.selectFile(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
|
||||
// if (fileEntity.isEmpty()) {
|
||||
// return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的模板，请添加！", locale);
|
||||
// }
|
||||
// String fileUploadPath = fileEntity.get().getFileUploadPath();
|
||||
// List<DataSource> dataSources = dataSourceQuery.selectDataSource(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
|
||||
// if (dataSources == null || dataSources.size() == 0) {
|
||||
// return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的信息！", locale);
|
||||
// }
|
||||
// Map<String, String> map = new HashMap<>();
|
||||
// for (DataSource dataSource : dataSources) {
|
||||
// map.put(dataSource.getInspectionItemCode(), dataSource.getInspectValue());
|
||||
// }
|
||||
// String fill = ExportExcel.exportToProveExcel(map, fileUploadPath);
|
||||
// fileDao.updateFileDownloadPath(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName, fill);
|
||||
// return outputEncapsulationObject(PromptMessageEnum.SUCCESS, fill, locale);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
package com.xkrs.service.impl;
|
||||
|
||||
import com.xkrs.dao.DataSourceDao;
|
||||
import com.xkrs.dao.PictureDao;
|
||||
import com.xkrs.encapsulation.PromptMessageEnum;
|
||||
import com.xkrs.model.entity.DataSource;
|
||||
import com.xkrs.model.qo.PictureQo;
|
||||
import com.xkrs.service.PictureService;
|
||||
import com.xkrs.util.DataSourceQuery;
|
||||
import com.xkrs.util.ExcelUploadUtil;
|
||||
import org.apache.http.util.TextUtils;
|
||||
import org.springframework.context.i18n.LocaleContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.transaction.Transactional;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
|
||||
|
||||
@Service
|
||||
public class PictureServiceImpl implements PictureService {
|
||||
|
||||
@Resource
|
||||
private PictureDao pictureDao;
|
||||
|
||||
@Resource
|
||||
private DataSourceDao dataSourceDao;
|
||||
|
||||
@Resource
|
||||
private DataSourceQuery dataSourceQuery;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackOn = Exception.class)
|
||||
public String insertPicture(PictureQo pictureQo, MultipartFile pictureFile) throws IOException {
|
||||
Locale locale = LocaleContextHolder.getLocale();
|
||||
String filePath = ExcelUploadUtil.memoryFile(pictureFile, 2);
|
||||
List<DataSource> dataSourceList = dataSourceQuery.selectDataSource(pictureQo.getLotNo(), pictureQo.getMachineNo(), pictureQo.getMaterialNo(), pictureQo.getModelNo(), pictureQo.getMachineTypeNo(), pictureQo.getCraftItemName());
|
||||
if (dataSourceList == null || dataSourceList.isEmpty()) {
|
||||
DataSource dataSource = new DataSource();
|
||||
dataSource.setLotNo(pictureQo.getLotNo());
|
||||
dataSource.setMachineNo(pictureQo.getMachineNo());
|
||||
dataSource.setMaterialNo(pictureQo.getMaterialNo());
|
||||
dataSource.setModelNo(pictureQo.getModelNo());
|
||||
dataSource.setMachineTypeNo(pictureQo.getMachineTypeNo());
|
||||
dataSource.setInspectionItemCode("");
|
||||
dataSource.setCraftItemName(pictureQo.getCraftItemName());
|
||||
dataSource.setInspectValue("");
|
||||
dataSource.setPicturePath(filePath);
|
||||
dataSourceDao.save(dataSource);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
for (DataSource dataSource : dataSourceList) {
|
||||
String newFilePath;
|
||||
if (TextUtils.isEmpty(dataSource.getPicturePath())) {
|
||||
newFilePath = filePath;
|
||||
} else {
|
||||
newFilePath = dataSource.getPicturePath() + "," + filePath;
|
||||
}
|
||||
dataSourceDao.updatePicturePath(dataSource.getLotNo(), dataSource.getMachineNo(), dataSource.getMaterialNo(), dataSource.getModelNo(), dataSource.getMachineTypeNo(), dataSource.getCraftItemName(), newFilePath);
|
||||
}
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String deletePicture(String picturePath) {
|
||||
Locale locale = LocaleContextHolder.getLocale();
|
||||
String deleteResult = ExcelUploadUtil.delFile(picturePath, 2);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, deleteResult, locale);
|
||||
}
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
package com.xkrs.service.impl;
|
||||
|
||||
import com.xkrs.dao.SpecDao;
|
||||
import com.xkrs.encapsulation.PromptMessageEnum;
|
||||
import com.xkrs.model.entity.SpecEntity;
|
||||
import com.xkrs.model.qo.SpecQo;
|
||||
import com.xkrs.service.SpecService;
|
||||
import com.xkrs.util.SpecQuery;
|
||||
import org.springframework.context.i18n.LocaleContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
|
||||
|
||||
@Service
|
||||
public class SpecServiceImpl implements SpecService {
|
||||
|
||||
@Resource
|
||||
private SpecQuery specQuery;
|
||||
|
||||
@Resource
|
||||
private SpecDao specDao;
|
||||
|
||||
@Override
|
||||
public String insertSpec(SpecQo specQo) {
|
||||
Locale locale = LocaleContextHolder.getLocale();
|
||||
List<SpecEntity> specEntities = specQuery.selectSpec(specQo.getMachineTypeNo(), specQo.getInspectionItemCode(),specQo.getCraftItemName());
|
||||
if (!specEntities.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "已存在该测量规格!", locale);
|
||||
}
|
||||
SpecEntity specEntity1 = new SpecEntity();
|
||||
specEntity1.setMachineTypeNo(specQo.getMachineTypeNo());
|
||||
specEntity1.setInspectionItemCode(specQo.getInspectionItemCode());
|
||||
specEntity1.setCraftItemName(specQo.getCraftItemName());
|
||||
specEntity1.setMax(specQo.getMax());
|
||||
specEntity1.setMean(specQo.getMean());
|
||||
specEntity1.setMin(specQo.getMin());
|
||||
specEntity1.setUnit(specQo.getUnit());
|
||||
specEntity1.setInspectionMethod(specQo.getInspectionMethod());
|
||||
specEntity1.setInspectionStandard(specQo.getInspectionStandard());
|
||||
specEntity1.setRemark(specQo.getRemark());
|
||||
specDao.save(specEntity1);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user