Lxy
/
RuoYi-Vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 导入数据接口及界面全部调通

Browse Source
dev_refactor_0120_qoder
Lxy 4 months ago
parent e66777aa00
commit ef0bc92c61
4 changed files with 152 additions and 13 deletions
Show Stats Download Patch File Download Diff File

30
newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/StockDataController.java
Unescape View File

@ -356,6 +356,36 @@ public class StockDataController extends BaseController
return getDataTable(list);
}
/**
* 导入个股新高新低状态数据
*
* @param file Excel文件
* @param updateSupport 是否支持更新已存在数据
* @param tradeDate 交易日期（格式：yyyy-MM-dd）
*/
@Log(title = "个股新高新低状态数据导入", businessType = BusinessType.IMPORT)
@PostMapping("/stockHighLow/importData")
public AjaxResult importStockHighLowStatus(MultipartFile file, boolean updateSupport, String tradeDate)
{
Date tradeDateValue = parseTradeDate(tradeDate);
if (tradeDateValue == null)
{
return AjaxResult.error("交易日期格式错误，请使用yyyy-MM-dd格式");
}
ExcelUtil<TStockHighLowStatus> util = new ExcelUtil<TStockHighLowStatus>(TStockHighLowStatus.class);
try
{
List<TStockHighLowStatus> stockHighLowStatusList = util.importExcel(file.getInputStream());
int successNum = stockHighLowStatusService.importStockHighLowStatus(stockHighLowStatusList, tradeDateValue);
return AjaxResult.success("成功导入 " + successNum + " 条个股新高新低状态数据");
}
catch (Exception e)
{
return AjaxResult.error("导入失败：" + e.getMessage());
}
}
// ========================= 工具方法 =========================
/**

8
newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockHighLowStatus.java
Unescape View File

@ -27,21 +27,21 @@ public class TStockHighLowStatus extends BaseEntity
private Date tradeDate;
/** 是否创阶段新高（1=是，0=否） */
@Excel(name = "是否新高", readConverterExp = "1=是,0=否")
@Excel(name = "近期创阶段新高", readConverterExp = "1=是,0=否")
private Integer isNewHigh;
/** 区间最高价日（创新高时填充） */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "新高日期", dateFormat = "yyyy-MM-dd")
@Excel(name = "区间最高价日", dateFormat = "yyyy-MM-dd")
private Date newHighDate;
/** 是否创阶段新低（1=是，0=否） */
@Excel(name = "是否新低", readConverterExp = "1=是,0=否")
@Excel(name = "近期创阶段新低", readConverterExp = "1=是,0=否")
private Integer isNewLow;
/** 区间最低价日（创新低时填充） */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "新低日期", dateFormat = "yyyy-MM-dd")
@Excel(name = "区间最低价日", dateFormat = "yyyy-MM-dd")
private Date newLowDate;
/** 证券名称（查询时关联获取） */

11
ruoyi-ui/src/api/newstocksystem/stockdata.js
Unescape View File

