From 55d66b7f91b856cc37ee02ce26ca15b9a21c7d68 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 11 May 2021 15:11:58 +0800
Subject: [PATCH] sensor更新接口
---
screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java | 87 +++++++++++++++++++++----------------------
1 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index 52582b4..8642de0 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -2,13 +2,9 @@
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
-import com.moral.api.pojo.form.organization.OrganizationDeleteForm;
-import com.moral.api.pojo.form.organization.OrganizationInsertForm;
-import com.moral.api.pojo.form.organization.OrganizationQueryForm;
-import com.moral.api.pojo.form.organization.OrganizationUpdateForm;
-import com.moral.api.pojo.vo.organization.OrganizationDeleteVO;
-import com.moral.api.pojo.vo.organization.OrganizationInsertVO;
-import com.moral.api.pojo.vo.organization.OrganizationUpdateVO;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
+import com.moral.api.pojo.form.organization.*;
+import com.moral.api.pojo.vo.organization.*;
import com.moral.api.service.OrganizationService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -16,6 +12,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @ClassName OrganizationController
@@ -26,91 +24,92 @@
**/
@Slf4j
@Api(tags = {"���������������������"})
+@CrossOrigin(origins = "*", maxAge = 3600)
@RestController
- @RequestMapping("/organization")
+@RequestMapping("/organization")
public class OrganizationController {
@Autowired
OrganizationService organizationService;
@PostMapping("insert")
- public ResultMessage insert(@RequestBody OrganizationInsertForm organizationInsertForm) {
- //������������������������������
- if (!organizationInsertForm.valid())
+ public ResultMessage insert(@RequestBody OrganizationInsertForm form, HttpServletRequest request) {
+
+ //������������������������
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������������
- OrganizationDTO conditionDTO = organizationInsertForm.paramValid();
+ OrganizationDTO conditionDTO = form.paramValid();
if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
}
//������������������
- OrganizationDTO organizationDTO = organizationService.insertOrganization(organizationInsertForm);
+ OrganizationDTO dto = organizationService.insertOrganization(form);
- //���������������������������
- OrganizationInsertVO organizationInsertVO = OrganizationInsertVO.convert(organizationDTO);
-
- return new ResultMessage(organizationDTO.getCode(),organizationDTO.getMsg(),organizationInsertVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("update")
- public ResultMessage update(@RequestBody OrganizationUpdateForm organizationUpdateForm){
- //������������������������������
- if (!organizationUpdateForm.valid())
+ public ResultMessage update(@RequestBody OrganizationUpdateForm form, HttpServletRequest request) {
+
+ //������������������������
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������������
- OrganizationDTO conditionDTO = organizationUpdateForm.paramValid();
+ OrganizationDTO conditionDTO = form.paramValid();
if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
}
//������������������
- OrganizationDTO organizationDTO = organizationService.updateOrganization(organizationUpdateForm);
+ OrganizationDTO dto = organizationService.updateOrganization(form);
- //���������������������������
- OrganizationUpdateVO organizationUpdateVO = OrganizationUpdateVO.convert(organizationDTO);
-
- return new ResultMessage(organizationDTO.getCode(),organizationDTO.getMsg(),organizationUpdateVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("delete")
- public ResultMessage delete(@RequestBody OrganizationDeleteForm organizationDeleteForm){
- //������������������������������
- if (!organizationDeleteForm.valid())
+ public ResultMessage delete(@RequestBody OrganizationDeleteForm form,HttpServletRequest request) {
+ //������������������������
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������
- OrganizationDTO dto = organizationService.deleteOrganization(organizationDeleteForm);
+ OrganizationDTO dto = organizationService.deleteOrganization(form);
- //���������������������������
- OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);
-
- return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@GetMapping("query")
- public ResultMessage query(OrganizationQueryForm organizationQueryForm){
+ public ResultMessage query(OrganizationQueryForm form) {
//������������������������
- if (!organizationQueryForm.valid())
+ if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- //������������������������
- OrganizationDTO conditionDTO = organizationQueryForm.paramValid();
- if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
- return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
- }
-
//������������������
- OrganizationQueryDTO organizationQueryDTO = organizationService.queryOrganization(organizationQueryForm);
+ OrganizationQueryDTO dto = organizationService.queryOrganization(form);
//������������������������
+ OrganizationQueryVO vo = OrganizationQueryVO.convert(dto);
- return null;
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
+ @GetMapping("queryNames")
+ public ResultMessage queryNames(OrganizationQueryNamesForm form){
+
+ //������������������
+ OrganizationQueryNamesDTO dto = organizationService.queryNames(form);
+
+ //������������������������
+ OrganizationQueryAllNamesVO vo = OrganizationQueryAllNamesVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
}
}
--
Gitblit v1.8.0