Commit 89b80c11 authored by wanghao's avatar wanghao

1 上传MES 返回内容,记录,及界面展示。

parent 2622f89b
package com.zehong.web.controller.equipment;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.system.domain.UploadMesResultHistory;
import com.zehong.system.service.IUploadMesResultHistoryService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 上传MES返回结果历史记录Controller
*
* @author zehong
* @date 2025-12-03
*/
@RestController
@RequestMapping("/uploadMesResult/history")
public class UploadMesResultHistoryController extends BaseController
{
@Autowired
private IUploadMesResultHistoryService uploadMesResultHistoryService;
/**
* 查询上传MES返回结果历史记录列表
*/
@GetMapping("/list")
public TableDataInfo list(UploadMesResultHistory uploadMesResultHistory)
{
startPage();
List<UploadMesResultHistory> list = uploadMesResultHistoryService.selectUploadMesResultHistoryList(uploadMesResultHistory);
return getDataTable(list);
}
/**
* 导出上传MES返回结果历史记录列表
*/
@GetMapping("/export")
public AjaxResult export(UploadMesResultHistory uploadMesResultHistory)
{
List<UploadMesResultHistory> list = uploadMesResultHistoryService.selectUploadMesResultHistoryList(uploadMesResultHistory);
ExcelUtil<UploadMesResultHistory> util = new ExcelUtil<UploadMesResultHistory>(UploadMesResultHistory.class);
return util.exportExcel(list, "上传MES返回结果历史记录数据");
}
/**
* 获取上传MES返回结果历史记录详细信息
*/
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(uploadMesResultHistoryService.selectUploadMesResultHistoryById(id));
}
/**
* 新增上传MES返回结果历史记录
*/
@PostMapping
public AjaxResult add(@RequestBody UploadMesResultHistory uploadMesResultHistory)
{
return toAjax(uploadMesResultHistoryService.insertUploadMesResultHistory(uploadMesResultHistory));
}
/**
* 修改上传MES返回结果历史记录
*/
@PutMapping
public AjaxResult edit(@RequestBody UploadMesResultHistory uploadMesResultHistory)
{
return toAjax(uploadMesResultHistoryService.updateUploadMesResultHistory(uploadMesResultHistory));
}
/**
* 删除上传MES返回结果历史记录
*/
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(uploadMesResultHistoryService.deleteUploadMesResultHistoryByIds(ids));
}
}
package com.zehong.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 上传MES返回结果历史记录对象 t_upload_mes_result_history
*
* @author zehong
* @date 2025-12-03
*/
public class UploadMesResultHistory extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long id;
/** 内容 */
@Excel(name = "内容")
private String message;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setMessage(String message)
{
this.message = message;
}
public String getMessage()
{
return message;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("createTime", getCreateTime())
.append("message", getMessage())
.toString();
}
}
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.UploadMesResultHistory;
/**
* 上传MES返回结果历史记录Mapper接口
*
* @author zehong
* @date 2025-12-03
*/
public interface UploadMesResultHistoryMapper
{
/**
* 查询上传MES返回结果历史记录
*
* @param id 上传MES返回结果历史记录ID
* @return 上传MES返回结果历史记录
*/
public UploadMesResultHistory selectUploadMesResultHistoryById(Long id);
/**
* 查询上传MES返回结果历史记录列表
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 上传MES返回结果历史记录集合
*/
public List<UploadMesResultHistory> selectUploadMesResultHistoryList(UploadMesResultHistory uploadMesResultHistory);
/**
* 新增上传MES返回结果历史记录
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 结果
*/
public int insertUploadMesResultHistory(UploadMesResultHistory uploadMesResultHistory);
/**
* 修改上传MES返回结果历史记录
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 结果
*/
public int updateUploadMesResultHistory(UploadMesResultHistory uploadMesResultHistory);
/**
* 删除上传MES返回结果历史记录
*
* @param id 上传MES返回结果历史记录ID
* @return 结果
*/
public int deleteUploadMesResultHistoryById(Long id);
/**
* 批量删除上传MES返回结果历史记录
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteUploadMesResultHistoryByIds(Long[] ids);
}
...@@ -8,10 +8,7 @@ import com.zehong.common.utils.StringUtils; ...@@ -8,10 +8,7 @@ import com.zehong.common.utils.StringUtils;
import com.zehong.common.utils.http.HttpUtils; import com.zehong.common.utils.http.HttpUtils;
import com.zehong.system.domain.*; import com.zehong.system.domain.*;
import com.zehong.system.mapper.TTrayInfoMapper; import com.zehong.system.mapper.TTrayInfoMapper;
import com.zehong.system.service.IPalletDeviceBindingService; import com.zehong.system.service.*;
import com.zehong.system.service.IPalletDeviceUploadHistoryService;
import com.zehong.system.service.IProcessCalibrationResultHistoryService;
import com.zehong.system.service.ISysConfigService;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -56,6 +53,9 @@ public class CalibrationResultEventHandler { ...@@ -56,6 +53,9 @@ public class CalibrationResultEventHandler {
@Resource @Resource
private TTrayInfoMapper tTrayInfoMapper; private TTrayInfoMapper tTrayInfoMapper;
@Resource
private IUploadMesResultHistoryService uploadMesResultHistoryService;
/** /**
* check是否启动 ,没启动就启动下 开始老化 * check是否启动 ,没启动就启动下 开始老化
* *
...@@ -112,12 +112,17 @@ public class CalibrationResultEventHandler { ...@@ -112,12 +112,17 @@ public class CalibrationResultEventHandler {
if(StringUtils.isNotBlank(mesUploadAddress)) { if(StringUtils.isNotBlank(mesUploadAddress)) {
try{ try{
String result = HttpUtils.sendPost(mesUploadAddress, JSON.toJSONString(mesDeviceDomains)); String result = HttpUtils.sendPost(mesUploadAddress, JSON.toJSONString(mesDeviceDomains));
UploadMesResultHistory uploadMesResultHistory = new UploadMesResultHistory();
uploadMesResultHistory.setMessage(result);
uploadMesResultHistoryService.insertUploadMesResultHistory(uploadMesResultHistory);
if(StringUtils.isNotBlank(result)) { if(StringUtils.isNotBlank(result)) {
JSONObject jsonObject = JSON.parseObject(result); JSONObject jsonObject = JSON.parseObject(result);
if(jsonObject.getInteger("code") != 200) { if(jsonObject.getInteger("code") != 200) {
String data = jsonObject.getString("data"); String data = jsonObject.getString("data");
if(StringUtils.isNotBlank(data)) { if(StringUtils.isNotBlank(data)) {
processPalletDeviceUploadHistory(palletDeviceBindings,data); processPalletDeviceUploadHistory(palletDeviceBindings,data);
} else {
directProcessPaalletDeviceUploadHistory(palletDeviceBindings);
} }
} }
} else { } else {
...@@ -333,6 +338,8 @@ public class CalibrationResultEventHandler { ...@@ -333,6 +338,8 @@ public class CalibrationResultEventHandler {
if (!jsonObject.containsKey("failedCodes")) { if (!jsonObject.containsKey("failedCodes")) {
return; return;
} else {
log.info("上传失败;没有返回正确数据");
} }
JSONArray failedCodes = jsonObject.getJSONArray("failedCodes"); JSONArray failedCodes = jsonObject.getJSONArray("failedCodes");
......
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.UploadMesResultHistory;
/**
* 上传MES返回结果历史记录Service接口
*
* @author zehong
* @date 2025-12-03
*/
public interface IUploadMesResultHistoryService
{
/**
* 查询上传MES返回结果历史记录
*
* @param id 上传MES返回结果历史记录ID
* @return 上传MES返回结果历史记录
*/
public UploadMesResultHistory selectUploadMesResultHistoryById(Long id);
/**
* 查询上传MES返回结果历史记录列表
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 上传MES返回结果历史记录集合
*/
public List<UploadMesResultHistory> selectUploadMesResultHistoryList(UploadMesResultHistory uploadMesResultHistory);
/**
* 新增上传MES返回结果历史记录
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 结果
*/
public int insertUploadMesResultHistory(UploadMesResultHistory uploadMesResultHistory);
/**
* 修改上传MES返回结果历史记录
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 结果
*/
public int updateUploadMesResultHistory(UploadMesResultHistory uploadMesResultHistory);
/**
* 批量删除上传MES返回结果历史记录
*
* @param ids 需要删除的上传MES返回结果历史记录ID
* @return 结果
*/
public int deleteUploadMesResultHistoryByIds(Long[] ids);
/**
* 删除上传MES返回结果历史记录信息
*
* @param id 上传MES返回结果历史记录ID
* @return 结果
*/
public int deleteUploadMesResultHistoryById(Long id);
}
package com.zehong.system.service.impl;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.UploadMesResultHistoryMapper;
import com.zehong.system.domain.UploadMesResultHistory;
import com.zehong.system.service.IUploadMesResultHistoryService;
import javax.annotation.Resource;
/**
* 上传MES返回结果历史记录Service业务层处理
*
* @author zehong
* @date 2025-12-03
*/
@Service
public class UploadMesResultHistoryServiceImpl implements IUploadMesResultHistoryService
{
@Resource
private UploadMesResultHistoryMapper uploadMesResultHistoryMapper;
/**
* 查询上传MES返回结果历史记录
*
* @param id 上传MES返回结果历史记录ID
* @return 上传MES返回结果历史记录
*/
@Override
public UploadMesResultHistory selectUploadMesResultHistoryById(Long id)
{
return uploadMesResultHistoryMapper.selectUploadMesResultHistoryById(id);
}
/**
* 查询上传MES返回结果历史记录列表
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 上传MES返回结果历史记录
*/
@Override
public List<UploadMesResultHistory> selectUploadMesResultHistoryList(UploadMesResultHistory uploadMesResultHistory)
{
return uploadMesResultHistoryMapper.selectUploadMesResultHistoryList(uploadMesResultHistory);
}
/**
* 新增上传MES返回结果历史记录
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 结果
*/
@Override
public int insertUploadMesResultHistory(UploadMesResultHistory uploadMesResultHistory)
{
uploadMesResultHistory.setCreateTime(DateUtils.getNowDate());
return uploadMesResultHistoryMapper.insertUploadMesResultHistory(uploadMesResultHistory);
}
/**
* 修改上传MES返回结果历史记录
*
* @param uploadMesResultHistory 上传MES返回结果历史记录
* @return 结果
*/
@Override
public int updateUploadMesResultHistory(UploadMesResultHistory uploadMesResultHistory)
{
return uploadMesResultHistoryMapper.updateUploadMesResultHistory(uploadMesResultHistory);
}
/**
* 批量删除上传MES返回结果历史记录
*
* @param ids 需要删除的上传MES返回结果历史记录ID
* @return 结果
*/
@Override
public int deleteUploadMesResultHistoryByIds(Long[] ids)
{
return uploadMesResultHistoryMapper.deleteUploadMesResultHistoryByIds(ids);
}
/**
* 删除上传MES返回结果历史记录信息
*
* @param id 上传MES返回结果历史记录ID
* @return 结果
*/
@Override
public int deleteUploadMesResultHistoryById(Long id)
{
return uploadMesResultHistoryMapper.deleteUploadMesResultHistoryById(id);
}
}
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.UploadMesResultHistoryMapper">
<resultMap type="UploadMesResultHistory" id="UploadMesResultHistoryResult">
<result property="id" column="f_id" />
<result property="createTime" column="f_create_time" />
<result property="message" column="f_message" />
</resultMap>
<sql id="selectUploadMesResultHistoryVo">
select f_id, f_create_time, f_message from t_upload_mes_result_history
</sql>
<select id="selectUploadMesResultHistoryList" parameterType="UploadMesResultHistory" resultMap="UploadMesResultHistoryResult">
<include refid="selectUploadMesResultHistoryVo"/>
<where>
<if test="createTime != null "> and f_create_time = #{createTime}</if>
<if test="message != null and message != ''"> and f_message = #{message}</if>
</where>
</select>
<select id="selectUploadMesResultHistoryById" parameterType="Long" resultMap="UploadMesResultHistoryResult">
<include refid="selectUploadMesResultHistoryVo"/>
where f_id = #{id}
</select>
<insert id="insertUploadMesResultHistory" parameterType="UploadMesResultHistory" useGeneratedKeys="true" keyProperty="id">
insert into t_upload_mes_result_history
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="createTime != null">f_create_time,</if>
<if test="message != null">f_message,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="createTime != null">#{createTime},</if>
<if test="message != null">#{message},</if>
</trim>
</insert>
<update id="updateUploadMesResultHistory" parameterType="UploadMesResultHistory">
update t_upload_mes_result_history
<trim prefix="SET" suffixOverrides=",">
<if test="createTime != null">f_create_time = #{createTime},</if>
<if test="message != null">f_message = #{message},</if>
</trim>
where f_id = #{id}
</update>
<delete id="deleteUploadMesResultHistoryById" parameterType="Long">
delete from t_upload_mes_result_history where f_id = #{id}
</delete>
<delete id="deleteUploadMesResultHistoryByIds" parameterType="String">
delete from t_upload_mes_result_history where f_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
import request from '@/utils/request'
// 查询上传MES返回结果历史记录列表
export function listHistory(query) {
return request({
url: '/uploadMesResult/history/list',
method: 'get',
params: query
})
}
// 查询上传MES返回结果历史记录详细
export function getHistory(id) {
return request({
url: '/uploadMesResult/history/' + id,
method: 'get'
})
}
// 新增上传MES返回结果历史记录
export function addHistory(data) {
return request({
url: '/uploadMesResult/history',
method: 'post',
data: data
})
}
// 修改上传MES返回结果历史记录
export function updateHistory(data) {
return request({
url: '/uploadMesResult/history',
method: 'put',
data: data
})
}
// 删除上传MES返回结果历史记录
export function delHistory(id) {
return request({
url: '/uploadMesResult/history/' + id,
method: 'delete'
})
}
// 导出上传MES返回结果历史记录
export function exportHistory(query) {
return request({
url: '/uploadMesResult/history/export',
method: 'get',
params: query
})
}
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="创建时间" prop="createTime">
<el-date-picker clearable size="small"
v-model="queryParams.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="内容" align="center" prop="message" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>详情</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改上传MES返回结果历史记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="内容" prop="message">
<el-input v-model="form.message" type="textarea" rows="20" placeholder="请输入内容" />
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { listHistory, getHistory, delHistory, addHistory, updateHistory, exportHistory } from "@/api/uploadMesResult/history";
export default {
name: "History",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 上传MES返回结果历史记录表格数据
historyList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
createTime: null,
message: null
},
// 表单参数
form: {},
// 表单校验
rules: {
createTime: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询上传MES返回结果历史记录列表 */
getList() {
this.loading = true;
listHistory(this.queryParams).then(response => {
this.historyList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
createTime: null,
message: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加上传MES返回结果历史记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getHistory(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "上传MES返回结果历史详情";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateHistory(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addHistory(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除上传MES返回结果历史记录编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delHistory(ids);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有上传MES返回结果历史记录数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportHistory(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment