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/service/impl/VersionServiceImpl.java | 45 +++++++-
screen-manage/src/main/java/com/moral/api/controller/VersionController.java | 39 ++++++-
screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionDeleteForm.java | 23 ++++
screen-manage/src/main/java/com/moral/api/service/UserService.java | 37 +++++++
screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 67 ++++--------
screen-manage/src/main/java/com/moral/api/service/VersionService.java | 22 +++
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 4
screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionSensorUnitForm.java | 27 +++++
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 2
screen-manage/src/main/resources/mapper/VersionMapper.xml | 6
10 files changed, 205 insertions(+), 67 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);
+ }
+
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionDeleteForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionDeleteForm.java
new file mode 100644
index 0000000..b781520
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionDeleteForm.java
@@ -0,0 +1,23 @@
+package com.moral.api.pojo.form.version;
+
+import lombok.Data;
+
+/**
+ * @ClassName VersionDeleteForm
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/5/20 13:16
+ * @Version TODO
+ **/
+@Data
+public class VersionDeleteForm {
+
+ private Integer id;
+
+ public boolean valid() {
+ if (id == null || id == 0) {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionSensorUnitForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionSensorUnitForm.java
new file mode 100644
index 0000000..df0508c
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionSensorUnitForm.java
@@ -0,0 +1,27 @@
+package com.moral.api.pojo.form.version;
+
+import com.moral.api.entity.VersionSensorUnit;
+import lombok.Data;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
+/**
+ * @ClassName VersionSensorUpdateForm
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/5/21 9:30
+ * @Version TODO
+ **/
+@Data
+public class VersionSensorUnitForm {
+
+ private List<VersionSensorUnit> sensorUnits;
+
+ public boolean valid(){
+ if(sensorUnits==null)
+ return false;
+ return true;
+ }
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
index 4840368..81d74c7 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
@@ -91,7 +91,7 @@
vo.setUnit(sensor.getUnit());
vo.setMaxValue(sensor.getMaxValue());
vo.setMinValue(sensor.getMinValue());
- vo.getUnitKey();
+ vo.setUnitKey(sensor.getUnitKey());
return vo;
}
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/UserService.java b/screen-manage/src/main/java/com/moral/api/service/UserService.java
index 48b2dd3..86b437e 100644
--- a/screen-manage/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/UserService.java
@@ -19,14 +19,49 @@
*/
public interface UserService extends IService<User> {
+ /**
+ * @Description: ���������������������admin������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.user.UserQueryDTO
+ * @Author: ���������
+ * @Date: 2021/5/20
+ */
UserQueryDTO queryUsers(UserQueryForm form);
+ /**
+ * @Description: ���������������admin������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.user.UserDTO
+ * @Author: ���������
+ * @Date: 2021/5/20
+ */
UserDTO updateUser(UserUpdateForm form);
+ /**
+ * @Description: ���������������admin������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.user.UserDTO
+ * @Author: ���������
+ * @Date: 2021/5/20
+ */
UserDTO deleteUser(UserDeleteForm form);
+ /**
+ * @Description: ���������������admin������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.user.UserDTO
+ * @Author: ���������
+ * @Date: 2021/5/20
+ */
UserDTO insertUser(UserInsertForm form);
- UserDTO deleteUserByOrganizationId(Integer organizationId);
+ /**
+ * @Description: ������������������������������������������������������������
+ * @Param: [organizationId]
+ * @return: com.moral.api.pojo.dto.user.UserDTO
+ * @Author: ���������
+ * @Date: 2021/5/20
+ */
+ UserDTO deleteUsersByOrganizationId(Integer organizationId);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/VersionService.java b/screen-manage/src/main/java/com/moral/api/service/VersionService.java
index be6bf7c..853a25a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/VersionService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/VersionService.java
@@ -4,9 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
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.*;
/**
* <p>
@@ -45,4 +43,22 @@
*/
VersionDTO insert(VersionInsertForm form);
+ /**
+ * @Description: ������version
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.version.VersionDTO
+ * @Author: ���������
+ * @Date: 2021/5/20
+ */
+ VersionDTO delete(VersionDeleteForm form);
+
+ /**
+ * @Description: ������������������������������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.version.VersionDTO
+ * @Author: ���������
+ * @Date: 2021/5/21
+ */
+ VersionDTO updateSensorUnits(VersionSensorUnitForm form);
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 5886add..54c25ba 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -186,7 +186,7 @@
organizationMapper.update(null, deleteWrapper);
//������������������
- userService.deleteUserByOrganizationId(id);
+ userService.deleteUsersByOrganizationId(id);
//���������������������������
List<Organization> children = getAllChildrenOrganization(existOrganization.getId());
@@ -204,7 +204,7 @@
updateWrapper.set("is_delete", Constants.DELETE);
organizationMapper.update(null, updateWrapper);
//���������������������������
- childrenId.forEach(value->userService.deleteUserByOrganizationId(value));
+ childrenId.forEach(value->userService.deleteUsersByOrganizationId(value));
} else {//���������
//���������������������������id
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 7076c71..fe313f3 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -217,55 +217,37 @@
@Override
@Transactional
public UserDTO deleteUser(UserDeleteForm form) {
+ //������������������
+ UserDTO dto = new UserDTO();
//������
Integer id = form.getId();
//������������������
User user = new User();
- user.setIsDelete(Constants.NOT_DELETE);
+ user.setIsDelete(Constants.DELETE);
user.setId(id);
- //������������������
- UserDTO dto = deleteUserModel(user);
+ //������������
+ userMapper.updateById(user);
+ //������user_group
+ UpdateWrapper deleteUserGroupWrapper = new UpdateWrapper();
+ deleteUserGroupWrapper.eq("user_id", id);
+ deleteUserGroupWrapper.set("is_delete", Constants.DELETE);
+ userGroupMapper.update(null, deleteUserGroupWrapper);
//���������������admin������������
UpdateWrapper updateOrgWrapper = new UpdateWrapper();
- updateOrgWrapper.eq("admin_user_id",user.getId());
- updateOrgWrapper.set("admin_user_id",0);
- organizationMapper.update(null,updateOrgWrapper);
+ updateOrgWrapper.eq("admin_user_id", user.getId());
+ updateOrgWrapper.set("admin_user_id", 0);
+ organizationMapper.update(null, updateOrgWrapper);
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
@Override
@Transactional
- public UserDTO deleteUserByOrganizationId(Integer organizationId) {
- //������������������
- User user = new User();
- user.setOrganizationId(organizationId);
- //������������������
- UserDTO dto = deleteUserModel(user);
- return dto;
- }
-
-
- private UserDTO deleteUserModel(User user) {
+ public UserDTO deleteUsersByOrganizationId(Integer organizationId) {
//������������������
UserDTO dto = new UserDTO();
- //������������
- Integer organizationId = null;
- //������������������������������������������������
- User oldUser = null;
- //������������������������������id
- if (ObjectUtils.isEmpty(user.getOrganizationId())) {
- QueryWrapper<User> deleteUserWrapper = new QueryWrapper<>();
- deleteUserWrapper.setEntity(user);
- oldUser = userMapper.selectOne(deleteUserWrapper);
- if (ObjectUtils.isEmpty(user)) {
- dto.setCode(ResponseCodeEnum.USER_NOT_EXIST.getCode());
- dto.setMsg(ResponseCodeEnum.USER_NOT_EXIST.getMsg());
- return dto;
- }
- organizationId = oldUser.getOrganizationId();
- }else{
- organizationId = user.getOrganizationId();
- }
//������������������������������������������������������������
UpdateWrapper<User> deleteUserChildrenWrapper = new UpdateWrapper<>();
deleteUserChildrenWrapper.eq("organization_id", organizationId);
@@ -273,24 +255,23 @@
userMapper.update(null, deleteUserChildrenWrapper);
//���������������groupMenu
UpdateWrapper deleteGroupMenuWrapper = new UpdateWrapper();
- deleteGroupMenuWrapper.eq("organization_id",organizationId);
+ deleteGroupMenuWrapper.eq("organization_id", organizationId);
deleteGroupMenuWrapper.set("is_delete", Constants.DELETE);
- groupMenuMapper.update(null,deleteGroupMenuWrapper);
+ groupMenuMapper.update(null, deleteGroupMenuWrapper);
//���������������userGroup
UpdateWrapper deleteUserGroupWrapper = new UpdateWrapper();
- deleteUserGroupWrapper.eq("organization_id",organizationId);
+ deleteUserGroupWrapper.eq("organization_id", organizationId);
deleteUserGroupWrapper.set("is_delete", Constants.DELETE);
- userGroupMapper.update(null,deleteUserGroupWrapper);
- //���������������groupMenu
+ userGroupMapper.update(null, deleteUserGroupWrapper);
+ //���������������group
UpdateWrapper deleteGroupWrapper = new UpdateWrapper();
- deleteGroupWrapper.eq("organization_id",organizationId);
+ deleteGroupWrapper.eq("organization_id", organizationId);
deleteGroupWrapper.set("is_delete", Constants.DELETE);
- groupMapper.update(null,deleteGroupWrapper);
+ groupMapper.update(null, deleteGroupWrapper);
//������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
-
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
index 97ba19e..d306c56 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
@@ -1,6 +1,7 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
import com.moral.api.entity.User;
@@ -10,9 +11,7 @@
import com.moral.api.mapper.VersionSensorUnitMapper;
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.service.VersionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -24,9 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* <p>
@@ -83,13 +80,13 @@
//������������������������������������
List<Integer> versionsIds = new ArrayList<>();
versions.forEach(value -> versionsIds.add(value.getId()));
- List<Version> result = new ArrayList<>();
+ List<Version> queryResult = new ArrayList<>();
if (!ObjectUtils.isEmpty(versionsIds)) {
- result = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
+ queryResult = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
}
//������������������
List<VersionDTO> dtos = new ArrayList<>();
- result.forEach(value -> dtos.add(new VersionDTO(value)));
+ queryResult.forEach(value -> dtos.add(new VersionDTO(value)));
dto.setVersionDTOS(dtos);
dto.setCurrent(versionsPage.getCurrent());
dto.setPages(versionsPage.getPages());
@@ -156,4 +153,34 @@
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
+
+ @Override
+ @Transactional
+ public VersionDTO delete(VersionDeleteForm form) {
+ //������������������
+ VersionDTO dto = new VersionDTO();
+ //������
+ Integer id = form.getId();
+ //������������������������������������������
+ Version oldVersion = versionMapper.selectById(id);
+ //������������
+ Version deleteVersion = new Version();
+ deleteVersion.setId(oldVersion.getId());
+ deleteVersion.setIsDelete(Constants.DELETE);
+ versionMapper.updateById(deleteVersion);
+ //������������������������������������
+ UpdateWrapper deleteSensorUnitWrapper = new UpdateWrapper();
+ deleteSensorUnitWrapper.eq("version_id",id);
+ deleteSensorUnitWrapper.set("is_delete",Constants.DELETE);
+ versionSensorUnitMapper.update(null,deleteSensorUnitWrapper);
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return dto;
+ }
+
+ @Override
+ public VersionDTO updateSensorUnits(VersionSensorUnitForm form) {
+ return null;
+ }
}
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index 78ec004..b8f5a8b 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -35,15 +35,15 @@
v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`code` as scode,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`max_value` ,vsu.`min_value`
FROM
`version` v
- JOIN
+ LEFT JOIN
version_sensor_unit vsu
ON
v.`id` = vsu.`version_id` AND vsu.`is_delete` = 0
- JOIN
+ LEFT JOIN
sensor s
ON
s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
- JOIN
+ LEFT JOIN
(
SELECT
sdd.datakey,sdd.dataValue,sdd.is_delete
--
Gitblit v1.8.0