From a7ddde285c9238501a3566cc291e5412fc53edb9 Mon Sep 17 00:00:00 2001
From: wangjingsheng <wangjinsheng@wodcloud.com>
Date: Thu, 3 Mar 2022 16:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocp/controller/ModelBaseController.java   | 34 +++++++++----------
 .../com/pms/ocp/service/ModelTypeService.java |  1 -
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
index f41b460..2ebbb24 100644
--- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
@@ -41,7 +41,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型分类-查询")
-    @GetMapping("/model/type")
+    @GetMapping("/get/model/type")
     public ResponseVO getModelType() {
         return modelGroupService.getModelType();
     }
@@ -52,7 +52,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型分类-增加")
-    @PostMapping("/model/type")
+    @PostMapping("/create/model/type")
     public ResponseVO createModelType(ModelType modelType) {
         return modelGroupService.createModelType(modelType);
     }
@@ -63,7 +63,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型分类-删除")
-    @PostMapping("/model/type")
+    @PostMapping("/delete/model/type")
     public ResponseVO deleteModelType(ModelType modelType) {
 //        return modelType.deleteModelType();
         return null;
@@ -75,7 +75,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型分类-修改")
-    @PostMapping("/model/type")
+    @PostMapping("/update/model/type")
     public ResponseVO updateModelType() {
         return ResponseVO.ok();
     }
@@ -86,7 +86,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型-查询")
-    @GetMapping("/model")
+    @GetMapping("/get/model")
     public ResponseVO getModel() {
         return modelService.getModelList();
     }
@@ -97,7 +97,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型-增加")
-    @PostMapping("/model")
+    @PostMapping("/create/model")
     public ResponseVO createModel(@RequestBody Model model) {
         return modelService.createModel(model);
     }
@@ -108,7 +108,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型-删除")
-    @PostMapping("/model")
+    @PostMapping("/delete/model")
     public ResponseVO deleteModel(@RequestBody Model model) {
         String modelId = model.getObjId();
         if (StringUtils.isNotBlank(modelId)) {
@@ -124,7 +124,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型-修改")
-    @PostMapping("/model")
+    @PostMapping("/update/model")
     public ResponseVO updateModel(Model model) {
         return modelService.updateModel(model);
     }
@@ -158,7 +158,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型订阅-增加")
-    @PostMapping("/model/subscribe")
+    @PostMapping("/create/model/subscribe")
     public ResponseVO createModelSubscribe() {
         return ResponseVO.ok();
     }
@@ -169,7 +169,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型订阅-查询")
-    @GetMapping("/model/subscribe")
+    @GetMapping("/get/model/subscribe")
     public ResponseVO getModelSubscribe() {
         return ResponseVO.ok();
     }
@@ -180,7 +180,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型事记-查询")
-    @GetMapping("/model/note")
+    @GetMapping("/get/model/note")
     public ResponseVO getModelNote() {
         return ResponseVO.ok();
     }
@@ -191,7 +191,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型事记-增加")
-    @PostMapping("/model/note")
+    @PostMapping("create/model/note")
     public ResponseVO createModelNote() {
         return ResponseVO.ok();
     }
@@ -202,7 +202,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型属性-增加")
-    @PostMapping("/model/property")
+    @PostMapping("create/model/property")
     public ResponseVO createModelProperty() {
         return ResponseVO.ok();
     }
@@ -213,7 +213,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型属性-查询")
-    @GetMapping("/model/property")
+    @GetMapping("get/model/property")
     public ResponseVO getModelProperty() {
         return ResponseVO.ok();
     }
@@ -224,7 +224,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型属性-修改")
-    @PutMapping("/model/property")
+    @PostMapping("/update/model/property")
     public ResponseVO updateModelProperty() {
         return ResponseVO.ok();
     }
@@ -235,7 +235,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型属性-删除")
-    @DeleteMapping("/model/property")
+    @PostMapping("/delete/model/property")
     public ResponseVO deleteModelProperty() {
         return ResponseVO.ok();
     }
@@ -246,7 +246,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型拓扑关系-查询")
-    @GetMapping("/model/topology")
+    @GetMapping("/get/model/topology")
     public ResponseVO getModelTopology() {
         return ResponseVO.ok();
     }
diff --git a/src/main/java/com/pms/ocp/service/ModelTypeService.java b/src/main/java/com/pms/ocp/service/ModelTypeService.java
index 653be3c..1424e71 100644
--- a/src/main/java/com/pms/ocp/service/ModelTypeService.java
+++ b/src/main/java/com/pms/ocp/service/ModelTypeService.java
@@ -1,6 +1,5 @@
 package com.pms.ocp.service;
 
-import com.pms.ocp.model.entity.Model;
 import com.pms.ocp.model.entity.ModelType;
 
 import java.util.List;
-- 
2.26.0