From b526f6b437912fe92f6da3e26d948f4dea50711d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 14 May 2021 14:12:24 +0800
Subject: [PATCH] screen-manage 建立型号表，以及型号因子单位关系表
---
screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java | 51 ++++++
screen-manage/src/main/java/com/moral/api/entity/Version.java | 72 +++++++++
screen-manage/src/main/java/com/moral/api/service/VersionSensorUnitService.java | 16 ++
screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionQueryDTO.java | 30 +++
screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 69 ++++++++
screen-manage/src/main/resources/mapper/VersionMapper.xml | 15 +
screen-manage/src/main/java/com/moral/api/mapper/VersionMapper.java | 16 ++
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 81 ++++++++++
screen-manage/src/main/java/com/moral/api/service/impl/VersionSensorUnitServiceImpl.java | 20 ++
screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionDTO.java | 27 +++
screen-manage/src/main/resources/mapper/VersionSensorUnitMapper.xml | 16 ++
screen-manage/src/main/java/com/moral/api/service/VersionService.java | 27 +++
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 5
screen-manage/src/main/java/com/moral/api/mapper/VersionSensorUnitMapper.java | 16 ++
14 files changed, 461 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
index 1c37b3a..2681819 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
@@ -63,6 +63,11 @@
*/
private String isDelete;
+ @TableField(exist = false)
+ private String unit;
+
+ @TableField(exist = false)
+ private String unitKey;
@Override
protected Serializable pkVal() {
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Version.java b/screen-manage/src/main/java/com/moral/api/entity/Version.java
new file mode 100644
index 0000000..a6cd65c
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/entity/Version.java
@@ -0,0 +1,72 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Version extends Model<Version> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ������
+ */
+ private String name;
+
+ /**
+ * ������������
+ */
+ private Date createTime;
+
+ /**
+ * ������������
+ */
+ private Date updateTime;
+
+ /**
+ * ������������
+ */
+ private String isDelete;
+
+ /**
+ * ������
+ */
+ @TableField(value = "`desc`")
+ private String desc;
+
+ /*
+ * ���������������������
+ * */
+ private List<Sensor> sensors;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
new file mode 100644
index 0000000..402f9cf
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
@@ -0,0 +1,69 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * ������������������������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class VersionSensorUnit extends Model<VersionSensorUnit> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ������id
+ */
+ private Integer versionId;
+
+ /**
+ * ������code
+ */
+ private String sensorCode;
+
+ /**
+ * ������������key
+ */
+ private String unitKey;
+
+ /**
+ * ������������
+ */
+ private Date createTime;
+
+ /**
+ * ������������
+ */
+ private Date updateTime;
+
+ /**
+ * ������������
+ */
+ private String isDelete;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/VersionMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/VersionMapper.java
new file mode 100644
index 0000000..0c04d0c
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/mapper/VersionMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.Version;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ��������� Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-14
+ */
+public interface VersionMapper extends BaseMapper<Version> {
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/VersionSensorUnitMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/VersionSensorUnitMapper.java
new file mode 100644
index 0000000..6cf5a7f
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/mapper/VersionSensorUnitMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.VersionSensorUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * ������������������������������ Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-14
+ */
+public interface VersionSensorUnitMapper extends BaseMapper<VersionSensorUnit> {
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionDTO.java
new file mode 100644
index 0000000..89a1a80
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionDTO.java
@@ -0,0 +1,27 @@
+package com.moral.api.pojo.dto.version;
+
+import com.moral.api.entity.Sensor;
+import com.moral.api.entity.Version;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName VersionDTO
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/5/14 9:55
+ * @Version TODO
+ **/
+@Data
+public class VersionDTO {
+
+ private Integer code;
+
+ private String msg;
+
+ private Version version;
+
+ private List<Sensor> sensors;
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionQueryDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionQueryDTO.java
new file mode 100644
index 0000000..5872e03
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/version/VersionQueryDTO.java
@@ -0,0 +1,30 @@
+package com.moral.api.pojo.dto.version;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName VersionQueryDTO
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/5/14 9:59
+ * @Version TODO
+ **/
+@Data
+public class VersionQueryDTO {
+
+ private Integer code;
+
+ private String msg;
+
+ private long pages;
+
+ private long total;
+
+ private long current;
+
+ private long size;
+
+ private List<VersionDTO> versionDTOS;
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java
new file mode 100644
index 0000000..438174a
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/version/VersionQueryForm.java
@@ -0,0 +1,51 @@
+package com.moral.api.pojo.form.version;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Date;
+
+/**
+ * @ClassName VersionQueryForm
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/5/14 10:03
+ * @Version TODO
+ **/
+@Data
+public class VersionQueryForm {
+
+ private Integer page;
+
+ private Integer size;
+
+ private String name;
+
+ private String order;
+
+ private String orderType;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date createStartTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date createEndTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date updateStartTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date updateEndTime;
+
+ public boolean valid(){
+ if(ObjectUtils.isEmpty(page)||ObjectUtils.isEmpty(size))
+ return false;
+ return true;
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/VersionSensorUnitService.java b/screen-manage/src/main/java/com/moral/api/service/VersionSensorUnitService.java
new file mode 100644
index 0000000..aa70337
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/VersionSensorUnitService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.VersionSensorUnit;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ������������������������������ ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-14
+ */
+public interface VersionSensorUnitService extends IService<VersionSensorUnit> {
+
+}
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
new file mode 100644
index 0000000..dacc21f
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/VersionService.java
@@ -0,0 +1,27 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.Version;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.pojo.dto.version.VersionQueryDTO;
+import com.moral.api.pojo.form.version.VersionQueryForm;
+
+/**
+ * <p>
+ * ��������� ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-14
+ */
+public interface VersionService extends IService<Version> {
+
+ /**
+ * @Description: ������������������������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.version.VersionQueryDTO
+ * @Author: ���������
+ * @Date: 2021/5/14
+ */
+ VersionQueryDTO query(VersionQueryForm form);
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/VersionSensorUnitServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/VersionSensorUnitServiceImpl.java
new file mode 100644
index 0000000..e65cc87
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/VersionSensorUnitServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.VersionSensorUnit;
+import com.moral.api.mapper.VersionSensorUnitMapper;
+import com.moral.api.service.VersionSensorUnitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ������������������������������ ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-14
+ */
+@Service
+public class VersionSensorUnitServiceImpl extends ServiceImpl<VersionSensorUnitMapper, VersionSensorUnit> implements VersionSensorUnitService {
+
+}
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
new file mode 100644
index 0000000..c716f2e
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
@@ -0,0 +1,81 @@
+package com.moral.api.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
+import com.moral.api.entity.User;
+import com.moral.api.entity.Version;
+import com.moral.api.entity.VersionSensorUnit;
+import com.moral.api.mapper.VersionMapper;
+import com.moral.api.mapper.VersionSensorUnitMapper;
+import com.moral.api.pojo.dto.version.VersionQueryDTO;
+import com.moral.api.pojo.form.version.VersionQueryForm;
+import com.moral.api.service.VersionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.Constants;
+import com.moral.util.ConvertUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * ��������� ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-05-14
+ */
+@Service
+public class VersionServiceImpl extends ServiceImpl<VersionMapper, Version> implements VersionService {
+
+ @Autowired
+ VersionMapper versionMapper;
+ @Autowired
+ VersionSensorUnitMapper versionSensorUnitMapper;
+
+ @Override
+ public VersionQueryDTO query(VersionQueryForm form) {
+ //������������������
+ VersionQueryDTO dto = new VersionQueryDTO();
+ //������
+ Integer page = form.getPage();
+ Integer size = form.getSize();
+ String name = form.getName();
+ Date createStartTime = form.getCreateStartTime();
+ Date createEndTime = form.getCreateEndTime();
+ Date updateStartTime = form.getUpdateStartTime();
+ Date updateEndTime = form.getUpdateEndTime();
+ String order = form.getOrder();
+ String orderType = form.getOrderType();
+ //������������������
+ Page<Version> queryPage = new Page<>(page, size);
+ NullFilterWrapper<Version> wrapper = new NullFilterWrapper<>();
+ wrapper.like("name",name);
+ wrapper.between("create_time", createStartTime, createEndTime);
+ wrapper.between("update_time", updateStartTime, updateEndTime);
+ //������������������������
+ if (!ObjectUtils.isEmpty(order) && !ObjectUtils.isEmpty(orderType)) {
+ if (orderType.equals(Constants.ORDER_ASC))
+ wrapper.orderByAsc(ConvertUtils.toLine(order));
+ else
+ wrapper.orderByDesc(ConvertUtils.toLine(order));
+ }
+ //������������
+ Page<Version> versionsPage = versionMapper.selectPage(queryPage,wrapper);
+ List<Version> versions = versionsPage.getRecords();
+ //������������������������������������
+ List<Integer> versionsIds = new ArrayList<>();
+ versions.forEach(value->versionsIds.add(value.getId()));
+ if(!ObjectUtils.isEmpty(versionsIds)){
+ QueryWrapper<VersionSensorUnit> sensorUnitQueryWrapper = new QueryWrapper<>();
+
+ }
+
+ return null;
+ }
+}
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
new file mode 100644
index 0000000..b1581d7
--- /dev/null
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.VersionMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.Version">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="is_delete" property="isDelete" />
+ <result column="desc" property="desc" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/screen-manage/src/main/resources/mapper/VersionSensorUnitMapper.xml b/screen-manage/src/main/resources/mapper/VersionSensorUnitMapper.xml
new file mode 100644
index 0000000..97f6cc3
--- /dev/null
+++ b/screen-manage/src/main/resources/mapper/VersionSensorUnitMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.api.mapper.VersionSensorUnitMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.VersionSensorUnit">
+ <id column="id" property="id" />
+ <result column="version_id" property="versionId" />
+ <result column="sensor_code" property="sensorCode" />
+ <result column="unit_key" property="unitKey" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="is_delete" property="isDelete" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0