Просмотр исходного кода

修改模型更新指标时报错。

wukai 9 месяцев назад
Родитель
Сommit
68b5aad908

+ 15 - 6
jjt-biz/src/main/java/com/jjt/biz/controller/MetricsTplDetailController.java

@@ -37,7 +37,7 @@ public class MetricsTplDetailController extends BaseController {
 
     @ApiOperation("选择指标")
     @GetMapping("/select/{tplId}")
-    public TableDataInfo select(@ApiParam(value = "模板ID" , required = true) @PathVariable("tplId") Long tplId) {
+    public TableDataInfo select(@ApiParam(value = "模板ID", required = true) @PathVariable("tplId") Long tplId) {
         startPage();
         List<MetricsDef> list = metricsTplDetailService.selectMetricsDefList(tplId);
         return getDataTable(list);
@@ -45,7 +45,7 @@ public class MetricsTplDetailController extends BaseController {
 
     @ApiOperation("添加指标")
     @GetMapping("/add/{tplId}")
-    public AjaxResult add(@ApiParam(value = "模板ID" , required = true) @PathVariable("tplId") Long tplId, @ApiParam(value = "指标ID数组" , required = true) Long[] metricsIds) {
+    public AjaxResult add(@ApiParam(value = "模板ID", required = true) @PathVariable("tplId") Long tplId, @ApiParam(value = "指标ID数组", required = true) Long[] metricsIds) {
         return success(metricsTplDetailService.insertMetricsTplDetails(tplId, metricsIds));
     }
 
@@ -67,7 +67,7 @@ public class MetricsTplDetailController extends BaseController {
      */
     @ApiOperation("导出模板指标明细列表")
     @PreAuthorize("@ss.hasPermi('metrics:detail:export')")
-    @Log(title = "模板指标明细" , businessType = BusinessType.EXPORT)
+    @Log(title = "模板指标明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, MetricsTplDetail metricsTplDetail) {
         List<MetricsTplDetail> list = metricsTplDetailService.selectMetricsTplDetailList(metricsTplDetail);
@@ -90,7 +90,7 @@ public class MetricsTplDetailController extends BaseController {
      */
     @ApiOperation("新增模板指标明细")
     @PreAuthorize("@ss.hasPermi('metrics:detail:add')")
-    @Log(title = "模板指标明细" , businessType = BusinessType.INSERT)
+    @Log(title = "模板指标明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MetricsTplDetail metricsTplDetail) {
         return toAjax(metricsTplDetailService.insertMetricsTplDetail(metricsTplDetail));
@@ -101,9 +101,18 @@ public class MetricsTplDetailController extends BaseController {
      */
     @ApiOperation("修改模板指标明细")
     @PreAuthorize("@ss.hasPermi('metrics:detail:edit')")
-    @Log(title = "模板指标明细" , businessType = BusinessType.UPDATE)
+    @Log(title = "模板指标明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody MetricsTplDetail metricsTplDetail) {
+        if (metricsTplDetail.getAlarmMid() != null) {
+            metricsTplDetail.setAlarmMid(metricsTplDetail.getAlarmMid().trim());
+        }
+        if (metricsTplDetail.getAlarmLow() != null) {
+            metricsTplDetail.setAlarmLow(metricsTplDetail.getAlarmLow().trim());
+        }
+        if (metricsTplDetail.getAlarmHigh() != null) {
+            metricsTplDetail.setAlarmHigh(metricsTplDetail.getAlarmHigh().trim());
+        }
         omService.update(metricsTplDetail);
         return toAjax(metricsTplDetailService.updateMetricsTplDetail(metricsTplDetail));
     }
@@ -113,7 +122,7 @@ public class MetricsTplDetailController extends BaseController {
      */
     @ApiOperation("删除模板指标明细")
     @PreAuthorize("@ss.hasPermi('metrics:detail:remove')")
-    @Log(title = "模板指标明细" , businessType = BusinessType.DELETE)
+    @Log(title = "模板指标明细", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tplDetailIds}")
     public AjaxResult remove(@PathVariable Long[] tplDetailIds) {
         for (Long detailId : tplDetailIds) {

+ 8 - 8
jjt-biz/src/main/java/com/jjt/biz/service/impl/BizObjMetricsServiceImpl.java

@@ -3,7 +3,6 @@ package com.jjt.biz.service.impl;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.jjt.biz.domain.*;
 import com.jjt.biz.mapper.BizObjMetricsMapper;
 import com.jjt.biz.service.*;
@@ -240,14 +239,15 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
         om.setMetricsId(detail.getMetricsId());
         om.setTplId(detail.getTplId());
 
-        List list = selectBizObjMetricsList(om);
+        List<BizObjMetrics> list = selectBizObjMetricsList(om);
         if (list.size() > 0) {
-            //如果有则更新,没有则插入
-            UpdateWrapper<BizObjMetrics> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.set("alarm_low", detail.getAlarmLow());
-            updateWrapper.set("alarm_mid", detail.getAlarmMid());
-            updateWrapper.set("alarm_high", detail.getAlarmHigh());
-            bizObjMetricsMapper.update(om, updateWrapper);
+            list.forEach(obj -> {
+                //如果有则更新,没有则插入
+                obj.setAlarmMid(detail.getAlarmMid());
+                obj.setAlarmLow(detail.getAlarmLow());
+                obj.setAlarmHigh(detail.getAlarmHigh());
+                bizObjMetricsMapper.updateBizObjMetrics(obj);
+            });
         } else {
             om.setAlarmLow(detail.getAlarmLow());
             om.setAlarmMid(detail.getAlarmMid());