liuchengqian/industrial_measurement
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整数据库表结构

Browse Source
This commit is contained in:
liuchengqian
2022-02-28 13:55:17 +08:00
parent 6ed366abe0
commit 3d053e63de
40 changed files with 1492 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/xkrs/controller/DataDictController.java
View File

@ -1,10 +1,9 @@
package com.xkrs.controller;
import com.xkrs.dao.DataDictDao;
import com.xkrs.dao.QcInspectionItemDictDao;
import com.xkrs.encapsulation.PromptMessageEnum;
import com.xkrs.model.entity.DataDict;
import com.xkrs.model.qo.DataDictQo;
import com.xkrs.model.qo.DataDictUpdateQo;
import com.xkrs.model.entity.QcInspectionItemDict;
import com.xkrs.model.qo.QcInspectionItemDictQo;
import com.xkrs.service.DataDictService;
import com.xkrs.util.Query;
import org.springframework.context.i18n.LocaleContextHolder;
@ -28,60 +27,63 @@ public class DataDictController {
private DataDictService dataDictService;
@Resource
private DataDictDao dataDictDao;
private QcInspectionItemDictDao inspectionItemDictDao;
@Resource
private Query query;
/**
* 添加字典变量数据
* @param dataDictQo
*
* @param inspectionItemDictQo
* @return
*/
@PostMapping("/insertDataDict")
public String insertDataDict(@RequestBody DataDictQo dataDictQo){
return dataDictService.insertDataDict(dataDictQo);
public String insertDataDict(@RequestBody QcInspectionItemDictQo inspectionItemDictQo) {
return dataDictService.insertDataDict(inspectionItemDictQo);
}
/**
* 动态多条件查询字典信息
*
* @param dictChineseName
* @param dictEnglishName
* @return
*/
@GetMapping("/selectDataDict")
public String selectDataDict(@RequestParam("dictChineseName") String dictChineseName,
@RequestParam("dictEnglishName") String dictEnglishName){
public String selectDataDict(@RequestParam("dictChineseName") String dictChineseName, @RequestParam("dictEnglishName") String dictEnglishName) {
Locale locale = LocaleContextHolder.getLocale();
List<DataDict> dataDict = query.selectDataDict(dictChineseName, dictEnglishName);
if(dataDict == null || dataDict.size() == 0){
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE,"暂时还没有该型号类型的字典信息！",locale);
List<QcInspectionItemDict> qcInspectionItemDict = query.selectDataDict(dictChineseName, dictEnglishName);
if (qcInspectionItemDict == null || qcInspectionItemDict.size() == 0) {
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时还没有该型号类型的字典信息！", locale);
}
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,dataDict,locale);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, qcInspectionItemDict, locale);
}
/**
* 根据id查询字典信息，用于数据回显，方便进行修改操作
*
* @param id
* @return
*/
@GetMapping("/selectDataDictById")
public String selectDataDictById(@RequestParam("id") Integer id){
public String selectDataDictById(@RequestParam("id") Integer id) {
Locale locale = LocaleContextHolder.getLocale();
DataDict dataDict = dataDictDao.findById(id);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,dataDict,locale);
QcInspectionItemDict qcInspectionItemDict = inspectionItemDictDao.findById(id);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, qcInspectionItemDict, locale);
}
/**
* 根据id修改字典信息
* @param dataDictUpdateQo
*
* @param inspectionItemDictQo
* @return
*/
@PostMapping("/updateDict")
@Transactional(rollbackOn = Exception.class)
public String updateDict(@RequestBody DataDictUpdateQo dataDictUpdateQo){
public String updateDict(@RequestBody QcInspectionItemDictQo inspectionItemDictQo) {
Locale locale = LocaleContextHolder.getLocale();
dataDictDao.updateDict(dataDictUpdateQo.getId(),dataDictUpdateQo.getDictChineseName());
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"修改成功！",locale);
inspectionItemDictDao.updateDictById(inspectionItemDictQo.getId(), inspectionItemDictQo.getInspectionItemName());
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功！", locale);
}
}

55
src/main/java/com/xkrs/controller/DataSourceController.java
View File

