screen-api 修改公式转换接口

kaiyu

2021-06-17 3275947def6a4bf19f83dd5439206733899970cb

screen-api
          修改公式转换接口

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

@@ -45,6 +45,11 @@
     */
    private String formula;

    /*
     * 因子code
     * */
    private String sensorCode;

    /**
     * 创建时间
     */
@@ -61,6 +66,7 @@
    private String isDelete;



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

 screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java

@@ -28,6 +28,11 @@
    * */
    private String formula;

    /*
    * 使用因子code，如果为null则为通用
    * */
    private String sensorCode;

    public boolean valid(){
        if(
                ObjectUtils.isEmpty(originalUnitKey)||
@@ -43,6 +48,7 @@
        unitConversion.setOriginalUnitKey(originalUnitKey);
        unitConversion.setTargetUnitKey(targetUnitKey);
        unitConversion.setFormula(formula);
        unitConversion.setSensorCode(sensorCode);
        return unitConversion;
    }


 screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java

@@ -31,6 +31,7 @@

    private long size;


    private List<UnitConversionVO> unitConversions;

    public static UnitConversionQueryVO convert(UnitConversionQueryDTO dto) {
@@ -64,6 +65,7 @@
        vo.setOriginalUnitName(originalUnit.getDataValue());
        vo.setTargetUnitName(targetUnit.getDataValue());
        vo.setFormula(unitConversion.getFormula());
        vo.setSensorCode(unitConversion.getSensorCode());
        return vo;
    }


 screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java

@@ -43,6 +43,11 @@
     */
    private String formula;

    /*
    * 因子code
    * */
    private String sensorCode;

    /**
     * 创建时间
     */
@@ -52,4 +57,6 @@
     * 更新时间
     */
    private String updateTime;


}

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

@@ -48,19 +48,30 @@
    @Transactional
    public UnitConversionDTO insertUnitConversion(UnitConversionInsertForm form) {
        //创建返回对象
        UnitConversionDTO dto  = new UnitConversionDTO();
        UnitConversionDTO dto = new UnitConversionDTO();
        //取参
        UnitConversion unitConversion = form.formConvertEntity();
        //判断原单位和目标单位计算公式是否已经存在于数据库
        QueryWrapper existWrapper = new QueryWrapper();
        existWrapper.eq("original_unit_key",unitConversion.getOriginalUnitKey());
        existWrapper.eq("target_unit_key",unitConversion.getTargetUnitKey());
        existWrapper.eq("is_delete",Constants.NOT_DELETE);
        UnitConversion existConversion = unitConversionMapper.selectOne(existWrapper);
        if(!ObjectUtils.isEmpty(existConversion)){
            dto.setCode(ResponseCodeEnum.UNIT_CONVERSION_EXIST.getCode());
            dto.setMsg(ResponseCodeEnum.UNIT_CONVERSION_EXIST.getMsg());
            return dto;
        QueryWrapper<UnitConversion> existWrapper = new QueryWrapper();
        existWrapper.eq("original_unit_key", unitConversion.getOriginalUnitKey());
        existWrapper.eq("target_unit_key", unitConversion.getTargetUnitKey());
        existWrapper.eq("is_delete", Constants.NOT_DELETE);
        List<UnitConversion> unitConversions = unitConversionMapper.selectList(existWrapper);
        if (ObjectUtils.isEmpty(unitConversion.getSensorCode())) {
            if (!ObjectUtils.isEmpty(unitConversions)) {
                dto.setCode(ResponseCodeEnum.UNIT_CONVERSION_EXIST.getCode());
                dto.setMsg(ResponseCodeEnum.UNIT_CONVERSION_EXIST.getMsg());
                return dto;
            }
        }
        if (!ObjectUtils.isEmpty(unitConversion.getSensorCode())) {
            for (UnitConversion conversion : unitConversions) {
                if (ObjectUtils.isEmpty(conversion.getSensorCode())||conversion.getSensorCode().equals(unitConversion.getSensorCode())) {
                    dto.setCode(ResponseCodeEnum.UNIT_CONVERSION_EXIST.getCode());
                    dto.setMsg(ResponseCodeEnum.UNIT_CONVERSION_EXIST.getMsg());
                    return dto;
                }
            }
        }
        //插入数据
        unitConversionMapper.insert(unitConversion);
@@ -85,8 +96,8 @@
        //组装查询条件
        Page<UnitConversion> queryPage = new Page<>(page, size);
        NullFilterWrapper<UnitConversion> wrapper = new NullFilterWrapper<>();
        wrapper.eq("original_unit_key",originalUnitKey);
        wrapper.eq("target_unit_key",targetUnitKey);
        wrapper.eq("original_unit_key", originalUnitKey);
        wrapper.eq("target_unit_key", targetUnitKey);
        //排序顺序条件构造
        if (!ObjectUtils.isEmpty(order) && !ObjectUtils.isEmpty(orderType)) {
            if (orderType.equals(Constants.ORDER_ASC))
@@ -162,9 +173,9 @@
        oldUnitConversion = unitConversionMapper.selectOne(oldWrapper);
        //执行逻辑删除
        UpdateWrapper deleteWrapper = new UpdateWrapper();
        deleteWrapper.set("is_delete",Constants.DELETE);
        deleteWrapper.eq("id",id);
        unitConversionMapper.update(null,deleteWrapper);
        deleteWrapper.set("is_delete", Constants.DELETE);
        deleteWrapper.eq("id", id);
        unitConversionMapper.update(null, deleteWrapper);
        //封装返回对象
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());