添加数据同步代码

This commit is contained in:
hzj
2024-01-09 16:04:35 +08:00
parent 82fba66226
commit 4702c266a4
10 changed files with 74311 additions and 6 deletions

View File

@@ -21,4 +21,6 @@ public interface JobDetailService extends IMppService<JobDetail> {
JobDetail select(JobDetail jobDetail);
IPage<JobDetail> selectByParam(JobQueryParam jobQueryParam);
}
boolean jobRemove(JobDetail jobDetail);
}

View File

@@ -49,10 +49,21 @@ public class JobDetailServiceImpl extends MppServiceImpl<JobDetailMapper, JobDet
Integer integer = this.getBaseMapper().selectCount(queryWrapper);
List<JobDetail> jobDetailIPage = this.getBaseMapper().query(jobQueryParam);
jobDetailIPage.stream().forEach(temp->temp.setTableName_CN(ServiceTypeEnum.getValueByCode(temp.getTableName())));
page.setRecords(jobDetailIPage);
page.setTotal(Long.parseLong(integer+""));
return page;
}
@Override
public boolean jobRemove(JobDetail jobDetail) {
QueryWrapper<JobDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(JobDetail::getTableName,jobDetail.getTableName()).
eq(JobDetail::getStartTime,jobDetail.getStartTime()).
eq(JobDetail::getEndTime,jobDetail.getEndTime());
boolean remove = this.remove(queryWrapper);
return remove;
}
}

View File

@@ -15,10 +15,8 @@ import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import java.time.LocalDate;
import java.time.LocalDateTime;

View File

