feat: fix model API

Author: lu-yg

base/src/main/java/com/tinyengine/it/common/enums/Enums.java

@@ -1024,20 +1024,117 @@ public enum methodName {
         /**
          * QUERY name.
          */
-        QUERY("查询方法"),
+        QUERY("查询方法");
+
+        private final String value;
+
+        methodName(String value) {
+            this.value = value;
+        }
 
         /**
-         * NAME name.
+         * Gets value.
+         *
+         * @return the value
          */
-        NAME("params"),
+        public String getValue() {
+            return value;
+        }
+    }
+
+    public enum paramType {
+
         /**
          * TYPE name.
          */
-        TYPE("Object");
+        OBJECT("Object"),
+
+        /**
+         * CREATED name.
+         */
+        NUMBER("Number"),
+
+        /**
+         * UPDATE name.
+         */
+        STRING("String"),
+
+        /**
+         * DELETE name.
+         */
+        ARRAY("Array");
 
         private final String value;
 
-        methodName(String value) {
+        paramType(String value) {
+            this.value = value;
+        }
+
+        /**
+         * Gets value.
+         *
+         * @return the value
+         */
+        public String getValue() {
+            return value;
+        }
+    }
+
+    public enum methodParam {
+
+        /**
+         * ID
+         */
+        ID("id"),
+        /**
+         * CURRENTPAGE
+         */
+        CURRENTPAGE("currentPage"),
+
+        /**
+         * PAGESIZE
+         */
+        PAGESIZE("pageSize"),
+
+        /**
+         * NAMECN
+         */
+        NAMECN("nameCn"),
+
+        /**
+         * NAMEEN
+         */
+        NAMEEN("nameEn"),
+
+        /**
+         * PARAMS
+         */
+        PARAMS("params"),
+
+        /**
+         * CODE
+         */
+        CODE("code"),
+
+        /**
+         * MESSAGE
+         */
+        MESSAGE("message"),
+
+        /**
+         * DATA
+         */
+        DATA("data"),
+
+        /**
+         * TOTAL
+         */
+        TOTAL("total");
+
+
+        private final String value;
+
+        methodParam(String value) {
             this.value = value;
         }
 

base/src/main/java/com/tinyengine/it/controller/ModelController.java

@@ -30,6 +30,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -133,7 +134,7 @@ public Result<Model> createModel(@Valid @RequestBody Model model) {
         @ApiResponse(responseCode = "400", description = "请求失败")
     })
     @SystemControllerLog(description = "修改单个Model信息")
-    @PostMapping("/model/update/{id}")
+    @PutMapping("/model/update/{id}")
     public Result<Model> updateModel(@PathVariable Integer id, @RequestBody Model model) {
         model.setId(id);
         Model result = modelService.updateModelById(model);

base/src/main/java/com/tinyengine/it/service/material/impl/ModelServiceImpl.java

@@ -29,7 +29,6 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -58,7 +57,7 @@ public Model queryModelById(Integer id) {
     public List<Model> getModelByName(String name) {
         QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
         queryWrapper.like("name", name);
-        return  this.baseMapper.selectList(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     /**
@@ -161,33 +160,66 @@ public Model updateModelById(Model model) {
     private MethodDto getMethodDto(String name, Model model) {
         MethodDto methodDto = new MethodDto();
         methodDto.setName(name);
+        List<ResponseParameter> responseParameterList = getResponseParameters(name);
         RequestParameter requestParameter = new RequestParameter();
-        requestParameter.setProp("id");
-        requestParameter.setType("Number");
+        requestParameter.setProp(Enums.methodParam.ID.getValue());
+        requestParameter.setType(Enums.paramType.NUMBER.getValue());
+        List<RequestParameter> parameterList = new ArrayList<>();
+        if (name.equals(Enums.methodName.QUERY.getValue())) {
+            RequestParameter currentPage = new RequestParameter();
+            currentPage.setProp(Enums.methodParam.CURRENTPAGE.getValue());
+            currentPage.setType(Enums.paramType.NUMBER.getValue());
+            RequestParameter pageSize = new RequestParameter();
+            pageSize.setProp(Enums.methodParam.PAGESIZE.getValue());
+            pageSize.setType(Enums.paramType.NUMBER.getValue());
+            RequestParameter nameCn = new RequestParameter();
+            nameCn.setProp(Enums.methodParam.NAMECN.getValue());
+            nameCn.setType(Enums.paramType.STRING.getValue());
+            RequestParameter nameEn = new RequestParameter();
+            nameEn.setProp(Enums.methodParam.NAMEEN.getValue());
+            nameEn.setType(Enums.paramType.STRING.getValue());
+            parameterList.add(currentPage);
+            parameterList.add(pageSize);
+            parameterList.add(nameCn);
+            parameterList.add(nameEn);
 
+        }
         if (name != Enums.methodName.DELETE.getValue()) {
-            requestParameter.setProp(Enums.methodName.NAME.getValue());
-            requestParameter.setType(Enums.methodName.TYPE.getValue());
+            requestParameter.setProp(Enums.methodParam.PARAMS.getValue());
+            requestParameter.setType(Enums.paramType.OBJECT.getValue());
             requestParameter.setChildren(model.getParameters());
+            parameterList.add(requestParameter);
+
+            methodDto.setRequestParameters(parameterList);
+            methodDto.setResponseParameters(responseParameterList);
+            return methodDto;
         }
 
-        List<ResponseParameter> responseParameterList = getResponseParameters();
-        methodDto.setRequestParameters(Arrays.asList(requestParameter));
+        parameterList.add(requestParameter);
+        methodDto.setRequestParameters(parameterList);
         methodDto.setResponseParameters(responseParameterList);
         return methodDto;
     }
 
-    private static List<ResponseParameter> getResponseParameters() {
+    private static List<ResponseParameter> getResponseParameters(String name) {
         ResponseParameter code = new ResponseParameter();
-        code.setProp("code");
-        code.setType("Number");
+        code.setProp(Enums.methodParam.CODE.getValue());
+        code.setType(Enums.paramType.NUMBER.getValue());
         ResponseParameter message = new ResponseParameter();
-        message.setProp("message");
-        message.setType("String");
+        message.setProp(Enums.methodParam.MESSAGE.getValue());
+        message.setType(Enums.paramType.STRING.getValue());
         ResponseParameter data = new ResponseParameter();
-        data.setProp("data");
-        data.setType("Array");
+        data.setProp(Enums.methodParam.DATA.getValue());
+        data.setType(Enums.paramType.ARRAY.getValue());
+
         List<ResponseParameter> responseParameterList = new ArrayList<>();
+        if (name.equals(Enums.methodName.QUERY.getValue())) {
+            ResponseParameter total = new ResponseParameter();
+            total.setProp(Enums.methodParam.TOTAL.getValue());
+            total.setType(Enums.paramType.NUMBER.getValue());
+            responseParameterList.add(total);
+        }
+
         responseParameterList.add(code);
         responseParameterList.add(message);
         responseParameterList.add(data);