feat: 移除stock的上市状态,默认库里的股票都是上市的
This commit is contained in:
@@ -104,12 +104,6 @@ public class CommonOptionsController {
|
|||||||
.map(industry -> new Option(industry, industry))
|
.map(industry -> new Option(industry, industry))
|
||||||
.toList()
|
.toList()
|
||||||
);
|
);
|
||||||
case "stock_listed" -> GlobalResponse.responseSuccess(
|
|
||||||
List.of(
|
|
||||||
new Option("已上市", true),
|
|
||||||
new Option("已退市", false)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
case "task_template_id" -> GlobalResponse.responseSuccess(
|
case "task_template_id" -> GlobalResponse.responseSuccess(
|
||||||
taskTemplateService.list()
|
taskTemplateService.list()
|
||||||
.stream()
|
.stream()
|
||||||
@@ -129,13 +123,6 @@ public class CommonOptionsController {
|
|||||||
.toList(),
|
.toList(),
|
||||||
field
|
field
|
||||||
));
|
));
|
||||||
case "stock_listed" -> GlobalResponse.responseSuccess(buildMapping(
|
|
||||||
List.of(
|
|
||||||
new Mapping("true", "已上市"),
|
|
||||||
new Mapping("false", "已退市")
|
|
||||||
),
|
|
||||||
field
|
|
||||||
));
|
|
||||||
case "task_status" -> GlobalResponse.responseSuccess(buildMapping(
|
case "task_status" -> GlobalResponse.responseSuccess(buildMapping(
|
||||||
Arrays.stream(Task.Status.values())
|
Arrays.stream(Task.Status.values())
|
||||||
.map(status -> new Mapping(status.name(), status.getChineseName()))
|
.map(status -> new Mapping(status.name(), status.getChineseName()))
|
||||||
|
|||||||
@@ -36,8 +36,7 @@ public class StockController extends SimpleControllerSupport<Stock, Void, StockC
|
|||||||
stock.getName(),
|
stock.getName(),
|
||||||
stock.getFullname(),
|
stock.getFullname(),
|
||||||
stock.getMarket(),
|
stock.getMarket(),
|
||||||
stock.getIndustry(),
|
stock.getIndustry()
|
||||||
stock.isListed()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,8 +56,7 @@ public class StockController extends SimpleControllerSupport<Stock, Void, StockC
|
|||||||
String name,
|
String name,
|
||||||
String fullname,
|
String fullname,
|
||||||
Stock.Market market,
|
Stock.Market market,
|
||||||
String industry,
|
String industry
|
||||||
Boolean listed
|
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,15 @@ package com.lanyuanxiaoyao.leopard.server.entity;
|
|||||||
import com.lanyuanxiaoyao.leopard.server.Constants;
|
import com.lanyuanxiaoyao.leopard.server.Constants;
|
||||||
import com.lanyuanxiaoyao.leopard.server.entity.base.SimpleEnum;
|
import com.lanyuanxiaoyao.leopard.server.entity.base.SimpleEnum;
|
||||||
import com.lanyuanxiaoyao.service.template.entity.SimpleEntity;
|
import com.lanyuanxiaoyao.service.template.entity.SimpleEntity;
|
||||||
|
import jakarta.persistence.CascadeType;
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
import jakarta.persistence.EntityListeners;
|
import jakarta.persistence.EntityListeners;
|
||||||
import jakarta.persistence.EnumType;
|
import jakarta.persistence.EnumType;
|
||||||
import jakarta.persistence.Enumerated;
|
import jakarta.persistence.Enumerated;
|
||||||
|
import jakarta.persistence.OneToMany;
|
||||||
import jakarta.persistence.Table;
|
import jakarta.persistence.Table;
|
||||||
|
import java.util.Set;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
@@ -52,9 +55,10 @@ public class Stock extends SimpleEntity {
|
|||||||
private Market market;
|
private Market market;
|
||||||
@Comment("行业")
|
@Comment("行业")
|
||||||
private String industry;
|
private String industry;
|
||||||
@Column(nullable = false)
|
|
||||||
@Comment("上市状态")
|
@OneToMany(mappedBy = "stock", cascade = CascadeType.REMOVE)
|
||||||
private boolean listed = true;
|
@ToString.Exclude
|
||||||
|
private Set<Daily> dailies;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ function StockList() {
|
|||||||
inside: {
|
inside: {
|
||||||
market: '${filter_market|default:undefined}',
|
market: '${filter_market|default:undefined}',
|
||||||
industry: '${filter_industry|default:undefined}',
|
industry: '${filter_industry|default:undefined}',
|
||||||
listed: '${filter_listed|default:true|asArray}',
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
page: {
|
page: {
|
||||||
@@ -95,16 +94,6 @@ function StockList() {
|
|||||||
checkAll: true,
|
checkAll: true,
|
||||||
checkAllBySearch: true,
|
checkAllBySearch: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: 'filter_listed',
|
|
||||||
label: '状态',
|
|
||||||
...remoteOptions('select', 'stock_listed'),
|
|
||||||
multiple: true,
|
|
||||||
extractValue: true,
|
|
||||||
joinValues: false,
|
|
||||||
clearable: true,
|
|
||||||
checkAll: true,
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
columns: [
|
columns: [
|
||||||
@@ -122,13 +111,6 @@ function StockList() {
|
|||||||
name: 'fullname',
|
name: 'fullname',
|
||||||
label: '全名',
|
label: '全名',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: 'listed',
|
|
||||||
label: '状态',
|
|
||||||
width: 100,
|
|
||||||
align: 'center',
|
|
||||||
...remoteMappings('stock_listed', 'listed'),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: 'market',
|
name: 'market',
|
||||||
label: '市场',
|
label: '市场',
|
||||||
|
|||||||
Reference in New Issue
Block a user