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

。

Browse Source
This commit is contained in:
liuchengqian
2022-03-10 11:53:03 +08:00
parent b74dd02f87
commit d6cda043fb
9 changed files with 264 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,21 @@
package com.xkrs.controller;
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.DataSourceQo;
import com.xkrs.service.DataSourceService;
import com.xkrs.util.DataSourceQuery;
import org.apache.http.util.TextUtils;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject;
@ -31,6 +35,9 @@ public class DataSourceController {
@Resource
private DataSourceDao dataSourceDao;
@Resource
private PictureDao pictureDao;
/**
* 添加测量数据
*
@ -54,18 +61,44 @@ public class DataSourceController {
* @return
*/
@GetMapping("/selectDataSource")
public String selectDataSource(@RequestParam(required = false, value = "lotNo") String lotNo,
@RequestParam(required = false, value = "machineNo") String machineNo,
@RequestParam(required = false, value = "materialNo") String materialNo,
@RequestParam(required = false, value = "modelNo") String modelNo,
@RequestParam(required = false, value = "machineTypeNo") String machineTypeNo,
@RequestParam(required = false, value = "craftItemName") String craftItemName) {
public String selectDataSource(@RequestParam(required = false, value = "lotNo") String lotNo, @RequestParam(required = false, value = "machineNo") String machineNo, @RequestParam(required = false, value = "materialNo") String materialNo, @RequestParam(required = false, value = "modelNo") String modelNo, @RequestParam(required = false, value = "machineTypeNo") String machineTypeNo, @RequestParam(required = false, value = "craftItemName") String craftItemName) {
Locale locale = LocaleContextHolder.getLocale();
List<DataSource> dataSources = dataSourceQuery.selectDataSource(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
if (dataSources == null || dataSources.size() == 0) {
List<Map<String, String>> groupList = dataSourceDao.selectAllDataSourceGroup();
if (groupList == null || groupList.isEmpty()) {
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的测量信息！", locale);
}
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, dataSources, locale);
List<List<DataSource>> dataSourceListList = new ArrayList<>();
for (Map<String, String> group : groupList) {
String groupNameLotNo = group.get("lotNo");
String groupNameMachineNo = group.get("machineNo");
String groupNameMaterialNo = group.get("materialNo");
String groupNameModelNo = group.get("modelNo");
String groupNameMachineTypeNo = group.get("machineTypeNo");
String groupNameCraftItemName = group.get("craftItemName");
if (!TextUtils.isEmpty(lotNo) && !lotNo.equals(groupNameLotNo)) {
continue;
}
if (!TextUtils.isEmpty(machineNo) && !machineNo.equals(groupNameMachineNo)) {
continue;
}
if (!TextUtils.isEmpty(materialNo) && !materialNo.equals(groupNameMaterialNo)) {
continue;
}
if (!TextUtils.isEmpty(modelNo) && !modelNo.equals(groupNameModelNo)) {
continue;
}
if (!TextUtils.isEmpty(machineTypeNo) && !machineTypeNo.equals(groupNameMachineTypeNo)) {
continue;
}
if (!TextUtils.isEmpty(craftItemName) && !craftItemName.equals(groupNameCraftItemName)) {
continue;
}
List<DataSource> dataSourceList = dataSourceDao.selectDataSource(groupNameLotNo, groupNameMachineNo, groupNameMaterialNo, groupNameModelNo, groupNameMachineTypeNo, groupNameCraftItemName);
if (dataSourceList != null && dataSourceList.size() > 0) {
dataSourceListList.add(dataSourceList);
}
}
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, dataSourceListList, locale);
}
/**

38
src/main/java/com/xkrs/controller/PictureController.java
View File

@ -38,24 +38,24 @@ public class PictureController {
return pictureService.insertPicture(pictureQo, filePicture);
}
/**
* 删除图片
*/
@PostMapping("/deletePicture")
public String deletePicture(@RequestBody DeletePictureQo deletePictureQo) {
return pictureService.deletePicture(deletePictureQo.getPicturePath());
}
// /**
// * 删除图片
// */
// @PostMapping("/deletePicture")
// public String deletePicture(@RequestBody DeletePictureQo deletePictureQo) {
// return pictureService.deletePicture(deletePictureQo.getPicturePath());
// }
/**
* 查询图片
*/
@GetMapping("/selectPicture")
public String selectPicture(@RequestParam(required = false, value = "lotNo") String lotNo, @RequestParam(required = false, value = "machineNo") String machineNo, @RequestParam(required = false, value = "materialNo") String materialNo, @RequestParam(required = false, value = "modelNo") String modelNo, @RequestParam(required = false, value = "machineTypeNo") String machineTypeNo, @RequestParam(required = false, value = "craftItemName") String craftItemName) {
Locale locale = LocaleContextHolder.getLocale();
List<PictureEntity> pictureEntities = pictureQuery.selectPicture(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
if (pictureEntities.isEmpty()) {
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该图片！", locale);
}
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, pictureEntities, locale);
}
// /**
// * 查询图片
// */
// @GetMapping("/selectPicture")
// public String selectPicture(@RequestParam(required = false, value = "lotNo") String lotNo, @RequestParam(required = false, value = "machineNo") String machineNo, @RequestParam(required = false, value = "materialNo") String materialNo, @RequestParam(required = false, value = "modelNo") String modelNo, @RequestParam(required = false, value = "machineTypeNo") String machineTypeNo, @RequestParam(required = false, value = "craftItemName") String craftItemName) {
// Locale locale = LocaleContextHolder.getLocale();
// List<PictureEntity> pictureEntities = pictureQuery.selectPicture(lotNo, machineNo, materialNo, modelNo, machineTypeNo, craftItemName);
// if (pictureEntities.isEmpty()) {
// return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该图片！", locale);
// }
// return outputEncapsulationObject(PromptMessageEnum.SUCCESS, pictureEntities, locale);
// }
}