diff --git a/app.platform/build.gradle b/app.platform/build.gradle index c63cef5e..22d89384 100644 --- a/app.platform/build.gradle +++ b/app.platform/build.gradle @@ -11,16 +11,13 @@ dependencies { dependencies { implementation ( - project(":io.sc.platform.app"), - project(":io.sc.platform.developer"), - project(":io.sc.engine.mv"), - project(":io.sc.engine.mv.frontend"), - project(":io.sc.engine.mv.sample"), - - //project(":io.sc.platform.job.core"), - //project(":io.sc.platform.job.executor"), - //project(":io.sc.platform.job.manager"), + project(":io.sc.platform.app"), + project(":io.sc.platform.developer"), + project(":io.sc.platform.security.loginform"), + project(":io.sc.engine.mv"), + project(":io.sc.engine.mv.frontend"), + project(":io.sc.engine.mv.sample"), ) } diff --git a/io.sc.engine.mv.frontend/src/menus/menus.json b/io.sc.engine.mv.frontend/src/menus/menus.json index b02b42b8..ef25bbb3 100644 --- a/io.sc.engine.mv.frontend/src/menus/menus.json +++ b/io.sc.engine.mv.frontend/src/menus/menus.json @@ -18,7 +18,7 @@ [ /*模型验证*/ - {"type":"GROUP", "order":20000, "id":"menu.engine.mv", "titleI18nKey":"menu.engine.mv", "icon":"bi-command"}, + {"type":"GROUP", "order":20000, "id":"menu.engine.mv", "titleI18nKey":"menu.engine.mv", "icon":"bi-bag-check"}, /*模型验证/验证结果查看*/ {"type":"ROUTE", "order":100, "parentId":"menu.engine.mv", "id":"menu.engine.mv.result", "titleI18nKey":"menu.engine.mv.result", "icon":"bi-display", "routeName":"route.engine.mv.result"}, /*模型验证/样本数据查看*/ diff --git a/io.sc.example/build.gradle b/io.sc.example/build.gradle deleted file mode 100644 index 9a1122fc..00000000 --- a/io.sc.example/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -dependencies { - api( - project(":io.sc.platform.mvc"), - project(":io.sc.platform.orm"), - ) -} - -// 项目无需发布到仓库中 -publishPublicationPublicationToMavenRepository.enabled=false diff --git a/io.sc.example/src/main/java/io/sc/example/icons/Transform.java b/io.sc.example/src/main/java/io/sc/example/icons/Transform.java deleted file mode 100644 index ddace3a4..00000000 --- a/io.sc.example/src/main/java/io/sc/example/icons/Transform.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.sc.example.icons; - -import io.sc.platform.core.util.FileUtil; -import io.sc.platform.core.util.ObjectMapper4Json; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -public class Transform { - private static Map map =new HashMap<>(); - private static String path ="/Users/wangshaoping/wspsc/workspace/wangshaoping/v11/platform/io.sc.example/src/main/java/io/sc/example/icons"; - static{ - map.put("A","a");map.put("B","b");map.put("C","c");map.put("D","d");map.put("E","e"); - map.put("F","f");map.put("G","g");map.put("H","h");map.put("I","i");map.put("J","j"); - map.put("K","k");map.put("L","l");map.put("M","m");map.put("N","n");map.put("O","o"); - map.put("P","p");map.put("Q","q");map.put("R","r");map.put("S","s");map.put("T","t"); - map.put("U","u");map.put("V","v");map.put("W","w");map.put("X","x");map.put("Y","y"); - map.put("Z","z"); - }; - public static void main(String[] args) throws IOException { - String json = FileUtil.readString("classpath:/io/sc/example/icons/material-icons-outlined.json"); - String[] items =ObjectMapper4Json.getMapper().readValue(json,String[].class); - for(int i=0;i, ID extends Serializable, R extends DaoRepository, S extends DaoService> { @Autowired protected S service; + /** + * 新增实体 + * @param request Http 请求对象 + * @param response Http 响应对象 + * @param entity 实体对象 + * @param bindingResult 数据校验结果对象 + * @return 新增实体的 VO 对象 + * @throws Exception 违例 + */ @AuditLog(action= AuditLogAction.ADD) @PostMapping("") @ResponseBody @@ -45,6 +54,14 @@ public abstract class RestCrudController(vos,page.getPageable(),page.getTotalElements()); } + /** + * 恢复默认值 + * @throws Exception 违例 + */ @AuditLog(action=AuditLogAction.RESET_DEFAULT_VALUES) @PostMapping("resetDefaultValues") - public void resetDefaultValues(HttpServletRequest request,HttpServletResponse response,QueryParameter queryParameter) throws Exception{ + @ResponseBody + public void resetDefaultValues() throws Exception{ service.resetDefaultValues(); } } diff --git a/settings.gradle b/settings.gradle index f77efc55..24c9cdd1 100755 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,6 @@ include ':app.platform' include ':io.sc.engine.mv' include ':io.sc.engine.mv.frontend' include ':io.sc.engine.mv.sample' -include ':io.sc.example' include ':io.sc.platform.app' include ':io.sc.platform.app-nacos' include ':io.sc.platform.communication'