From e6854d2d97f55827a04c28a1dbee62a27b64ffa6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 28 May 2021 14:47:13 +0800
Subject: [PATCH] screen-manage               更改前台菜单回显逻辑

---
 screen-manage/src/main/java/com/moral/api/controller/VersionController.java |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 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..c5e4db8 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,24 +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.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;
 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.*;
 
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * @ClassName VersionController
@@ -76,4 +76,39 @@
 
         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("test")
+    public ResultMessage test(){
+        System.out.println(TokenUtils.getCurrentToken());
+        return null;
+    }
+
 }

--
Gitblit v1.8.0