screen-manage 增加根据型号id获取因子接口

kaiyu

2021-06-10 1695bad22d612d8e33e9c7be28c53106c8318a62

screen-manage
                 增加根据型号id获取因子接口

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

@@ -105,10 +105,13 @@
        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }

    @GetMapping("test")
    public ResultMessage test(){
        System.out.println(TokenUtils.getCurrentToken());
        return null;


    @GetMapping("queryById")
    public ResultMessage queryById(Integer id){
        VersionDTO dto = versionService.queryVersionById(id);
        VersionVO vo = VersionVO.convert(dto);
        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
    }

}

 screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionVO.java

@@ -1,9 +1,16 @@
package com.moral.api.pojo.vo.Version;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.Version;
import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.vo.sensor.SensorVO;
import com.moral.util.DateUtils;
import lombok.Data;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -30,4 +37,44 @@
    private String desc;

    private List<SensorVO> sensors;

    public static VersionVO convert(VersionDTO dto){
        return convertToQueryPage(dto);
    }

    private static VersionVO convertToQueryPage(VersionDTO dto) {
        VersionVO vo = new VersionVO();
        Version version = dto.getVersion();
        Integer id = version.getId();
        String desc = version.getDesc();
        String name = version.getName();
        Date createTime = version.getCreateTime();
        Date updateTime = version.getUpdateTime();
        List<Sensor> sensors = version.getSensors();
        List<SensorVO> sensorVOS = new ArrayList<>();
        if(!ObjectUtils.isEmpty(sensors)){
            for (Sensor sensor : sensors) {
                SensorVO sensorVO = convertToSensorVO(sensor);
                sensorVOS.add(sensorVO);
            }
        }
        vo.setId(id);
        vo.setDesc(desc);
        vo.setName(name);
        vo.setCreateTime(DateUtils.dateToDateString(createTime,"yyyy-MM-dd"));
        vo.setUpdateTime(DateUtils.dateToDateString(updateTime,"yyyy-MM-dd"));
        vo.setSensors(sensorVOS);
        return vo;
    }

    private static SensorVO convertToSensorVO(Sensor sensor) {
        SensorVO vo = new SensorVO();
        vo.setName(sensor.getName());
        vo.setId(sensor.getId());
        vo.setUnit(sensor.getUnit());
        vo.setUpper(sensor.getUpper());
        vo.setLower(sensor.getLower());
        vo.setUnitKey(sensor.getUnitKey());
        return vo;
    }
}

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

@@ -61,4 +61,14 @@
            */
    VersionDTO updateSensorUnits(VersionSensorUnitForm form);


    /**
    * @Description: 根据型号id查询对应的因子
            * @Param: [id]
            * @return: com.moral.api.pojo.dto.version.VersionDTO
            * @Author: 陈凯裕
            * @Date: 2021/6/9
            */
    VersionDTO queryVersionById(Integer id);

}

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

@@ -120,7 +120,6 @@

        //获取token 并且存入缓存
        String token = TokenUtils.getToken(String.valueOf(manageAccount.getId()), accountInfoDTO);

        //封装返回结果
        loginDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
        loginDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());

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

@@ -202,4 +202,20 @@
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }

    @Override
    public VersionDTO queryVersionById(Integer id) {
        //创建返回对象
        VersionDTO dto = new VersionDTO();
        //查询版本对应的因子和单位
        List<Integer> versionsIds = new ArrayList<>();
        versionsIds.add(id);
        List<Version> version = new ArrayList<>();
        version = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
        //封装返回对象
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        dto.setVersion(version.get(0));
        return dto;
    }
}