Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-11 2c9b203b574069ada650fd9e53115ed665adbc24

Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

 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;

 screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java

New file
@@ -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());
    }

}

 screen-manage/src/main/java/com/moral/api/entity/DeviceAdjustValue.java

New file
@@ -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;
    }

}

 screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java

New file
@@ -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> {

}

 screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java

New file
@@ -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);

}

 screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java

New file
@@ -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;
    }

}

 screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml

New file
@@ -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>