From c15f235aba0297dade5b3c6b2df633136f317158 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 12 May 2021 13:15:57 +0800 Subject: [PATCH] screen-manage 增加单位转换模块更新功能 --- screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java | 15 +++++++ screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionUpdateForm.java | 33 ++++++++++++++++ screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java | 25 ++++++++++++ screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java | 10 +++++ 4 files changed, 82 insertions(+), 1 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java b/screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java index a5f8390..8d75c25 100644 --- a/screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java +++ b/screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java @@ -4,6 +4,7 @@ import com.moral.api.pojo.dto.unitConversion.UnitConversionQueryDTO; import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm; import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm; +import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm; import com.moral.api.pojo.vo.unitConversion.UnitConversionQueryVO; import com.moral.api.service.UnitConversionService; import com.moral.constant.ResponseCodeEnum; @@ -58,4 +59,18 @@ return new ResultMessage(dto.getCode(), dto.getMsg(), vo); } + + @PostMapping("update") + public ResultMessage update(@RequestBody UnitConversionUpdateForm form){ + + //������������������������ + if (!form.valid()) + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), + ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + + //������������������ + UnitConversionDTO dto = unitConversionService.updateUnitConversion(form); + + return new ResultMessage(dto.getCode(), dto.getMsg(), null); + } } diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionUpdateForm.java new file mode 100644 index 0000000..6c8bbea --- /dev/null +++ b/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionUpdateForm.java @@ -0,0 +1,33 @@ +package com.moral.api.pojo.form.unitConversion; + +import com.moral.api.entity.UnitConversion; +import lombok.Data; +import org.springframework.util.ObjectUtils; + +/** + * @ClassName UnitConversionUpdateForm + * @Description TODO + * @Author ��������� + * @Date 2021/5/12 11:39 + * @Version TODO + **/ +@Data +public class UnitConversionUpdateForm { + + private Integer id; + + private String formula; + + public boolean valid(){ + if(ObjectUtils.isEmpty(formula)) + return false; + return true; + } + + public UnitConversion formConvertEntity(){ + UnitConversion unitConversion = new UnitConversion(); + unitConversion.setId(id); + unitConversion.setFormula(formula); + return unitConversion; + } +} diff --git a/screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java b/screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java index a2a539c..ed33a55 100644 --- a/screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java +++ b/screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java @@ -6,6 +6,7 @@ import com.moral.api.pojo.dto.unitConversion.UnitConversionQueryDTO; import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm; import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm; +import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm; /** * <p> @@ -35,4 +36,13 @@ */ UnitConversionQueryDTO queryUnitConversion(UnitConversionQueryForm form); + /** + * @Description: ������������������������ + * @Param: [form] + * @return: com.moral.api.pojo.dto.unitConversion.UnitConversionDTO + * @Author: ��������� + * @Date: 2021/5/12 + */ + UnitConversionDTO updateUnitConversion(UnitConversionUpdateForm form); + } diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java index 16ff9d1..ca6a3ee 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java @@ -10,15 +10,16 @@ import com.moral.api.pojo.dto.unitConversion.UnitConversionQueryDTO; import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm; import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm; +import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm; import com.moral.api.service.SysDictDataService; import com.moral.api.service.UnitConversionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.moral.constant.Constants; import com.moral.constant.ResponseCodeEnum; import com.moral.util.ConvertUtils; -import net.bytebuddy.description.method.ParameterList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import java.util.ArrayList; @@ -42,6 +43,7 @@ SysDictDataService sysDictDataService; @Override + @Transactional public UnitConversionDTO insertUnitConversion(UnitConversionInsertForm form) { //������������������ UnitConversionDTO dto = new UnitConversionDTO(); @@ -120,4 +122,25 @@ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); return dto; } + + @Override + @Transactional + public UnitConversionDTO updateUnitConversion(UnitConversionUpdateForm form) { + //������������������ + UnitConversionDTO dto = new UnitConversionDTO(); + //������ + UnitConversion unitConversion = form.formConvertEntity(); + //������������������������ ������������������ + QueryWrapper<UnitConversion> oldWrapper = new QueryWrapper<>(); + UnitConversion oldUnitConversion = new UnitConversion(); + oldUnitConversion.setId(unitConversion.getId()); + oldUnitConversion.setIsDelete(Constants.NOT_DELETE); + oldUnitConversion = unitConversionMapper.selectOne(oldWrapper); + //������ + unitConversionMapper.updateById(unitConversion); + //������������������ + dto.setCode(ResponseCodeEnum.SUCCESS.getCode()); + dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); + return dto; + } } -- Gitblit v1.8.0