1
0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00

Fix MetadataRepository related class

This commit is contained in:
dengchao@xgtl 2020-04-17 09:38:05 +08:00
parent dd02157fad
commit 04cab0db80

View File

@ -89,12 +89,13 @@ public class MetadataController extends Handler {
@RequestMapping("/update") @RequestMapping("/update")
@Menu(type = "admin", subtype = "metadata", admin = true) @Menu(type = "admin", subtype = "metadata", admin = true)
public ModelAndView update(@Valid MetadataTable metadata) { public ModelAndView update(@Valid MetadataTable metadata) {
MetadataTable table = metadataRes.findById(metadata.getId()); metadataRes.findById(metadata.getId()).ifPresent(table -> {
table.setName(metadata.getName()); table.setName(metadata.getName());
table.setFromdb(metadata.isFromdb()); table.setFromdb(metadata.isFromdb());
table.setListblocktemplet(metadata.getListblocktemplet()); table.setListblocktemplet(metadata.getListblocktemplet());
table.setPreviewtemplet(metadata.getPreviewtemplet()); table.setPreviewtemplet(metadata.getPreviewtemplet());
metadataRes.save(table); metadataRes.save(table);
});
return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html")); return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html"));
} }
@ -137,8 +138,7 @@ public class MetadataController extends Handler {
@RequestMapping("/delete") @RequestMapping("/delete")
@Menu(type = "admin", subtype = "metadata", admin = true) @Menu(type = "admin", subtype = "metadata", admin = true)
public ModelAndView delete(@Valid String id) { public ModelAndView delete(@Valid String id) {
MetadataTable table = metadataRes.findById(id); metadataRes.deleteById(id);
metadataRes.delete(table);
return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html")); return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html"));
} }
@ -269,19 +269,26 @@ public class MetadataController extends Handler {
@RequestMapping("/clean") @RequestMapping("/clean")
@Menu(type = "admin", subtype = "metadata", admin = true) @Menu(type = "admin", subtype = "metadata", admin = true)
public ModelAndView clean(@Valid String id) throws BeansException, ClassNotFoundException { public ModelAndView clean(@Valid String id) throws BeansException {
if (!StringUtils.isBlank(id)) { if (!StringUtils.isBlank(id)) {
MetadataTable table = metadataRes.findById(id); metadataRes.findById(id).ifPresent(table -> {
if (table.isFromdb() && !StringUtils.isBlank(table.getListblocktemplet())) { if (!table.isFromdb() || StringUtils.isBlank(table.getListblocktemplet())) {
return;
}
SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet()); SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet());
if (dic != null) { if (dic == null) {
return;
}
try {
Object bean = MainContext.getContext().getBean(Class.forName(dic.getCode())); Object bean = MainContext.getContext().getBean(Class.forName(dic.getCode()));
if (bean instanceof ElasticsearchRepository) { if (bean instanceof ElasticsearchRepository) {
ElasticsearchRepository<?, ?> jpa = (ElasticsearchRepository<?, ?>) bean; ElasticsearchRepository<?, ?> jpa = (ElasticsearchRepository<?, ?>) bean;
jpa.deleteAll(); jpa.deleteAll();
} }
} catch (ClassNotFoundException e) {
e.printStackTrace();
} }
} });
} }
return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html")); return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html"));
} }
@ -289,13 +296,17 @@ public class MetadataController extends Handler {
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
@RequestMapping("/synctoes") @RequestMapping("/synctoes")
@Menu(type = "admin", subtype = "metadata", admin = true) @Menu(type = "admin", subtype = "metadata", admin = true)
public ModelAndView synctoes(@Valid String id) throws BeansException, ClassNotFoundException { public ModelAndView synctoes(@Valid String id) throws BeansException {
if (!StringUtils.isBlank(id)) { if (!StringUtils.isBlank(id)) {
MetadataTable table = metadataRes.findById(id); metadataRes.findById(id).ifPresent(table -> {
if (table.isFromdb() && !StringUtils.isBlank(table.getListblocktemplet())) { if (!table.isFromdb() || StringUtils.isBlank(table.getListblocktemplet())) {
return;
}
SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet()); SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet());
if (dic == null) {
if (dic != null) { return;
}
try {
Object bean = MainContext.getContext().getBean(Class.forName(dic.getCode())); Object bean = MainContext.getContext().getBean(Class.forName(dic.getCode()));
if (bean instanceof ElasticsearchRepository) { if (bean instanceof ElasticsearchRepository) {
ElasticsearchRepository jpa = (ElasticsearchRepository) bean; ElasticsearchRepository jpa = (ElasticsearchRepository) bean;
@ -309,8 +320,10 @@ public class MetadataController extends Handler {
} }
} }
} }
} catch (ClassNotFoundException e) {
e.printStackTrace();
} }
} });
} }
return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html")); return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html"));
} }
@ -318,13 +331,17 @@ public class MetadataController extends Handler {
@SuppressWarnings({"rawtypes"}) @SuppressWarnings({"rawtypes"})
@RequestMapping("/synctodb") @RequestMapping("/synctodb")
@Menu(type = "admin", subtype = "metadata", admin = true) @Menu(type = "admin", subtype = "metadata", admin = true)
public ModelAndView synctodb(@Valid String id) throws BeansException, ClassNotFoundException { public ModelAndView synctodb(@Valid String id) throws BeansException {
if (!StringUtils.isBlank(id)) { if (!StringUtils.isBlank(id)) {
MetadataTable table = metadataRes.findById(id); metadataRes.findById(id).ifPresent(table -> {
if (table.isFromdb() && !StringUtils.isBlank(table.getListblocktemplet())) { if (!table.isFromdb() || StringUtils.isBlank(table.getListblocktemplet())) {
return;
}
SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet()); SysDic dic = Dict.getInstance().getDicItem(table.getListblocktemplet());
if (dic == null) {
if (dic != null) { return;
}
try {
Object bean = MainContext.getContext().getBean(Class.forName(dic.getCode())); Object bean = MainContext.getContext().getBean(Class.forName(dic.getCode()));
if (bean instanceof ElasticsearchRepository) { if (bean instanceof ElasticsearchRepository) {
ElasticsearchRepository jpa = (ElasticsearchRepository) bean; ElasticsearchRepository jpa = (ElasticsearchRepository) bean;
@ -336,8 +353,10 @@ public class MetadataController extends Handler {
} }
} }
} }
} catch (ClassNotFoundException e) {
e.printStackTrace();
} }
} });
} }
return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html")); return request(super.createRequestPageTempletResponse("redirect:/admin/metadata/index.html"));
} }