@ -1,16 +1,19 @@
package com.xkrs.controller;
import com.xkrs.dao.DataSourceDao;
import com.xkrs.dao.QcInspectionDataSourceDao;
import com.xkrs.encapsulation.PromptMessageEnum;
import com.xkrs.model.qo.DataSourceQo;
import com.xkrs.model.entity.QcInspectionDataSource;
import com.xkrs.model.qo.QcInspectionDataSourceQo;
import com.xkrs.service.DataSourceService;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
@ -25,50 +28,50 @@ public class DataSourceController {
private DataSourceService dataSourceService;
@Resource
private DataSourceDao dataSourceDao;
private QcInspectionDataSourceDao inspectionDataSourceDao;
/**
* 添加测量数据
* @param dataSourceQo
*
* @param inspectionDataSourceQo
* @return
*/
@PostMapping("/insertDataSource")
public String insertDataSource(@RequestBody DataSourceQo dataSourceQo){
return dataSourceService.insertDataSource(dataSourceQo);
public String insertDataSource(@RequestBody QcInspectionDataSourceQo inspectionDataSourceQo) {
return dataSourceService.insertDataSource(inspectionDataSourceQo);
}
/**
* 查询某一产品的测量信息
* @param dataModelNumber
* @param dataBatchNumber
* @param dataMachineCode
* @param productNumber
* @return
* 根据 批次号、机器号、物料号、模具号、零件号
*/
@GetMapping("/selectDataSource")
public String selectDataSource(@RequestParam("dataModelNumber") String dataModelNumber,
@RequestParam("dataBatchNumber") String dataBatchNumber,
@RequestParam("dataMachineCode") String dataMachineCode,
@RequestParam("productNumber") String productNumber){
public String selectDataSource(@RequestBody QcInspectionDataSourceQo inspectionDataSourceQo) {
String lotNo = inspectionDataSourceQo.getLotNo();
String machineNo = inspectionDataSourceQo.getMachineNo();
String materialNo = inspectionDataSourceQo.getMaterialNo();
String modelNo = inspectionDataSourceQo.getModelNo();
String partNo = inspectionDataSourceQo.getPartNo();
Locale locale = LocaleContextHolder.getLocale();
List<Map<String, String>> maps = dataSourceDao.selectDataSource(dataModelNumber, dataBatchNumber, dataMachineCode, productNumber);
if(maps == null || maps.size() == 0){
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE,"暂时没有该产品的测量信息！",locale);
List<QcInspectionDataSource> inspectionDataSources = inspectionDataSourceDao.selectDataSource(lotNo, machineNo, materialNo, modelNo, partNo);
if (inspectionDataSources == null || inspectionDataSources.isEmpty()) {
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的测量信息！", locale);
}
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,maps,locale);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, inspectionDataSources, locale);
}
/**
* 查询全部的测量信息
*
* @return
*/
@GetMapping("/selectAllSource")
public String selectAllSource(){
public String selectAllSource() {
Locale locale = LocaleContextHolder.getLocale();
List<Map<String, String>> maps = dataSourceDao.selectAllSource();
if(maps == null || maps.size() == 0){
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE,"暂时没有该产品的测量信息！",locale);
List<QcInspectionDataSource> dataSourceAll = inspectionDataSourceDao.findAll();
if (dataSourceAll == null || dataSourceAll.isEmpty()) {
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的测量信息！", locale);
}
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,maps,locale);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, dataSourceAll, locale);
}
}

40
src/main/java/com/xkrs/controller/FileController.java
View File

@ -1,18 +1,19 @@
package com.xkrs.controller;
import com.xkrs.dao.FileDao;
import com.xkrs.dao.QcInspectionFileDao;
import com.xkrs.encapsulation.PromptMessageEnum;
import com.xkrs.model.qo.FileQo;
import com.xkrs.model.qo.FileUpdateQo;
import com.xkrs.model.qo.QcInspectionFileQo;
import com.xkrs.service.FileService;
import com.xkrs.util.ExcelUploadUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.transaction.Transactional;
import java.io.IOException;
import java.util.Locale;
@ -30,44 +31,51 @@ public class FileController {
private FileService fileService;
@Resource
private FileDao fileDao;
private QcInspectionFileDao inspectionFileDao;
/**
* 上传模板信息
* @param fileQo
*
* @param inspectionFileQo
* @param fileExcel
* @return
* @throws IOException
*/
@PostMapping("/insertFileExcel")
public String insertFileExcel(FileQo fileQo, @RequestParam("fileExcel") MultipartFile fileExcel) throws IOException {
return fileService.insertFileExcel(fileQo,fileExcel);
public String insertFileExcel(QcInspectionFileQo inspectionFileQo, @RequestParam("fileExcel") MultipartFile fileExcel) throws IOException {
return fileService.insertFileExcel(inspectionFileQo, fileExcel);
}
/**
* 修改上传的模板信息
* @param fileUpdateQo
*
* @param inspectionFileQo
* @param fileExcel
* @return
* @throws IOException
*/
@PostMapping("/updateFileUploadPath")
@Transactional(rollbackOn = Exception.class)
public String updateFileUploadPath(FileUpdateQo fileUpdateQo,@RequestParam("fileExcel") MultipartFile fileExcel) throws IOException {
public String updateFileUploadPath(QcInspectionFileQo inspectionFileQo, @RequestParam("fileExcel") MultipartFile fileExcel) throws IOException {
String lotNo = inspectionFileQo.getLotNo();
String machineNo = inspectionFileQo.getMachineNo();
String materialNo = inspectionFileQo.getMaterialNo();
String modelNo = inspectionFileQo.getModelNo();
String partNo = inspectionFileQo.getPartNo();
Locale locale = LocaleContextHolder.getLocale();
String file = ExcelUploadUtil.memoryFile(fileExcel);
fileDao.updateFileUploadPath(fileUpdateQo.getFileModelNumber(),fileUpdateQo.getFileBatchNumber(),fileUpdateQo.getFileMachineCode(),fileUpdateQo.getFileProductNumber(),file);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"修改成功！",locale);
inspectionFileDao.updateTemplatePath(lotNo, machineNo, materialNo, modelNo, partNo, file);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "修改成功！", locale);
}
/**
* 导出excel
*
* @param fileQo
* @param inspectionFileQo
* @return
*/
@PostMapping("/exportExcel")
public String exportExcel(@RequestBody FileQo fileQo) throws IOException, InvalidFormatException {
return fileService.exportExcel(fileQo);
public String exportExcel(@RequestBody QcInspectionFileQo inspectionFileQo) throws IOException, InvalidFormatException {
return fileService.exportExcel(inspectionFileQo);
}
}