@@ -45,7 +45,7 @@ public class JobDetailController {
@ApiOperation("任务移除")
@ApiImplicitParam(name = "jobQueryParam", value = "任务移除参数", required = true)
public boolean jobRemove(@RequestBody JobDetail jobDetail){
boolean b = jobDetailService.deleteByMultiId(jobDetail);
boolean b = jobDetailService.jobRemove(jobDetail);
return b;
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,300 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>迁移</title>
<link rel="stylesheet" href="./element.css" />
<script src="./vue.js"></script>
<script src="./element.js"></script>
<script src="./locale.js"></script>
</head>
<body>
<div id="app" >
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="时间区间">
<el-date-picker
v-model="formInline.date"
type="daterange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
:size="size"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item label="数据指标">
<el-select
v-model="formInline.tableNames"
placeholder="请选择指标"
clearable
multiple
collapse-tags
style="width: 240px"
>
<el-option label="电压闪变数据表" value="DataFlicker"></el-option>
<el-option label="电压波动数据表" value="DataFluc"></el-option>
<el-option label="谐波电流角度数据表" value="DataHarmphasicI"></el-option>
<el-option label="谐波电压角度数据表" value="DataHarmphasicV"></el-option>
<el-option label="有功功率数据表" value="DataHarmpowerP"></el-option>
<el-option label="无功功率数据表" value="DataHarmpowerQ"></el-option>
<el-option label="视在功率数据表" value="DataHarmpowerS"></el-option>
<el-option label="谐波电流含有率数据表" value="DataHarmrateI"></el-option>
<el-option label="谐波电压含有率数据表" value="DataHarmrateV"></el-option>
<el-option label="电流简谐波幅值数据表" value="DataInharmI"></el-option>
<el-option label="电压间谐波幅值数据表" value="DataInharmV"></el-option>
<el-option label="谐波电流幅值数据表" value="DataI"></el-option>
<el-option label="长时闪变数据表" value="DataPlt"></el-option>
<el-option label="谐波电压幅值数据表" value="DataV"></el-option>
<el-option label="电压闪变日统计表" value="DayFlicker"></el-option>
<el-option label="电压波动日统计表" value="DayFluc"></el-option>
<el-option label="谐波电流角度日统计表" value="DayHarmphasicI"></el-option>
<el-option label="谐波电压角度日统计表" value="DayHarmphasicV"></el-option>
<el-option label="有功功率日统计表" value="DayHarmpowerP"></el-option>
<el-option label="无功功率日统计表" value="DayHarmpowerQ"></el-option>
<el-option label="视在功率日统计表" value="DayHarmpowerS"></el-option>
<el-option label="谐波电流含有率日统计表" value="DayHarmrateI"></el-option>
<el-option label="谐波电压含有率日统计表" value="DayHarmrateV"></el-option>
<el-option label="电流简谐波幅值日统计表" value="DayInharmI"></el-option>
<el-option label="电压间谐波幅值日统计表" value="DayInharmV"></el-option>
<el-option label="谐波电流幅值日统计表" value="DayI"></el-option>
<el-option label="长时闪变日统计表" value="DayPlt"></el-option>
<el-option label="谐波电压幅值日统计表" value="DayV"></el-option>
<el-option label="合格率统计表" value="LimitRate"></el-option>
<el-option label="合格率指标表" value="LimitTarget"></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据状态">
<el-select v-model="formInline.states" placeholder="请选择状态" clearable multiple collapse-tags>
<el-option label="执行中" value="0"></el-option>
<el-option label="成功" value="1"></el-option>
<el-option label="失败" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="query">查询</el-button>
<el-button type="primary" @click="move()">迁移</el-button>
</el-form-item>
</el-form>
<el-table :data="tableData" style="width: 100%; height: calc(100vh - 120px)" stripe align="center" v-loading="formInline.loading">
<el-table-column prop="tableName" label="指标名"></el-table-column>
<el-table-column prop="tableName_CN" label="表名"></el-table-column>
<el-table-column prop="startTime" label="日期(年月日)">
<template #default="scope"> {{scope.row.startTime&&scope.row.startTime.split(' ')[0]}} </template>
</el-table-column>
<el-table-column prop="rowCount" label="条目数"></el-table-column>
<el-table-column prop="updateTime" label="执行时间"></el-table-column>
<el-table-column prop="name" label="状态">
<template #default="scope">
<el-tag effect="dark" type="danger" v-if="scope.row.state === 2">失败</el-tag>
<el-tag effect="dark" type="primary" v-else-if="scope.row.state === 0">执行中</el-tag>
<el-tag effect="dark" type="success" v-else-if="scope.row.state === 1">成功</el-tag>
</template>
</el-table-column>
<el-table-column prop="name" label="操作">
<template #default="scope">
<el-popconfirm title="确定删除此条记录吗?" @confirm="jobRemove(scope.row)">
<template #reference>
<el-button type="danger" text v-if="scope.row.state === 1">删除</el-button>
</template>
</el-popconfirm>
<el-button type="primary" text v-if="scope.row.state === 2" @click="move(scope.row)">迁移</el-button>
</template>
</el-table-column>
</el-table>
<div style="padding-top: 10px; display: flex; justify-content: flex-end">
<el-pagination
background
layout="total,prev, pager, next"
:total="formInline.total"
:page-size="formInline.pageSize"
:current-page="formInline.currentPage"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
></el-pagination>
</div>
</div>
<script>
const { createApp, ref, reactive } = Vue
createApp({
setup() {
const tableData = ref([])
const message = ref('Hello Vue!')
// 格式化时间YYYY-MM-DD
const formatTime = (date) => {
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
return `${year}-${month}-${day}`
}
const formInline = reactive({
loading: true,
states: ['0', '1'],
tableNames: [
'DataFlicker',
'DataFluc',
'DataHarmphasicI',
'DataHarmphasicV',
'DataHarmpowerP',
'DataHarmpowerQ',
'DataHarmpowerS',
'DataHarmrateI',
'DataHarmrateV',
'DataInharmI',
'DataInharmV',
'DataI',
'DataPlt',
'DataV',
'DayFlicker',
'DayFluc',
'DayHarmphasicI',
'DayHarmphasicV',
'DayHarmpowerP',
'DayHarmpowerQ',
'DayHarmpowerS',
'DayHarmrateI',
'DayHarmrateV',
'DayInharmI',
'DayInharmV',
'DayI',
'DayPlt',
'DayV',
'LimitRate',
'LimitTarget',
],
date: [formatTime(new Date()), formatTime(new Date())],
total: 0,
currentPage: 1,
pageSize: 20,
})
const query = () => {
formInline.loading = true
console.log('submit!')
fetch('http://192.168.1.130:8091/jobDetail/jobQuery', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
states: formInline.states,
tableNames: formInline.tableNames,
startTime: formInline.date[0],
endTime: formInline.date[1],
currentPage: formInline.currentPage,
pageSize: formInline.pageSize,
}),
})
.then((res) => {
formInline.loading = false
return res.json()
})
.then((res) => {
console.log(res)
tableData.value = res.records
formInline.total = res.total
})
}
query()
const handleCurrentChange = (val) => {
formInline.currentPage = val
query()
}
const handleSizeChange = (val) => {
formInline.currentPage = 1
formInline.pageSize = val
query()
}
const move = (row) => {
let obj = {
tableNames: formInline.tableNames,
startTime: formInline.date[0],
endTime: formInline.date[1],
}
if (row) {
obj = {
tableNames: [row.tableName],
startTime: row.startTime.split(' ')[0],
endTime: row.startTime.split(' ')[0],
}
}
fetch('/data/dataSync', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(obj),
})
.then((res) => {
return res.json()
})
.then((res) => {
if (res) {
ElementPlus.ElMessage.success('数据迁移成功')
query()
} else {
ElementPlus.ElMessage.error('数据迁移失败')
}
})
}
const jobRemove = (row) => {
fetch('/jobDetail/jobRemove', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
tableName: row.tableName,
startTime: row.startTime,
endTime: row.endTime,
}),
})
.then((res) => {
return res.json()
})
.then((res) => {
if (res) {
ElementPlus.ElMessage.success('数据删除成功')
query()
} else {
ElementPlus.ElMessage.error('数据删除失败')
}
})
}
return {
message,
formInline,
query,
tableData,
handleCurrentChange,
handleSizeChange,
move,
jobRemove,
}
},
})
.use(ElementPlus, {
locale: ElementPlusLocaleZhCn,
})
.mount('#app')
</script>
</body>
<style>
* {
margin: 0;
padding: 0;
}
#app {
padding: 10px;
}
</style>
</html>

