From 349c49d9c6407dbfc46a33f9795647a71406dd0d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 21 May 2021 10:18:01 +0800
Subject: [PATCH] screen-manage 修改型号查询BUG，修改sql语句，改为左外连
---
screen-manage/src/main/java/com/moral/api/controller/VersionController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
index 2cc121c..4360ff1 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
@@ -1,12 +1,12 @@
package com.moral.api.controller;
+import com.alibaba.fastjson.JSON;
import com.moral.api.entity.Version;
+import com.moral.api.entity.VersionSensorUnit;
import com.moral.api.mapper.VersionMapper;
import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.dto.version.VersionQueryDTO;
-import com.moral.api.pojo.form.version.VersionInsertForm;
-import com.moral.api.pojo.form.version.VersionQueryForm;
-import com.moral.api.pojo.form.version.VersionUpdateForm;
+import com.moral.api.pojo.form.version.*;
import com.moral.api.pojo.vo.Version.VersionQueryVO;
import com.moral.api.pojo.vo.Version.VersionVO;
import com.moral.api.service.VersionService;
@@ -17,8 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
/**
* @ClassName VersionController
@@ -76,4 +75,34 @@
return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
+
+ @PostMapping("delete")
+ public ResultMessage delete(@RequestBody VersionDeleteForm form){
+
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ //������������������
+ VersionDTO dto = versionService.delete(form);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
+ }
+
+ @PostMapping("updateSensorUnit")
+ public ResultMessage updateSensorUnit(@RequestBody VersionSensorUnitForm form){
+
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ //������������������
+ VersionDTO dto = versionService.updateSensorUnits(form);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
+ }
+
+
}
--
Gitblit v1.8.0