Jcdm035-Mes.git

admin

7 天以前 87dd7f637b095f6b7284bbcff708aaea82a28b3f

提交 \| 用户 \| 时间
b78728	1	package com.jcdm.main.da.paramCollection.controller;
A	2
cb4e54	3	import cn.hutool.core.util.ObjectUtil;
A	4	import cn.hutool.json.JSONArray;
	5	import cn.hutool.json.JSONObject;
	6	import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
b78728	7	import com.jcdm.common.annotation.Log;
A	8	import com.jcdm.common.core.controller.BaseController;
	9	import com.jcdm.common.core.domain.AjaxResult;
	10	import com.jcdm.common.core.page.TableDataInfo;
	11	import com.jcdm.common.enums.BusinessType;
	12	import com.jcdm.common.utils.DateUtils;
	13	import com.jcdm.common.utils.poi.ExcelUtil;
4e91ae	14	import com.jcdm.main.bs.formulaChild.domain.PrintOfflineReportInfo;
b78728	15	import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
A	16	import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
cb4e54	17	import com.jcdm.main.da.testDeviceInterface.domain.DaTestDeviceInterface;
A	18	import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService;
b78728	19	import org.springframework.beans.factory.annotation.Autowired;
A	20	import org.springframework.security.access.prepost.PreAuthorize;
	21	import org.springframework.web.bind.annotation.*;
	22
	23	import javax.servlet.http.HttpServletResponse;
87dd7f	24	import java.text.DecimalFormat;
4e91ae	25	import java.time.LocalDate;
A	26	import java.time.format.DateTimeFormatter;
87dd7f	27	import java.util.Arrays;
b78728	28	import java.util.List;
4e91ae	29	import java.util.Map;
87dd7f	30	import java.util.stream.Collectors;
b78728	31
A	32	/**
	33	* 设备产品过程参数采集Controller
	34	*
	35	* @author yyt
	36	* @date 2023-12-13
	37	*/
	38	@RestController
	39	@RequestMapping("/main/paramCollection")
	40	public class DaParamCollectionController extends BaseController
	41	{
	42	@Autowired
	43	private IDaParamCollectionService daParamCollectionService;
	44
cb4e54	45	@Autowired
A	46	private IDaTestDeviceInterfaceService daTestDeviceInterfaceService;
	47
b78728	48	/**
A	49	* 查询设备产品过程参数采集列表
	50	*/
4e91ae	51	@GetMapping("/getPrintOfflineReportInfo")
A	52	public AjaxResult getPrintOfflineReportInfo(DaParamCollection daParamCollection)
	53	{
cb4e54	54	String result = "S";
4e91ae	55	PrintOfflineReportInfo info = new PrintOfflineReportInfo();
cb4e54	56	DaParamCollection OP130_InsulationResistance1 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_InsulationResistance1").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
A	57	info.setParam18(OP130_InsulationResistance1.getParamValue());
	58
	59	DaParamCollection OP030_DifferenceProduct2_3 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP030_DifferenceProduct2_3").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	60	DaParamCollection OP030_DifferenceProduct1_3 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP030_DifferenceProduct1_3").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	61	DaParamCollection OP030_DifferenceProduct1_2 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP030_DifferenceProduct1_2").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	62	info.setParam19(OP030_DifferenceProduct2_3.getParamValue()+","+OP030_DifferenceProduct1_3.getParamValue()+","+OP030_DifferenceProduct1_2.getParamValue());
	63
	64	DaParamCollection OP130_InsulationResistance2 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_InsulationResistance2").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	65	info.setParam20(OP130_InsulationResistance2.getParamValue());
	66
	67	DaParamCollection OP130_TemperatureControlledWinding = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_TemperatureControlledWinding").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	68	info.setParam21(OP130_TemperatureControlledWinding.getParamValue());
	69
	70	DaParamCollection OP130_WarmTransmission = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_WarmTransmission").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	71	info.setParam22(OP130_WarmTransmission.getParamValue());
	72
	73	DaParamCollection OP130_InsulationResistance3 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_InsulationResistance3").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	74	info.setParam23(OP130_InsulationResistance3.getParamValue());
	75
	76	DaParamCollection OP130_Casing = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_Casing").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	77	info.setParam24(OP130_Casing.getParamValue());
	78
	79	DaParamCollection OP130_GroundWithstandVoltage = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_GroundWithstandVoltage").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	80	info.setParam25(OP130_GroundWithstandVoltage.getParamValue());
	81
	82	DaParamCollection OP130_RotaryResistanceValue3 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_RotaryResistanceValue3").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	83	DaParamCollection OP130_RotaryResistanceValue2 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_RotaryResistanceValue2").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	84	DaParamCollection OP130_RotaryResistanceValue1 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_RotaryResistanceValue1").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	85	info.setParam26(OP130_RotaryResistanceValue3.getParamValue()+","+OP130_RotaryResistanceValue2.getParamValue()+","+OP130_RotaryResistanceValue1.getParamValue());
	86
	87	DaParamCollection OP130_ThreePhaseResistance3 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_ThreePhaseResistance3").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	88	DaParamCollection OP130_BalanceDegree2 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_ThreePhaseResistance2").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	89	DaParamCollection OP130_BalanceDegree1 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_ThreePhaseResistance1").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
