From 3cf43da7391aa26f689e3d73d6231bb05929b62b Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Wed, 21 Sep 2022 16:05:27 +0800
Subject: [PATCH] 校准工具类bug修改
---
screen-manage/src/main/java/com/moral/api/controller/VersionController.java | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 88 insertions(+), 7 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 61aa2e9..e87b805 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,23 +1,24 @@
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.VersionQueryForm;
+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;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
+import com.moral.util.TokenUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
/**
* @ClassName VersionController
@@ -48,6 +49,86 @@
VersionQueryVO vo = VersionQueryVO.convert(dto);
return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
-
}
+
+ @PostMapping("update")
+ public ResultMessage update(@RequestBody VersionUpdateForm form){
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ //������������������
+ VersionDTO dto = versionService.update(form);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
+ }
+
+ @PostMapping("insert")
+ public ResultMessage insert(@RequestBody VersionInsertForm form){
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ //������������������
+ VersionDTO dto = versionService.insert(form);
+
+ 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);
+ }
+
+
+
+ @GetMapping("queryById")
+ public ResultMessage queryById(VersionQueryByIdForm form){
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ VersionQueryDTO dto = versionService.queryVersionById(form);
+
+ VersionQueryVO vo = VersionQueryVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
+ @GetMapping("queryByOrgId")
+ public ResultMessage queryByOrganizationId(Integer organizationId){
+
+ VersionQueryDTO dto = versionService.queryByOrganizationId(organizationId);
+
+ VersionQueryVO vo = VersionQueryVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
}
--
Gitblit v1.8.0