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

kaiyu

2021-09-01 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7

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

 screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java

New file
@@ -0,0 +1,40 @@
package com.moral.api.controller;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.moral.api.service.OrganizationLayoutService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Slf4j
@Api(tags = {"页面布局"})
@RestController
@RequestMapping("/organizationLayout")
public class OrganizationLayoutController {

    @Resource
    private OrganizationLayoutService organizationLayoutService;

    @RequestMapping(value = "getLayoutByMac", method = RequestMethod.GET)
    @ResponseBody
    public ResultMessage getLayoutByMac(HttpServletRequest request){
        Map<String,Object> parameters = WebUtils.getParametersStartingWith(request,null);
        if (ObjectUtils.isEmpty(parameters.get("mac"))){
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String,Object> resultMap = organizationLayoutService.getLayoutByMac(parameters.get("mac").toString());
        if (ObjectUtils.isEmpty(resultMap)){
            return null;
        }
        return ResultMessage.ok(resultMap);
    }
}

 screen-api/src/main/java/com/moral/api/entity/OrganizationLayout.java

New file
@@ -0,0 +1,74 @@
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-08-31
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class OrganizationLayout extends Model<OrganizationLayout> {

    private static final long serialVersionUID = 1L;

    /**
     * id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 组织id
     */
    private Integer organizationId;

    /**
     * 型号id
     */
    private Integer versionId;

    /**
     * 区域
     */
    private String position;

    /**
     * 区域位置
     */
    private Integer positionIndex;

    /**
     * 因子编码
     */
    private String sensorCode;

    /**
     * 创建时间
     */
    private Date createTime;

    /**
     * 是否删除
     */
    private String isDelete;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}

 screen-api/src/main/java/com/moral/api/mapper/OrganizationLayoutMapper.java

New file
@@ -0,0 +1,16 @@
package com.moral.api.mapper;

import com.moral.api.entity.OrganizationLayout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author moral
 * @since 2021-08-31
 */
public interface OrganizationLayoutMapper extends BaseMapper<OrganizationLayout> {

}

 screen-api/src/main/java/com/moral/api/service/OrganizationLayoutService.java

New file
@@ -0,0 +1,29 @@
package com.moral.api.service;

import com.moral.api.entity.OrganizationLayout;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.transaction.annotation.Transactional;

import java.util.Map;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author moral
 * @since 2021-08-31
 */
public interface OrganizationLayoutService extends IService<OrganizationLayout> {

    /**
      *@Description: 通过mac获取页面布局
      *@Param: [mac]
      *@return: java.util.Map<java.lang.String,java.lang.Object>
      *@Author: lizijie
      *@Date: 2021/8/31 15:12
     **/
    @Transactional
    Map<String, Object> getLayoutByMac(String mac);

}

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

New file
@@ -0,0 +1,108 @@
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.OrganizationLayout;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.OrganizationLayoutMapper;
import com.moral.api.service.OrganizationLayoutService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author moral
 * @since 2021-08-31
 */
@Service
public class OrganizationLayoutServiceImpl extends ServiceImpl<OrganizationLayoutMapper, OrganizationLayout> implements OrganizationLayoutService {

    @Autowired(required = false)
    private OrganizationLayoutMapper organizationLayoutMapper;

    @Autowired(required = false)
    private DeviceMapper deviceMapper;