87dd7f	90	info.setParam27(getParam27(OP130_ThreePhaseResistance3.getParamValue()+","+OP130_BalanceDegree2.getParamValue()+","+OP130_BalanceDegree1.getParamValue()));
cb4e54	91
A	92	DaParamCollection OP130_28_BalanceDegree1 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_BalanceDegree1").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	93	DaParamCollection OP130_28_BalanceDegree2 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_BalanceDegree2").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	94	DaParamCollection OP130_28_BalanceDegree3 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_BalanceDegree3").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
87dd7f	95	info.setParam28(getParam28(OP130_28_BalanceDegree1.getParamValue()+","+OP130_28_BalanceDegree2.getParamValue()+","+OP130_28_BalanceDegree3.getParamValue()));
cb4e54	96
A	97	info.setParam29(getParam29(daParamCollection.getProductNum()));
	98
	99	List<DaParamCollection> OP030_RotationDirection = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP030_RotationDirection").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	100	if(ObjectUtil.isNotEmpty(OP030_RotationDirection)){
	101	//1√ 2×
	102	String paramValue = OP030_RotationDirection.get(OP030_RotationDirection.size() - 1).getParamValue();
	103	if(paramValue.equals("1")){
	104	info.setParam30("√");
	105	}else if(paramValue.equals("2")){
	106	info.setParam30("❌");
	107	}else {
	108	info.setParam30("未知");
	109	}
	110	}else {
	111	result = "F";
	112	}
	113
	114	List<DaParamCollection> OP230_GroundingMohm = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP230_GroundingMohm").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	115	if(ObjectUtil.isNotEmpty(OP230_GroundingMohm)){
	116	//取小数点后两位 mΩ
	117	String paramValue = OP230_GroundingMohm.get(OP230_GroundingMohm.size() - 1).getParamValue();
	118	info.setParam31(paramValue.substring(0, 4)+"mΩ");
	119	}else {
	120	result = "F";
	121	}
	122
	123	List<DaParamCollection> OP220_Divulge1 = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP220_Divulge1").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	124	if(ObjectUtil.isNotEmpty(OP220_Divulge1)){
	125	info.setParam32(OP220_Divulge1.get(OP220_Divulge1.size()-1).getParamValue());
	126	}else {
	127	result = "F";
	128	}
	129
	130	List<DaParamCollection> OP220_Divulge2 = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP220_Divulge2").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	131	if(ObjectUtil.isNotEmpty(OP220_Divulge2)){
	132	info.setParam33(OP220_Divulge2.get(OP220_Divulge2.size()-1).getParamValue());
	133	}else {
	134	result = "F";
	135	}
	136
	137	List<DaParamCollection> OP230_WithstanduUA = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP230_WithstanduUA").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	138	if(ObjectUtil.isNotEmpty(OP230_WithstanduUA)){
	139	DaParamCollection daParamCollection1 = OP230_WithstanduUA.get(OP230_WithstanduUA.size() - 1);
	140	String paramValue = daParamCollection1.getParamValue();
	141	info.setParam34(OP230_WithstanduUA.get(OP230_WithstanduUA.size()-1).getParamValue()+"uA");
	142	}else {
	143	result = "F";
	144	}
	145
	146	List<DaParamCollection> OP230_InsulationMohm = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP230_InsulationMohm").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	147	if(ObjectUtil.isNotEmpty(OP230_InsulationMohm)){
	148	info.setParam35(OP230_InsulationMohm.get(OP230_InsulationMohm.size()-1).getParamValue());
	149	}else {
	150	result = "F";
	151	}
	152
	153	List<DaParamCollection> OP120_2_RotatingAngle = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP120-2_RotatingAngle").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum()));
	154	if(ObjectUtil.isNotEmpty(OP120_2_RotatingAngle)){
	155	info.setParam36(OP120_2_RotatingAngle.get(OP120_2_RotatingAngle.size()-1).getParamValue());
	156	}else {
	157	result = "F";
	158	}
	159
	160	info.setParam37(getParam37(daParamCollection.getProductNum()));
	161
	162	// info.setParam18("＞500");
	163	// info.setParam19("0.3%，0%，0.5%");
	164	// info.setParam20("＞600");
	165	// info.setParam21("＞700");
	166	// info.setParam22("0.22");
	167	// info.setParam23("362");
	168	// info.setParam24("8.18");
	169	// info.setParam25("0.1");
	170	// info.setParam26("21.53,42.33,42.19");
	171	// info.setParam27("49.20,49.34,49.15");
	172	// info.setParam28("0.061%，0.163%，0.223%");
	173	// info.setParam29("35.1,35.0,35.1");
	174	// info.setParam30("√");
	175	// info.setParam31("0.0041");
	176	// info.setParam32("3.06");
	177	// info.setParam33("o.48");
	178	// info.setParam34("4.7ｕA");
	179	// info.setParam35("562.1");
	180	// info.setParam36("-137.1");
	181	// info.setParam37("√");
