Selaa lähdekoodia

修改部分restful风格的接口

wukai 1 viikko sitten
vanhempi
commit
1ab54ffa1a

+ 3 - 3
jjt-biz/src/main/java/com/jjt/biz/controller/BizModelController.java

@@ -65,9 +65,9 @@ public class BizModelController extends BaseController {
     }
 
     @ApiOperation("健康度配置")
-    @GetMapping("/config/{modelId}")
-    public AjaxResult config(@ApiParam(value = "模型ID", required = true) @PathVariable("modelId") Long modelId) {
-        List<HlClass> list = bizModelService.selectHlClassList4modelId(modelId);
+    @GetMapping("/config")
+    public AjaxResult config(@ApiParam(value = "模型ID", required = true) Long id) {
+        List<HlClass> list = bizModelService.selectHlClassList4modelId(id);
         return success(list);
     }
 

+ 9 - 9
jjt-biz/src/main/java/com/jjt/biz/controller/IndexController.java

@@ -95,8 +95,8 @@ public class IndexController extends BaseController {
     }
 
     @ApiOperation("应用健康趋势-按月")
-    @GetMapping("/hl/month/{date}")
-    public AjaxResult hlMonth(@ApiParam(value = "时间 yyyy-mm", required = true) @PathVariable("date") Date date) {
+    @GetMapping("/hl/month")
+    public AjaxResult hlMonth(@ApiParam(value = "时间 yyyy-mm", required = true) Date date) {
         List<Map<String, Object>> result = new ArrayList<>();
         HlScore search = new HlScore();
         search.setHlType("2");
@@ -141,8 +141,8 @@ public class IndexController extends BaseController {
     }
 
     @ApiOperation("应用健康趋势-按年")
-    @GetMapping("/hl/year/{date}")
-    public AjaxResult hlYear(@ApiParam(value = "时间 yyyy", required = true) @PathVariable("date") String date) {
+    @GetMapping("/hl/year")
+    public AjaxResult hlYear(@ApiParam(value = "时间 yyyy", required = true) String date) {
         List<Map<String, Object>> result = new ArrayList<>();
         String sql = "SELECT a.model_name,b.hy,b.hm,b.score from biz_model a,(SELECT model_id,year(hl_date) hy,month(hl_date) hm,AVG(ifnull(hl_score,100)) score" +
                 " FROM hl_score t WHERE hl_type=2 AND year(hl_date)=? GROUP BY model_id,hy,hm) b WHERE a.model_id=b.model_id order by hm";
@@ -177,8 +177,8 @@ public class IndexController extends BaseController {
 
 
     @ApiOperation("应用健康趋势-按天")
-    @GetMapping("/hl/day/{date}")
-    public AjaxResult hlDay(@ApiParam(value = "时间(yyyy-mm-dd", required = true) @PathVariable("date") Date date) {
+    @GetMapping("/hl/day")
+    public AjaxResult hlDay(@ApiParam(value = "时间(yyyy-mm-dd", required = true) Date date) {
         List<Map<String, Object>> result = new ArrayList<>();
         HlScore search = new HlScore();
         search.setHlType("1");
@@ -352,8 +352,8 @@ public class IndexController extends BaseController {
     }
 
     @ApiOperation("重点指标运行趋势图")
-    @GetMapping("/ms/trend/{objMetricsId}")
-    public AjaxResult msChat(@PathVariable("objMetricsId") Long objMetricsId) {
+    @GetMapping("/ms/trend-d")
+    public AjaxResult msChat(Long id) {
         List<Map<String, Object>> trendList = new ArrayList<>();
 
         LocalDateTime endTime = LocalDateTime.now();
@@ -362,7 +362,7 @@ public class IndexController extends BaseController {
         params.put("beginTime", beginTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         params.put("endTime", endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         BizObjMetricsData q = new BizObjMetricsData();
-        q.setObjMetricsId(objMetricsId);
+        q.setObjMetricsId(id);
         q.setParams(params);
         List<BizObjMetricsData> list = dataService.selectBizObjMetricsDataList(q);
         list.forEach(data -> {

+ 3 - 3
jjt-biz/src/main/java/com/jjt/check/controller/CheckConfigController.java

@@ -131,9 +131,9 @@ public class CheckConfigController extends BaseController {
 
     @ApiOperation("获取巡检结果")
     ////@PreAuthorize("@ss.hasPermi('check:chkc:query')")
-    @GetMapping(value = "/result/{crId}")
-    public AjaxResult result(@PathVariable("crId") Long crId) {
-        return success(crService.selectCheckRecordByCrId(crId));
+    @GetMapping(value = "/result")
+    public AjaxResult result(Long id) {
+        return success(crService.selectCheckRecordByCrId(id));
     }
 
     /**

+ 3 - 3
jjt-biz/src/main/java/com/jjt/hl/controller/HlClassScoreController.java

@@ -34,10 +34,10 @@ public class HlClassScoreController extends BaseController {
      * 查询模型健康度分类得分列表
      */
     @ApiOperation("根据分数ID查询详细")
-    @GetMapping("/list/{hlScoreId}")
-    public AjaxResult list4score(@PathVariable("hlScoreId") Long hlScoreId) {
+    @GetMapping("/detail")
+    public AjaxResult list4score(Long id) {
         HlClassScore hlClassScore = new HlClassScore();
-        hlClassScore.setHlScoreId(hlScoreId);
+        hlClassScore.setHlScoreId(id);
         List<HlClassScore> list = hlClassScoreService.selectHlClassScoreList(hlClassScore);
         return AjaxResult.success(list);
     }

+ 4 - 4
jjt-biz/src/main/java/com/jjt/hl/controller/HlMetricsController.java

@@ -38,11 +38,11 @@ public class HlMetricsController extends BaseController {
     private IHlClassService hlClassService;
 
     @ApiOperation("根据分类ID查询指标")
-    @GetMapping("/list/{hlClassId}")
-    public AjaxResult list(@PathVariable("hlClassId") Long hlClassId) {
-        HlClass hlClass = hlClassService.selectHlClassByHlClassId(hlClassId);
+    @GetMapping("/list-id")
+    public AjaxResult list(Long id) {
+        HlClass hlClass = hlClassService.selectHlClassByHlClassId(id);
         HlMetrics hlMetrics = new HlMetrics();
-        hlMetrics.setHlClassId(hlClassId);
+        hlMetrics.setHlClassId(id);
         List<HlMetrics> list = hlMetricsService.selectHlMetricsList(hlMetrics);
         if (list.size() > 0 && "1".equals(hlClass.getScoreType())) {
             //均分

+ 3 - 3
jjt-biz/src/main/java/com/jjt/hl/controller/HlMetricsScoreController.java

@@ -40,10 +40,10 @@ public class HlMetricsScoreController extends BaseController {
      * 查询模型健康度分类得分列表
      */
     @ApiOperation("根据分类ID查询详细")
-    @GetMapping("/list/{scoreClassId}")
-    public AjaxResult list4score(@PathVariable("scoreClassId") Long scoreClassId) {
+    @GetMapping("/list-id")
+    public AjaxResult list4score(Long id) {
         HlMetricsScore hlMetricsScore = new HlMetricsScore();
-        hlMetricsScore.setScoreClassId(scoreClassId);
+        hlMetricsScore.setScoreClassId(id);
         List<HlMetricsScore> list = hlMetricsScoreService.selectHlMetricsScoreList(hlMetricsScore);
         return AjaxResult.success(list);
     }