等级评估简单版本

web/consumer/src/main/java/com/gyee/consumer/api/knowleage/KnowledgeApi.java

@@ -210,15 +210,13 @@ public interface KnowledgeApi {
 
     /**
      * 等级评估配置
-     * @param type
+     * @param cycle
      * @param pageNum
      * @param pageSize
      * @return
      */
     @GetMapping("/rating")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
-    public R rating(@RequestParam(value = "type",required = true) String type,
+    public R rating(@RequestParam(value = "cycle",required = true) String cycle,
                     @RequestParam(value = "pageNum",required = true) String pageNum,
                     @RequestParam(value = "pageSize",required = true) String pageSize
     );
@@ -229,8 +227,6 @@ public interface KnowledgeApi {
      * @return
      */
     @PostMapping("/ratingedit")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R ratingedit(@RequestBody Evaluationdatasource evaluationdatasource);
 
     /**
@@ -238,7 +234,5 @@ public interface KnowledgeApi {
      * @return
      */
     @DeleteMapping("/ratingremove")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R ratingremove(@RequestBody Evaluationdatasource evaluationdatasource);
 }

web/consumer/src/main/java/com/gyee/consumer/controller/knowleage/KnowleageController.java

@@ -290,19 +290,19 @@ public class KnowleageController {
 
     /**
      * 等级评估配置
-     * @param type
+     * @param cycle
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @GetMapping("/rating")
+    @GetMapping("/consumer/knowledge//rating")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R rating(@RequestParam(value = "type",required = true) String type,
+    public R rating(@RequestParam(value = "cycle",required = true) String cycle,
                     @RequestParam(value = "pageNum",required = true) String pageNum,
                     @RequestParam(value = "pageSize",required = true) String pageSize
     ){
-        return knowledgeApi.rating(type,pageNum,pageSize);
+        return knowledgeApi.rating(cycle,pageNum,pageSize);
     }
 
 
@@ -310,7 +310,7 @@ public class KnowleageController {
      * 等级评估编辑
      * @return
      */
-    @PostMapping("/ratingedit")
+    @PostMapping("/consumer/knowledge//ratingedit")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R ratingedit(@RequestBody Evaluationdatasource evaluationdatasource){
@@ -321,7 +321,7 @@ public class KnowleageController {
      * 等级评估删除
      * @return
      */
-    @DeleteMapping("/ratingremove")
+    @DeleteMapping("/consumer/knowledge//ratingremove")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R ratingremove(@RequestBody Evaluationdatasource evaluationdatasource){

web/knowledge-hb/src/main/java/com/gyee/knowledge/controller/knowledge/KnowledgeController.java

@@ -450,7 +450,7 @@ public class KnowledgeController {
 
     /**
      * 等级评估配置
-     * @param type
+     * @param cycle
      * @param pageNum
      * @param pageSize
      * @return
@@ -458,12 +458,12 @@ public class KnowledgeController {
     @GetMapping("/rating")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R rating(@RequestParam(value = "type",required = true) String type,
+    public R rating(@RequestParam(value = "cycle",required = true) String cycle,
                             @RequestParam(value = "pageNum",required = true) String pageNum,
                             @RequestParam(value = "pageSize",required = true) String pageSize
     )  {
 
-        List<Evaluationdatasource> resultlist = knowledgeService.rating(type,pageNum,pageSize);
+        List<Evaluationdatasource> resultlist = knowledgeService.rating(cycle,pageNum,pageSize);
         if (StringUtils.isNotNull(resultlist)) {
             return R.ok(resultlist.size()).data(resultlist);
         }else{

web/knowledge-hb/src/main/java/com/gyee/knowledge/service/knowledge/KnowledgeService.java

@@ -207,10 +207,10 @@ public class KnowledgeService {
         return list;
     }
 
-    public List<Evaluationdatasource> rating(String type, String pageNum, String pageSize) {
+    public List<Evaluationdatasource> rating(String cycle, String pageNum, String pageSize) {
         QueryWrapper<Evaluationdatasource> qw = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(type)){
-            qw.like("type",type);
+        if (StringUtils.isNotEmpty(cycle)){
+            qw.like("cycle",cycle);
         }
         Page<Evaluationdatasource> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         Page<Evaluationdatasource> p3DeviceFaultPage = evaluationdatasourceService.getBaseMapper().selectPage(page, qw);
@@ -224,7 +224,7 @@ public class KnowledgeService {
     }
 
     public Boolean ratingremove(Evaluationdatasource evaluationdatasource) {
-        boolean b = ip3DeviceFaultService.removeById(evaluationdatasource.getTargetid());
+        boolean b = evaluationdatasourceService.removeById(evaluationdatasource.getTargetid());
         return b;
     }
 }