4e91ae	182	info.setInspectionDate(getInspectionDate());
cb4e54	183	info.setReviewerDate(getReviewerDate());
A	184	info.setProductNum(daParamCollection.getProductNum().substring(13,26));
	185	System.out.println(info);
4e91ae	186	return AjaxResult.success(info);
cb4e54	187	}
A	188
	189	public String getParam37(String productNum){
	190	productNum = productNum.substring(13,26);
	191	List<DaTestDeviceInterface> one = daTestDeviceInterfaceService.list(new LambdaQueryWrapper<DaTestDeviceInterface>().like(DaTestDeviceInterface::getProductNum, productNum).eq(DaTestDeviceInterface::getStationCode,"OP240"));
	192	JSONArray jsonArray = new JSONArray(one.get(one.size()-1).getCheckList());
	193	JSONObject item = jsonArray.getJSONObject(1);
	194	return item.getStr("itemValue");
	195	}
	196
	197	public String getParam29(String productNum){
	198	List<DaTestDeviceInterface> one = daTestDeviceInterfaceService.list(new LambdaQueryWrapper<DaTestDeviceInterface>().eq(DaTestDeviceInterface::getProductNum, productNum).eq(DaTestDeviceInterface::getStationCode,"OP150"));
	199	JSONArray jsonArray = new JSONArray(one.get(one.size()-1).getCheckList());
	200	JSONObject itemU = jsonArray.getJSONObject(0);
	201	JSONObject itemV = jsonArray.getJSONObject(1);
	202	JSONObject itemW = jsonArray.getJSONObject(2);
	203	return itemU.getStr("itemValue")+","+itemV.getStr("itemValue")+","+itemW.getStr("itemValue");
4e91ae	204	}
A	205
	206	public static String getInspectionDate(){
	207	// 获取当前日期
	208	LocalDate today = LocalDate.now();
	209	// 定义日期格式（年.月.日）
	210	DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M.d");
	211	// 格式化当前日期
	212	return today.format(formatter);
	213	}
	214
cb4e54	215	public static String getReviewerDate(){
A	216	// 获取当前日期
	217	LocalDate today = LocalDate.now();
	218	// 定义日期格式（年.月.日）
	219	DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
	220	// 格式化当前日期
	221	return today.format(formatter);
	222	}
	223