View File

@@ -0,0 +1,140 @@
/*! Element Plus v2.4.4 */
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.ElementPlusLocaleZhCn = factory());
})(this, (function () { 'use strict';
var zhCn = {
name: "zh-cn",
el: {
colorpicker: {
confirm: "\u786E\u5B9A",
clear: "\u6E05\u7A7A"
},
datepicker: {
now: "\u6B64\u523B",
today: "\u4ECA\u5929",
cancel: "\u53D6\u6D88",
clear: "\u6E05\u7A7A",
confirm: "\u786E\u5B9A",
selectDate: "\u9009\u62E9\u65E5\u671F",
selectTime: "\u9009\u62E9\u65F6\u95F4",
startDate: "\u5F00\u59CB\u65E5\u671F",
startTime: "\u5F00\u59CB\u65F6\u95F4",
endDate: "\u7ED3\u675F\u65E5\u671F",
endTime: "\u7ED3\u675F\u65F6\u95F4",
prevYear: "\u524D\u4E00\u5E74",
nextYear: "\u540E\u4E00\u5E74",
prevMonth: "\u4E0A\u4E2A\u6708",
nextMonth: "\u4E0B\u4E2A\u6708",
year: "\u5E74",
month1: "1 \u6708",
month2: "2 \u6708",
month3: "3 \u6708",
month4: "4 \u6708",
month5: "5 \u6708",
month6: "6 \u6708",
month7: "7 \u6708",
month8: "8 \u6708",
month9: "9 \u6708",
month10: "10 \u6708",
month11: "11 \u6708",
month12: "12 \u6708",
weeks: {
sun: "\u65E5",
mon: "\u4E00",
tue: "\u4E8C",
wed: "\u4E09",
thu: "\u56DB",
fri: "\u4E94",
sat: "\u516D"
},
months: {
jan: "\u4E00\u6708",
feb: "\u4E8C\u6708",
mar: "\u4E09\u6708",
apr: "\u56DB\u6708",
may: "\u4E94\u6708",
jun: "\u516D\u6708",
jul: "\u4E03\u6708",
aug: "\u516B\u6708",
sep: "\u4E5D\u6708",
oct: "\u5341\u6708",
nov: "\u5341\u4E00\u6708",
dec: "\u5341\u4E8C\u6708"
}
},
select: {
loading: "\u52A0\u8F7D\u4E2D",
noMatch: "\u65E0\u5339\u914D\u6570\u636E",
noData: "\u65E0\u6570\u636E",
placeholder: "\u8BF7\u9009\u62E9"
},
cascader: {
noMatch: "\u65E0\u5339\u914D\u6570\u636E",
loading: "\u52A0\u8F7D\u4E2D",
placeholder: "\u8BF7\u9009\u62E9",
noData: "\u6682\u65E0\u6570\u636E"
},
pagination: {
goto: "\u524D\u5F80",
pagesize: "\u6761/\u9875",
total: "\u5171 {total} \u6761",
pageClassifier: "\u9875",
page: "\u9875",
prev: "\u4E0A\u4E00\u9875",
next: "\u4E0B\u4E00\u9875",
currentPage: "\u7B2C {pager} \u9875",
prevPages: "\u5411\u524D {pager} \u9875",
nextPages: "\u5411\u540E {pager} \u9875",
deprecationWarning: "\u4F60\u4F7F\u7528\u4E86\u4E00\u4E9B\u5DF2\u88AB\u5E9F\u5F03\u7684\u7528\u6CD5\uFF0C\u8BF7\u53C2\u8003 el-pagination \u7684\u5B98\u65B9\u6587\u6863"
},
messagebox: {
title: "\u63D0\u793A",
confirm: "\u786E\u5B9A",
cancel: "\u53D6\u6D88",
error: "\u8F93\u5165\u7684\u6570\u636E\u4E0D\u5408\u6CD5!"
},
upload: {
deleteTip: "\u6309 delete \u952E\u53EF\u5220\u9664",
delete: "\u5220\u9664",
preview: "\u67E5\u770B\u56FE\u7247",
continue: "\u7EE7\u7EED\u4E0A\u4F20"
},
table: {
emptyText: "\u6682\u65E0\u6570\u636E",
confirmFilter: "\u7B5B\u9009",
resetFilter: "\u91CD\u7F6E",
clearFilter: "\u5168\u90E8",
sumText: "\u5408\u8BA1"
},
tree: {
emptyText: "\u6682\u65E0\u6570\u636E"
},
transfer: {
noMatch: "\u65E0\u5339\u914D\u6570\u636E",
noData: "\u65E0\u6570\u636E",
titles: ["\u5217\u8868 1", "\u5217\u8868 2"],
filterPlaceholder: "\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",
noCheckedFormat: "\u5171 {total} \u9879",
hasCheckedFormat: "\u5DF2\u9009 {checked}/{total} \u9879"
},
image: {
error: "\u52A0\u8F7D\u5931\u8D25"
},
pageHeader: {
title: "\u8FD4\u56DE"
},
popconfirm: {
confirmButtonText: "\u786E\u5B9A",
cancelButtonText: "\u53D6\u6D88"
}
}
};
return zhCn;
}));
已禁用缩放