    @Transactional
    @Override
    public Map<String, Object> getLayoutByMac(String mac) {
        QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
        wrapper_device.eq("is_delete",Constants.NOT_DELETE);
        wrapper_device.eq("mac",mac);
        Device device = deviceMapper.selectOne(wrapper_device);
        if (ObjectUtils.isEmpty(device)){
            return null;
        }
        int organizationId = device.getOrganizationId();
        int versionId = device.getDeviceVersionId();
        QueryWrapper<OrganizationLayout> wrapper_organizationLayout = new QueryWrapper<>();
        wrapper_organizationLayout.eq("organization_id",organizationId);
        wrapper_organizationLayout.eq("version_id",versionId);
        wrapper_organizationLayout.eq("is_delete",Constants.NOT_DELETE);
        List<OrganizationLayout> organizationLayouts = organizationLayoutMapper.selectList(wrapper_organizationLayout);
        if (ObjectUtils.isEmpty(organizationLayouts) || organizationLayouts.size()==0){
            return null;
        }
        Map<String, Object> resultMap = new HashMap<>();
        List<OrganizationLayout> chartSensorKeyList = new ArrayList<>();
        List<OrganizationLayout> coreMonitorItemsList = new ArrayList<>();
        List<OrganizationLayout> defaultMonitorItemsList = new ArrayList<>();
        List<OrganizationLayout> fixedMonitorItemsList = new ArrayList<>();
        for (OrganizationLayout organizationgLayout:organizationLayouts) {
            if (organizationgLayout.getPosition().equals("chartSensorKey")){
                chartSensorKeyList.add(organizationgLayout);
            }
            if (organizationgLayout.getPosition().equals("coreMonitorItems")){
                coreMonitorItemsList.add(organizationgLayout);
            }
            if (organizationgLayout.getPosition().equals("defaultMonitorItems")){
                defaultMonitorItemsList.add(organizationgLayout);
            }
            if (organizationgLayout.getPosition().equals("fixedMonitorItems")){
                fixedMonitorItemsList.add(organizationgLayout);
            }
        }
        chartSensorKeyList = sort(chartSensorKeyList);
        coreMonitorItemsList = sort(coreMonitorItemsList);
        defaultMonitorItemsList = sort(defaultMonitorItemsList);
        fixedMonitorItemsList = sort(fixedMonitorItemsList);
        resultMap.put("chartSensorKey",chartSensorKeyList);
        resultMap.put("coreMonitorItems",coreMonitorItemsList);
        resultMap.put("defaultMonitorItems",defaultMonitorItemsList);
        resultMap.put("fixedMonitorItems",fixedMonitorItemsList);
        return resultMap;
    }

    private List<OrganizationLayout> sort(List<OrganizationLayout> list){
        if (list.size() < 0){
            return list;
        }
        OrganizationLayout temp = null;
        int j;
        for (int i = 1; i<list.size(); i++){
            temp = list.get(i);
            for (j=i-1; j>=0; j--){
                if (list.get(j).getPositionIndex()>temp.getPositionIndex()){
                    list.set(j+1,list.get(j));
                }else {
                    break;
                }
            }
            System.out.println(list.get(0));
            list.set(j+1,temp);
        }
        return list;
    }
}

 screen-api/src/main/resources/mapper/OrganizationLayoutMapper.xml

New file
@@ -0,0 +1,17 @@
<?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.OrganizationLayoutMapper">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.moral.api.entity.OrganizationLayout">
                    <id column="id" property="id" />
                    <result column="organization_id" property="organizationId" />
                    <result column="version_id" property="versionId" />
                    <result column="position" property="position" />
                    <result column="position_index" property="positionIndex" />
                    <result column="sensor_code" property="sensorCode" />
                    <result column="create_time" property="createTime" />
                    <result column="is_delete" property="isDelete" />
        </resultMap>

</mapper>

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

@@ -143,6 +143,7 @@
        }
        //刷新deviceInfo缓存
        CacheUtils.refreshDeviceAlarmInfo();
        CacheUtils.refreshSpecialDeviceAlarmInfo();
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "修改因子:" + oldSensor.getName() + ";";
        for (Object key : updateSensorMap.keySet()) {

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

@@ -447,7 +447,7 @@
        Integer orgId = specialDevice.getOrganizationId();
        deleteOrganizationUnitAlarm(orgId, versionId);
        //刷新deviceInfo缓存
        CacheUtils.refreshDeviceAlarmInfo();
        CacheUtils.refreshSpecialDeviceAlarmInfo();
        //操作日志记录
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        StringBuilder content = new StringBuilder();
@@ -511,6 +511,9 @@
        Organization organization = organizationMapper.selectById(specialDevice.getOrganizationId());
        orgInfo.put("id", organization.getId());
        orgInfo.put("name", organization.getName());
        orgInfo.put("areaCode", organization.getAreaCode());
        orgInfo.put("cityCode", organization.getCityCode());
        orgInfo.put("provinceCode", organization.getProvinceCode());
        specialDeviceInfo.put("organization", orgInfo);

        setDeviceInfoToRedis(mac, specialDeviceInfo);