4e91ae	224	public static void main(String[] args) {
87dd7f	225	String param27 = "49.260002,49.122525,49.06235235";
A	226	String param28 = "0.163,0.061,0.224";
	227	// 按逗号分割字符串
	228	String[] parts = param27.split(",");
cb4e54	229
87dd7f	230	// 创建一个 DecimalFormat 实例，用于格式化数字
A	231	DecimalFormat df = new DecimalFormat("#.00");
cb4e54	232
87dd7f	233	// 遍历分割后的数组，并格式化每个元素
A	234	// for (String part : parts) {
	235	// double value = Double.parseDouble(part);
	236	// String formattedValue = df.format(value);
	237	// System.out.println(formattedValue);
	238	// }
cb4e54	239
87dd7f	240	String result = Arrays.stream(parts)
A	241	.map(part -> df.format(Double.parseDouble(part)))
	242	.collect(Collectors.joining(","));
	243
	244	System.out.println(result);
	245	System.out.println(getParam28(param28));
	246
	247	}
	248
	249	public static String getParam28(String input) {
	250	// 分割字符串
	251	String[] parts = input.split(",");
	252	StringBuilder sb = new StringBuilder();
	253
	254	for (int i = 0; i < parts.length; i++) {
	255	// 在每个部分后面加上 %
	256	sb.append(parts[i]).append("%");
	257	if (i < parts.length - 1) {
	258	sb.append(",");
	259	}
	260	}
	261
	262	return sb.toString();
	263	}
	264
	265	public String getParam27(String param){
	266	String[] parts = param.split(",");
	267	DecimalFormat df = new DecimalFormat("#.00");
	268	String result = Arrays.stream(parts)
	269	.map(part -> df.format(Double.parseDouble(part)))
	270	.collect(Collectors.joining(","));
	271	return result;
4e91ae	272	}
A	273
	274	/**
	275	* 查询设备产品过程参数采集列表
	276	*/