View File

@@ -0,0 +1,34 @@
{
"DataFlicker": "电压闪变数据表",
"DataFluc": "电压波动数据表",
"DataHarmphasicI": "谐波电流角度数据表",
"DataHarmphasicV": "谐波电压角度数据表",
"DataHarmpowerP": "有功功率数据表",
"DataHarmpowerQ": "无功功率数据表",
"DataHarmpowerS": "视在功率数据表",
"DataHarmrateI": "谐波电流含有率数据表",
"DataHarmrateV": "谐波电压含有率数据表",
"DataInharmI": "电流简谐波幅值数据表",
"DataInharmV": "电压间谐波幅值数据表",
"DataI": "谐波电流幅值数据表",
"DataPlt": "长时闪变数据表",
"DataV": "谐波电压幅值数据表",
"DayFlicker": "电压闪变日统计表",
"DayFluc": "电压波动日统计表",
"DayHarmphasicI": "谐波电流角度日统计表",
"DayHarmphasicV": "谐波电压角度日统计表",
"DayHarmpowerP": "有功功率日统计表",
"DayHarmpowerQ": "无功功率日统计表",
"DayHarmpowerS": "视在功率日统计表",
"DayHarmrateI": "谐波电流含有率日统计表",
"DayHarmrateV": "谐波电压含有率日统计表",
"DayInharmI": "电流简谐波幅值日统计表",
"DayInharmV": "电压间谐波幅值日统计表",
"DayI": "谐波电流幅值日统计表",
"DayPlt": "长时闪变日统计表",
"DayV": "谐波电压幅值日统计表",
"LimitRate": "合格率统计表",
"LimitTarget": "合格率指标表"
}
<el-option label="电压闪变数据表" value="DataFlicker" />

File diff suppressed because it is too large Load Diff