From 2c9b203b574069ada650fd9e53115ed665adbc24 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 11 Jun 2021 10:40:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java | 81 ++++++++++++++++
screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java | 16 +++
screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml | 18 +++
screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java | 36 +++++++
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 3
screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java | 23 ++++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 89 +++++++++++++++++
7 files changed, 265 insertions(+), 1 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index 817af9c..110da4b 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -57,7 +57,8 @@
MAC_IS_EXIST(-42,"mac���������"),
URL_IS_EXIST(-43,"���������������"),
ORGANIZATION_EXIST_MONITORPOINT(-44,"���������������������������������"),
- CHILDREN_ORGANIZATION_EXIST_MONITORPOINT(-45,"������������������������������������")
+ CHILDREN_ORGANIZATION_EXIST_MONITORPOINT(-45,"������������������������������������"),
+ DEVICE_IS_NULL(-46, "���������������")
;
private final Integer code;
private final String msg;
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
new file mode 100644
index 0000000..89f5557
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
@@ -0,0 +1,36 @@
+package com.moral.api.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.DeviceAdjustValue;
+import com.moral.api.service.DeviceAdjustValueService;
+import com.moral.constant.ResultMessage;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@Slf4j
+@Api(tags = {"���������"})
+@RestController
+@RequestMapping("/deviceAdjustValue")
+public class DeviceAdjustValueController {
+
+ @Resource
+ private DeviceAdjustValueService deviceAdjustValueService;
+
+ @RequestMapping(value = "insertOneDeviceAdjustValue", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage insertOneDeviceAdjustValue(@RequestBody DeviceAdjustValue deviceAdjustValue) {
+ //DeviceAdjustValue deviceAdjustValue = JSON.parseObject(JSON.toJSONString(parameters), DeviceAdjustValue.class);
+ Map<String,Object> resultMap = deviceAdjustValueService.insertOne(deviceAdjustValue);
+ String msg = resultMap.get("msg").toString();
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java b/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
new file mode 100644
index 0000000..fd0b130
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java
@@ -0,0 +1,81 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DeviceAdjustValue extends Model<DeviceAdjustValue> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������
+ */
+ private Integer id;
+
+ /**
+ * ������id
+ */
+ private String mac;
+
+ /**
+ * ������������
+ */
+ @DateTimeFormat(pattern = "HH:mm")
+ @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
+ private Date startTime;
+
+ /**
+ * ������������
+ */
+ @DateTimeFormat(pattern = "HH:mm")
+ @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
+ private Date endTime;
+
+ /**
+ * ���������
+ */
+ private String sensorCode;
+
+ /**
+ * ������
+ */
+ private String value;
+
+ /**
+ * ������������
+ */
+ 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/DeviceAdjustValueMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java
new file mode 100644
index 0000000..b4cac09
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.DeviceAdjustValue;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-07
+ */
+public interface DeviceAdjustValueMapper extends BaseMapper<DeviceAdjustValue> {
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
new file mode 100644
index 0000000..e906f7f
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
@@ -0,0 +1,23 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.DeviceAdjustValue;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-07
+ */
+@Transactional
+public interface DeviceAdjustValueService extends IService<DeviceAdjustValue> {
+
+ @Transactional
+ Map<String, Object> insertOne(DeviceAdjustValue deviceAdjustValue);
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
new file mode 100644
index 0000000..8912001
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -0,0 +1,89 @@
+package com.moral.api.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.moral.api.entity.Device;
+import com.moral.api.entity.DeviceAdjustValue;
+import com.moral.api.entity.Sensor;
+import com.moral.api.mapper.DeviceAdjustValueMapper;
+import com.moral.api.mapper.DeviceMapper;
+import com.moral.api.mapper.SensorMapper;
+import com.moral.api.service.DeviceAdjustValueService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.LogUtils;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2021-06-07
+ */
+@Service
+public class DeviceAdjustValueServiceImpl extends ServiceImpl<DeviceAdjustValueMapper, DeviceAdjustValue> implements DeviceAdjustValueService {
+
+ @Autowired(required = false)
+ private DeviceAdjustValueMapper deviceAdjustValueMapper;
+
+ @Autowired(required = false)
+ private DeviceMapper deviceMapper;
+
+ @Autowired(required = false)
+ private SensorMapper sensorMapper;
+
+ @Autowired
+ LogUtils logUtils;
+
+ @Override
+ @Transactional
+ public Map<String, Object> insertOne(DeviceAdjustValue deviceAdjustValue) {
+ Map<String, Object> resultMap = new HashMap<>();
+ if (ObjectUtils.isEmpty(deviceAdjustValue.getMac())){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ if (ObjectUtils.isEmpty(deviceAdjustValue.getValue())||deviceAdjustValue.getValue().equals("")){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
+ wrapper_device.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_device.eq("mac",deviceAdjustValue.getMac());
+ if (deviceMapper.selectCount(wrapper_device)==0){
+ resultMap.put("code",ResponseCodeEnum.DEVICE_IS_NULL.getCode());
+ resultMap.put("msg",ResponseCodeEnum.DEVICE_IS_NULL.getMsg());
+ return resultMap;
+ }
+ QueryWrapper<Sensor> wrapper_sensor = new QueryWrapper<>();
+ wrapper_sensor.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_sensor.eq("code",deviceAdjustValue.getSensorCode());
+ if (sensorMapper.selectCount(wrapper_sensor)==0){
+ resultMap.put("code",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
+ return resultMap;
+ }
+ deviceAdjustValueMapper.insert(deviceAdjustValue);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������������:"+deviceAdjustValue+";";
+ logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
+ resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
+ }
+
+}
diff --git a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
new file mode 100644
index 0000000..be23d1c
--- /dev/null
+++ b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
@@ -0,0 +1,18 @@
+<?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.DeviceAdjustValueMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.DeviceAdjustValue">
+ <id column="id" property="id" />
+ <result column="device_id" property="deviceId" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="sensor_code" property="sensorCode" />
+ <result column="value" property="value" />
+ <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