b78728	277	@PreAuthorize("@ss.hasPermi('main:paramCollection:list')")
A	278	@GetMapping("/list")
	279	public TableDataInfo list(DaParamCollection daParamCollection)
	280	{
	281	startPage();
	282	List<DaParamCollection> list = daParamCollectionService.selectDaParamCollectionList(daParamCollection);
	283	return getDataTable(list);
	284	}
	285
	286	/**
	287	* 查询设备产品过程参数采集列表
	288	*/
	289	@PostMapping("/sendIMesData")
	290	public void sendIMesData(@RequestBody DaParamCollection daParamCollection)
	291	{
	292	daParamCollectionService.pushGeelycvMesFeedback(daParamCollection.getSfcCode(),daParamCollection.getLocationCode());
	293	}
	294
	295	/**
	296	* 导出设备产品过程参数采集列表
	297	*/
	298	@PreAuthorize("@ss.hasPermi('main:paramCollection:export')")
	299	@Log(title = "设备产品过程参数采集", businessType = BusinessType.EXPORT)
	300	@PostMapping("/export")
	301	public void export(HttpServletResponse response, DaParamCollection daParamCollection)
	302	{
	303	List<DaParamCollection> list = daParamCollectionService.selectDaParamCollectionList(daParamCollection);
	304	ExcelUtil<DaParamCollection> util = new ExcelUtil<DaParamCollection>(DaParamCollection.class);
	305	util.exportExcel(response, list, "设备产品过程参数采集数据");
	306	}
	307
	308	/**
	309	* 获取设备产品过程参数采集详细信息
	310	*/
	311	@PreAuthorize("@ss.hasPermi('main:paramCollection:query')")
	312	@GetMapping(value = "/{id}")
	313	public AjaxResult getInfo(@PathVariable("id") Long id)
	314	{
	315	return success(daParamCollectionService.selectDaParamCollectionById(id));
	316	}
	317
	318	/**
	319	* 新增设备产品过程参数采集
	320	*/
	321	@PreAuthorize("@ss.hasPermi('main:paramCollection:add')")
	322	@Log(title = "设备产品过程参数采集", businessType = BusinessType.INSERT)
	323	@PostMapping
	324	public AjaxResult add(@RequestBody DaParamCollection daParamCollection)
	325	{
	326	daParamCollection.setCreateBy(getUsername());
	327	daParamCollection.setCreateTime(DateUtils.getNowDate());
	328	return toAjax(daParamCollectionService.insertDaParamCollection(daParamCollection));
	329	}
	330
	331	/**
	332	* 基础参数增加
	333	*/
	334	@PostMapping("/addBasicParameters")
	335	public void addBasicParameters(@RequestBody DaParamCollection daParamCollection)
	336	{
	337	daParamCollectionService.addBasicParameters(daParamCollection);
	338	}
	339
	340	/**
	341	* 基础参数增加
	342	*/
	343	@PostMapping("/yzAddBasicParameters")
	344	public void yzAddBasicParameters(@RequestBody DaParamCollection daParamCollection)
	345	{
	346	daParamCollectionService.yzAddBasicParameters(daParamCollection);
	347	}
	348
	349	/**
	350	* 拧紧参数增加
	351	*/
	352	@PostMapping("/addTighteningParameters")
	353	public void addTighteningParameters(@RequestBody DaParamCollection daParamCollection)
	354	{
	355	daParamCollectionService.addTighteningParameters(daParamCollection);
	356	}
	357
	358	/**
	359	* 出战时间参数增加
	360	*/
	361	@PostMapping("/saveCampaignTimeParameters")
	362	public void saveCampaignTimeParameters(@RequestBody DaParamCollection daParamCollection)
	363	{
	364	daParamCollectionService.saveCampaignTimeParameters(daParamCollection);
	365	}
	366
	367	/**
	368	* 出战时间参数增加
	369	*/
	370	@PostMapping("/preInstallOut")
	371	public void preInstallOut(@RequestBody DaParamCollection daParamCollection)
	372	{
	373	daParamCollectionService.preInstallOut(daParamCollection);
	374	}
	375
	376	/**
	377	* 出战时间参数增加
	378	*/
	379	@PostMapping("/checkRecordDataDone")
	380	public AjaxResult checkRecordDataDone(@RequestBody DaParamCollection daParamCollection)
	381	{
	382	return daParamCollectionService.checkRecordDataDone(daParamCollection);
	383	}
	384
	385	/**
	386	* 出战时间参数增加
	387	*/
	388	@PostMapping("/jrmSaveCampaignTimeParameters")
	389	public void jrmSaveCampaignTimeParameters(@RequestBody DaParamCollection daParamCollection)
	390	{
	391	daParamCollectionService.jrmSaveCampaignTimeParameters(daParamCollection);
	392	}
	393
	394
	395	/**
	396	* 更换总成号
	397	*/
	398	@PostMapping("/replaceAssemblyCode")
	399	public void replaceAssemblyCode(@RequestBody DaParamCollection daParamCollection)
	400	{
	401	daParamCollectionService.replaceAssemblyCode(daParamCollection);
	402	}
	403
	404	/**
	405	* 更换总成号
	406	*/
	407	@PostMapping("/enterWeighing")
	408	public void enterWeighing(@RequestBody DaParamCollection daParamCollection)
	409	{
	410	daParamCollectionService.enterWeighing(daParamCollection);
	411	}
	412
	413	/**
	414	* 修改设备产品过程参数采集
	415	*/
	416	@PreAuthorize("@ss.hasPermi('main:paramCollection:edit')")
	417	@Log(title = "设备产品过程参数采集", businessType = BusinessType.UPDATE)
	418	@PutMapping
	419	public AjaxResult edit(@RequestBody DaParamCollection daParamCollection)
	420	{
	421	daParamCollection.setUpdateBy(getUsername());
	422	daParamCollection.setUpdateTime(DateUtils.getNowDate());
	423	return toAjax(daParamCollectionService.updateDaParamCollection(daParamCollection));
	424	}
	425
	426	/**
	427	* 删除设备产品过程参数采集
	428	*/
	429	@PreAuthorize("@ss.hasPermi('main:paramCollection:remove')")
	430	@Log(title = "设备产品过程参数采集", businessType = BusinessType.DELETE)
	431	@DeleteMapping("/{ids}")
	432	public AjaxResult remove(@PathVariable Long[] ids)
	433	{
	434	return toAjax(daParamCollectionService.deleteDaParamCollectionByIds(ids));
	435	}
	436
	437	}