From 3275947def6a4bf19f83dd5439206733899970cb Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 17 Jun 2021 11:40:56 +0800
Subject: [PATCH] screen-api 修改公式转换接口
---
screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java | 6 +++
screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java | 2 +
screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java | 41 +++++++++++++-------
screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java | 6 +++
screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java | 7 +++
5 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java b/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java
index f6a2994..348cd15 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java
+++ b/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;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java
index 93d7f83..2e68be0 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java
+++ b/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;
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
index 41d7a4f..3057cb7 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java
+++ b/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;
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java
index 3aa65f2..0093163 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java
+++ b/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;
+
+
}
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 5075715..a94e894 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
@@ -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());
--
Gitblit v1.8.0