@ -186,6 +186,14 @@ export default {
method: 'get',
params: query
})
},
// 导入个股新高新低状态数据
importStockHighLowStatus(data) {
return request({
url: '/newstocksystem/stockdata/stockHighLow/importData',
method: 'post',
data: data
})
}
}
@ -193,5 +201,6 @@ export default {
export const IMPORT_URLS = {
industryIndex: '/newstocksystem/stockdata/industryIndex/importData',
stockBasic: '/newstocksystem/stockdata/stockBasic/importData',
stockDailyTrade: '/newstocksystem/stockdata/stockDailyTrade/importData'
stockDailyTrade: '/newstocksystem/stockdata/stockDailyTrade/importData',
stockHighLow: '/newstocksystem/stockdata/stockHighLow/importData'
}

116
ruoyi-ui/src/views/newstocksystem/stockdata.vue
Unescape View File

@ -12,13 +12,13 @@
</el-button>
</el-col>
<el-col :span="8">
<el-button type="success" icon="el-icon-upload2" @click="handleImport('stockBasic')">
导入个股基础信息
<el-button type="warning" icon="el-icon-upload2" @click="handleImport('stockDailyTrade')">
导入每日交易数据
</el-button>
</el-col>
<el-col :span="8">
<el-button type="warning" icon="el-icon-upload2" @click="handleImport('stockDailyTrade')">
导入每日交易数据
<el-button type="success" icon="el-icon-upload2" @click="handleImport('stockHighLow')">
导入新高新低数据
</el-button>
</el-col>
</el-row>
@ -181,6 +181,52 @@
<pagination v-show="industryIndexTotal > 0" :total="industryIndexTotal" :page.sync="industryIndexQuery.pageNum" :limit.sync="industryIndexQuery.pageSize" @pagination="getIndustryIndexList" />
</el-tab-pane>
<!-- 新高新低数据 Tab -->
<el-tab-pane label="新高新低数据" name="stockHighLow">
<el-form :model="stockHighLowQuery" ref="stockHighLowForm" size="small" :inline="true" label-width="80px">
<el-form-item label="证券代码" prop="stockCode">
<el-input v-model="stockHighLowQuery.stockCode" placeholder="请输入证券代码" clearable @keyup.enter.native="queryStockHighLow" />
</el-form-item>
<el-form-item label="证券名称" prop="stockName">
<el-input v-model="stockHighLowQuery.stockName" placeholder="请输入证券名称" clearable @keyup.enter.native="queryStockHighLow" />
</el-form-item>
<el-form-item label="交易日期" prop="tradeDate">
<el-date-picker v-model="stockHighLowQuery.tradeDate" type="date" value-format="yyyy-MM-dd" placeholder="选择交易日期" clearable />
</el-form-item>
<el-form-item label="创新高" prop="isNewHigh">
<el-select v-model="stockHighLowQuery.isNewHigh" placeholder="请选择" clearable>
<el-option label="是" :value="1" />
<el-option label="否" :value="0" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="queryStockHighLow">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetStockHighLowQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="stockHighLowLoading" :data="stockHighLowList" border fit highlight-current-row>
<el-table-column label="证券代码" align="center" prop="stockCode" width="130" />
<el-table-column label="证券名称" align="center" prop="stockName" width="120" />
<el-table-column label="交易日期" align="center" prop="tradeDate" width="120" />
<el-table-column label="创新高" align="center" prop="isNewHigh" width="90">
<template slot-scope="scope">
<el-tag v-if="scope.row.isNewHigh === 1" type="success" size="mini">是</el-tag>
<el-tag v-else type="info" size="mini">否</el-tag>
</template>
</el-table-column>
<el-table-column label="创新低" align="center" prop="isNewLow" width="90">
<template slot-scope="scope">
<el-tag v-if="scope.row.isNewLow === 1" type="warning" size="mini">是</el-tag>
<el-tag v-else type="info" size="mini">否</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="160" />
</el-table>
<pagination v-show="stockHighLowTotal > 0" :total="stockHighLowTotal" :page.sync="stockHighLowQuery.pageNum" :limit.sync="stockHighLowQuery.pageSize" @pagination="getStockHighLowList" />
</el-tab-pane>
</el-tabs>
<!-- 导入对话框 -->
@ -278,6 +324,19 @@ export default {
tradeDate: null
},
// ========================= 新高新低数据 =========================
stockHighLowLoading: false,
stockHighLowList: [],
stockHighLowTotal: 0,
stockHighLowQuery: {
pageNum: 1,
pageSize: 10,
stockCode: null,
stockName: null,
tradeDate: null,
isNewHigh: null
},
// ========================= 上传相关 =========================
upload: {
open: false,
@ -301,7 +360,7 @@ export default {
},
methods: {
// ========================= 通用方法 =========================
/** 获取行业选项列表 */
getIndustryOptions() {
stockdataApi.getDistinctIndustryIndexList().then(response => {
@ -317,6 +376,8 @@ export default {
this.getStockBasicList()
} else if (tab.name === 'industryIndex' && this.industryIndexList.length === 0) {
this.getIndustryIndexList()
} else if (tab.name === 'stockHighLow' && this.stockHighLowList.length === 0) {
this.getStockHighLowList()
}
},
@ -409,6 +470,40 @@ export default {
this.getStockBasicList()
},
// ========================= 新高新低数据方法 =========================
/** 获取新高新低数据列表 */
getStockHighLowList() {
this.stockHighLowLoading = true
stockdataApi.listStockHighLowStatusWithBasic(this.stockHighLowQuery).then(response => {
this.stockHighLowList = response.rows
this.stockHighLowTotal = response.total
this.stockHighLowLoading = false
}).catch(() => {
this.stockHighLowLoading = false
})
},
/** 查询新高新低数据 */
queryStockHighLow() {
this.stockHighLowQuery.pageNum = 1
this.getStockHighLowList()
},
/** 重置新高新低数据查询 */
resetStockHighLowQuery() {
this.$refs.stockHighLowForm.resetFields()
this.stockHighLowQuery = {
pageNum: 1,
pageSize: 10,
stockCode: null,
stockName: null,
tradeDate: null,
isNewHigh: null
}
this.getStockHighLowList()
},
// ========================= 行业指数数据方法 =========================
/** 获取行业指数数据列表 */
@ -451,7 +546,7 @@ export default {
this.upload.updateSupport = false
this.upload.tradeDate = null
this.fileList = []
if (type === 'industryIndex') {
this.upload.title = '导入行业指数数据'
this.upload.url = IMPORT_URLS.industryIndex
@ -461,6 +556,9 @@ export default {
} else if (type === 'stockDailyTrade') {
this.upload.title = '导入每日交易数据'
this.upload.url = IMPORT_URLS.stockDailyTrade
} else if (type === 'stockHighLow') {
this.upload.title = '导入新高新低数据'
this.upload.url = IMPORT_URLS.stockHighLow
}
// 清除已选文件
@ -482,8 +580,8 @@ export default {
this.$message.error('请选择要上传的文件')
return
}
if (this.upload.type !== 'stockBasic' && !this.upload.tradeDate) {
if (['industryIndex', 'stockDailyTrade', 'stockHighLow'].includes(this.upload.type) && !this.upload.tradeDate) {
this.$message.error('请选择交易日期')
return
}
@ -533,6 +631,8 @@ export default {
this.getStockBasicList()
} else if (this.upload.type === 'stockDailyTrade') {
this.getDailyTradeList()
} else if (this.upload.type === 'stockHighLow') {
this.getStockHighLowList()
}
}
}

Write Preview
Loading…
Cancel
Save