重构
This commit is contained in:
95
src/main/java/com/xkrs/service/impl/QcItemServiceImpl.java
Normal file
95
src/main/java/com/xkrs/service/impl/QcItemServiceImpl.java
Normal file
@ -0,0 +1,95 @@
|
||||
package com.xkrs.service.impl;
|
||||
|
||||
import com.xkrs.encapsulation.PromptMessageEnum;
|
||||
import com.xkrs.dao.QcItemDao;
|
||||
import com.xkrs.model.entity.QcItemEntity;
|
||||
import com.xkrs.model.qo.QcItemQoDelete;
|
||||
import com.xkrs.model.qo.QcItemQoInsert;
|
||||
import com.xkrs.model.qo.QcItemQoUpdate;
|
||||
import com.xkrs.service.QcItemService;
|
||||
import com.xkrs.util.LocalDateUtils;
|
||||
import com.xkrs.util.LocalStringUtils;
|
||||
import org.springframework.context.i18n.LocaleContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.transaction.Transactional;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
|
||||
|
||||
@Service
|
||||
public class QcItemServiceImpl implements QcItemService {
|
||||
|
||||
private Locale locale = LocaleContextHolder.getLocale();
|
||||
|
||||
@Resource
|
||||
private QcItemDao qcItemDao;
|
||||
|
||||
/**
|
||||
* 添加检验项目
|
||||
*/
|
||||
@Override
|
||||
public String insertQcItem(QcItemQoInsert insertQo) {
|
||||
String no = insertQo.getNo();
|
||||
String name = insertQo.getName();
|
||||
String type = insertQo.getType();
|
||||
Optional<QcItemEntity> entityByNo = qcItemDao.findByNo(no);
|
||||
if (entityByNo.isPresent()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该检验项目已存在，请勿重复添加！", locale);
|
||||
}
|
||||
QcItemEntity entity = new QcItemEntity();
|
||||
entity.setCreateTime(LocalDateUtils.getCurrentSecond());
|
||||
entity.setUpdateTime("");
|
||||
entity.setNo(LocalStringUtils.formatEmptyValue(no));
|
||||
entity.setName(LocalStringUtils.formatEmptyValue(name));
|
||||
entity.setType(LocalStringUtils.formatEmptyValue(type));
|
||||
qcItemDao.save(entity);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验项目
|
||||
*/
|
||||
@Override
|
||||
public String deleteQcItem(QcItemQoDelete deleteQo) {
|
||||
Integer id = deleteQo.getId();
|
||||
Optional<QcItemEntity> entityById = qcItemDao.findById(id);
|
||||
if (entityById.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目，请先添加检验项目！", locale);
|
||||
}
|
||||
qcItemDao.deleteById(id);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "删除成功！", locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新检验项目名称
|
||||
*/
|
||||
@Transactional(rollbackOn = Exception.class)
|
||||
@Override
|
||||
public String updateQcItem(QcItemQoUpdate updateQo) {
|
||||
Integer id = updateQo.getId();
|
||||
String name = updateQo.getName();
|
||||
Optional<QcItemEntity> entityById = qcItemDao.findById(id);
|
||||
if (entityById.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目，请先添加检验项目！", locale);
|
||||
}
|
||||
qcItemDao.updateNameById(id, LocalDateUtils.getCurrentSecond(), LocalStringUtils.formatEmptyValue(name));
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "更新成功！", locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验项目
|
||||
*/
|
||||
@Override
|
||||
public String queryQcItem(String no, String name) {
|
||||
List<Map<String, Object>> resultList = qcItemDao.queryQcItem(LocalStringUtils.formatEmptyValue(no), LocalStringUtils.formatEmptyValue(name));
|
||||
if (resultList == null || resultList.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该检验项目的信息！", locale);
|
||||
}
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, resultList, locale);
|
||||
}
|
||||
}
|
||||
126
src/main/java/com/xkrs/service/impl/QcSourceServiceImpl.java
Normal file
126
src/main/java/com/xkrs/service/impl/QcSourceServiceImpl.java
Normal file
@ -0,0 +1,126 @@
|
||||
package com.xkrs.service.impl;
|
||||
|
||||
import com.xkrs.encapsulation.PromptMessageEnum;
|
||||
import com.xkrs.dao.QcItemDao;
|
||||
import com.xkrs.dao.QcSourceDao;
|
||||
import com.xkrs.model.entity.QcItemEntity;
|
||||
import com.xkrs.model.entity.QcSourceEntity;
|
||||
import com.xkrs.model.qo.QcSourceQoDelete;
|
||||
import com.xkrs.model.qo.QcSourceQoInsert;
|
||||
import com.xkrs.service.QcSourceService;
|
||||
import com.xkrs.util.Constant;
|
||||
import com.xkrs.util.LocalDateUtils;
|
||||
import com.xkrs.util.LocalStringUtils;
|
||||
import com.xkrs.util.ExcelUploadUtil;
|
||||
import org.springframework.context.i18n.LocaleContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
|
||||
|
||||
@Service
|
||||
public class QcSourceServiceImpl implements QcSourceService {
|
||||
|
||||
private Locale locale = LocaleContextHolder.getLocale();
|
||||
|
||||
@Resource
|
||||
private QcItemDao qcItemDao;
|
||||
|
||||
@Resource
|
||||
private QcSourceDao qcSourceDao;
|
||||
|
||||
/**
|
||||
* 添加检验数据
|
||||
*/
|
||||
@Override
|
||||
public String insertQcSource(QcSourceQoInsert insertQo, MultipartFile picture) {
|
||||
String batchNo = insertQo.getBatchNo();
|
||||
String machineNo = insertQo.getMachineNo();
|
||||
String materialNo = insertQo.getMaterialNo();
|
||||
String mouldNo = insertQo.getMouldNo();
|
||||
String varietyNo = insertQo.getVarietyNo();
|
||||
String qcItemNo = insertQo.getQcItemNo();
|
||||
String qcValue = insertQo.getQcValue();
|
||||
Optional<QcItemEntity> qcItemEntityByNo = qcItemDao.findByNo(qcItemNo);
|
||||
if (qcItemEntityByNo.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目，请先添加检验项目！", locale);
|
||||
}
|
||||
if (Constant.QC_ITEM_TYPE_STRING.equals(qcItemEntityByNo.get().getType())) {
|
||||
QcSourceEntity entity = new QcSourceEntity();
|
||||
entity.setCreateTime(LocalDateUtils.getCurrentSecond());
|
||||
entity.setBatchNo(LocalStringUtils.formatEmptyValue(batchNo));
|
||||
entity.setMachineNo(LocalStringUtils.formatEmptyValue(machineNo));
|
||||
entity.setMaterialNo(LocalStringUtils.formatEmptyValue(materialNo));
|
||||
entity.setMouldNo(LocalStringUtils.formatEmptyValue(mouldNo));
|
||||
entity.setVarietyNo(LocalStringUtils.formatEmptyValue(varietyNo));
|
||||
entity.setQcItemNo(LocalStringUtils.formatEmptyValue(qcItemNo));
|
||||
entity.setQcValue(LocalStringUtils.formatEmptyValue(qcValue));
|
||||
qcSourceDao.save(entity);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
if (Constant.QC_ITEM_TYPE_PICTURE.equals(qcItemEntityByNo.get().getType())) {
|
||||
if (picture == null) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "上传图片不能为空！", locale);
|
||||
}
|
||||
String picturePath;
|
||||
try {
|
||||
picturePath = ExcelUploadUtil.memoryFile(picture, 2);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "上传图片失败！", locale);
|
||||
}
|
||||
QcSourceEntity entity = new QcSourceEntity();
|
||||
entity.setCreateTime(LocalDateUtils.getCurrentSecond());
|
||||
entity.setBatchNo(LocalStringUtils.formatEmptyValue(batchNo));
|
||||
entity.setMachineNo(LocalStringUtils.formatEmptyValue(machineNo));
|
||||
entity.setMaterialNo(LocalStringUtils.formatEmptyValue(materialNo));
|
||||
entity.setMouldNo(LocalStringUtils.formatEmptyValue(mouldNo));
|
||||
entity.setVarietyNo(LocalStringUtils.formatEmptyValue(varietyNo));
|
||||
entity.setQcItemNo(LocalStringUtils.formatEmptyValue(qcItemNo));
|
||||
entity.setQcValue(LocalStringUtils.formatEmptyValue(picturePath));
|
||||
qcSourceDao.save(entity);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "添加失败！", locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验数据
|
||||
*/
|
||||
@Override
|
||||
public String deleteQcSource(QcSourceQoDelete deleteQo) {
|
||||
Integer id = deleteQo.getId();
|
||||
Optional<QcSourceEntity> entityById = qcSourceDao.findById(id);
|
||||
if (entityById.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验数据，请先添加检验数据！", locale);
|
||||
}
|
||||
qcSourceDao.deleteById(id);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "删除成功！", locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验数据
|
||||
*/
|
||||
@Override
|
||||
public String queryQcSource(String batchNo, String machineNo, String materialNo, String mouldNo, String varietyNo) {
|
||||
List<Map<String, Object>> resultList = qcSourceDao.queryQcSource(LocalStringUtils.formatEmptyValue(batchNo), LocalStringUtils.formatEmptyValue(machineNo), LocalStringUtils.formatEmptyValue(materialNo), LocalStringUtils.formatEmptyValue(mouldNo), LocalStringUtils.formatEmptyValue(varietyNo));
|
||||
if (resultList == null || resultList.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该检验数据的信息！", locale);
|
||||
}
|
||||
if (1 == 1) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, resultList, locale);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "查询成功！", locale);
|
||||
}
|
||||
}
|
||||
128
src/main/java/com/xkrs/service/impl/QcSpecServiceImpl.java
Normal file
128
src/main/java/com/xkrs/service/impl/QcSpecServiceImpl.java
Normal file
@ -0,0 +1,128 @@
|
||||
package com.xkrs.service.impl;
|
||||
|
||||
import com.xkrs.encapsulation.PromptMessageEnum;
|
||||
import com.xkrs.dao.QcItemDao;
|
||||
import com.xkrs.dao.QcSpecDao;
|
||||
import com.xkrs.model.entity.QcItemEntity;
|
||||
import com.xkrs.model.entity.QcSpecEntity;
|
||||
import com.xkrs.model.qo.QcSpecQoDelete;
|
||||
import com.xkrs.model.qo.QcSpecQoInsert;
|
||||
import com.xkrs.model.qo.QcSpecQoUpdate;
|
||||
import com.xkrs.service.QcSpecService;
|
||||
import com.xkrs.util.LocalDateUtils;
|
||||
import com.xkrs.util.LocalStringUtils;
|
||||
import org.springframework.context.i18n.LocaleContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
|
||||
|
||||
@Service
|
||||
public class QcSpecServiceImpl implements QcSpecService {
|
||||
|
||||
private Locale locale = LocaleContextHolder.getLocale();
|
||||
|
||||
@Resource
|
||||
private QcItemDao qcItemDao;
|
||||
|
||||
@Resource
|
||||
private QcSpecDao qcSpecDao;
|
||||
|
||||
/**
|
||||
* 添加检验规格
|
||||
*/
|
||||
@Override
|
||||
public String insertQcSpec(QcSpecQoInsert insertQo) {
|
||||
|
||||
String varietyNo = insertQo.getVarietyNo();
|
||||
String qcItemNo = insertQo.getQcItemNo();
|
||||
String max = insertQo.getMax();
|
||||
String mean = insertQo.getMean();
|
||||
String min = insertQo.getMin();
|
||||
String unit = insertQo.getUnit();
|
||||
String method = insertQo.getMethod();
|
||||
String standard = insertQo.getStandard();
|
||||
String remark = insertQo.getRemark();
|
||||
|
||||
Optional<QcItemEntity> entityByNo = qcItemDao.findByNo(qcItemNo);
|
||||
if (entityByNo.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目，请先添加检验项目！", locale);
|
||||
}
|
||||
|
||||
Optional<QcSpecEntity> entityByVarietyNoAndQcItemNo = qcSpecDao.findByVarietyNoAndQcItemNo(varietyNo, qcItemNo);
|
||||
if (entityByVarietyNoAndQcItemNo.isPresent()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该检验规格已存在，请勿重复添加！", locale);
|
||||
}
|
||||
QcSpecEntity entity = new QcSpecEntity();
|
||||
entity.setCreateTime(LocalDateUtils.getCurrentSecond());
|
||||
entity.setUpdateTime("");
|
||||
entity.setVarietyNo(LocalStringUtils.formatEmptyValue(varietyNo));
|
||||
entity.setQcItemNo(LocalStringUtils.formatEmptyValue(qcItemNo));
|
||||
entity.setMax(LocalStringUtils.formatEmptyValue(max));
|
||||
entity.setMean(LocalStringUtils.formatEmptyValue(mean));
|
||||
entity.setMin(LocalStringUtils.formatEmptyValue(min));
|
||||
entity.setUnit(LocalStringUtils.formatEmptyValue(unit));
|
||||
entity.setMethod(LocalStringUtils.formatEmptyValue(method));
|
||||
entity.setStandard(LocalStringUtils.formatEmptyValue(standard));
|
||||
entity.setRemark(LocalStringUtils.formatEmptyValue(remark));
|
||||
qcSpecDao.save(entity);
|
||||
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验规格
|
||||
*/
|
||||
@Override
|
||||
public String deleteQcSpec(QcSpecQoDelete deleteQo) {
|
||||
Integer id = deleteQo.getId();
|
||||
Optional<QcSpecEntity> entityById = qcSpecDao.findById(id);
|
||||
if (entityById.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验规格，请先添加检验规格！", locale);
|
||||
}
|
||||
qcSpecDao.deleteById(id);
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "删除成功！", locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新检验规格
|
||||
*/
|
||||
@Override
|
||||
public String updateQcSpec(QcSpecQoUpdate updateQo) {
|
||||
|
||||
Integer id = updateQo.getId();
|
||||
String max = updateQo.getMax();
|
||||
String mean = updateQo.getMean();
|
||||
String min = updateQo.getMin();
|
||||
String unit = updateQo.getUnit();
|
||||
String method = updateQo.getMethod();
|
||||
String standard = updateQo.getStandard();
|
||||
String remark = updateQo.getRemark();
|
||||
|
||||
Optional<QcSpecEntity> entityById = qcSpecDao.findById(id);
|
||||
if (entityById.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验规格，请先添加检验规格！", locale);
|
||||
}
|
||||
|
||||
qcSpecDao.updateQcSpecById(id, LocalDateUtils.getCurrentSecond(), LocalStringUtils.formatEmptyValue(max), LocalStringUtils.formatEmptyValue(mean), LocalStringUtils.formatEmptyValue(min), LocalStringUtils.formatEmptyValue(unit), LocalStringUtils.formatEmptyValue(method), LocalStringUtils.formatEmptyValue(standard), LocalStringUtils.formatEmptyValue(remark));
|
||||
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功！", locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验规格
|
||||
*/
|
||||
@Override
|
||||
public String queryQcSpec(String varietyNo, String qcItemNo) {
|
||||
List<Map<String, Object>> resultList = qcSpecDao.queryQcSpec(LocalStringUtils.formatEmptyValue(varietyNo), LocalStringUtils.formatEmptyValue(qcItemNo));
|
||||
if (resultList == null || resultList.isEmpty()) {
|
||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该检验规格的信息！", locale);
|
||||
}
|
||||
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, resultList, locale);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user