From e17e3b7f70fa5abc8341e64f1ffce5813bae4bc3 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 21 三月 2024 18:02:43 +0800
Subject: [PATCH] 调整
---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsGeographyDataBo.java | 6 ++++++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java | 2 ++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsGeographyData.java | 5 +++++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java | 2 +-
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsGeographyDataVo.java | 8 +++++++-
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficAccidentServiceImpl.java | 2 ++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java | 2 ++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java | 2 +-
8 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsGeographyData.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsGeographyData.java
index 9d95b65..db61467 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsGeographyData.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsGeographyData.java
@@ -37,6 +37,11 @@
private String name;
/**
+ * 琛楅晣
+ */
+ private String townStreetName;
+
+ /**
* 鎻忚堪
*/
private String description;
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsGeographyDataBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsGeographyDataBo.java
index 4f25c50..4e67248 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsGeographyDataBo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsGeographyDataBo.java
@@ -39,6 +39,12 @@
private String name;
/**
+ * 琛楅晣
+ */
+ @NotBlank(message = "琛楅晣涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ private String townStreetName;
+
+ /**
* 鎻忚堪
*/
@NotBlank(message = "鎻忚堪涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java
index 270fe16..e5e9d59 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsPcrDataBo.java
@@ -46,7 +46,7 @@
@NotBlank(message = "鍛ㄦ湡涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String periodDate;
- private Date createDate;
+ private Date createTime;
/**
* 鎸囨爣1鍚嶇О
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsGeographyDataVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsGeographyDataVo.java
index 7799c71..c7fbc6e 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsGeographyDataVo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsGeographyDataVo.java
@@ -47,6 +47,12 @@
private String name;
/**
+ * 琛楅晣
+ */
+ @ExcelProperty(value = "琛楅晣")
+ private String townStreetName;
+
+ /**
* 鎻忚堪
*/
@ExcelProperty(value = "鎻忚堪")
@@ -55,7 +61,7 @@
/**
* 鏍囪鐘舵�� 1宸叉爣璁� 2鏈爣璁�
*/
- @ExcelProperty(value = "鏍囪鐘舵�� 1宸叉爣璁� 2鏈爣璁�")
+ @ExcelProperty(value = "鏍囪鐘舵��")
private Integer status;
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java
index 786da4b..4f4d4ec 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsPcrDataVo.java
@@ -51,7 +51,7 @@
private String periodDate;
@ExcelProperty(value = "鍒涘缓鏃堕棿")
- private Date createDate;
+ private Date createTime;
/**
* 鎸囨爣1鍚嶇О
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
index b36b02a..2f1aeb8 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
@@ -91,6 +91,7 @@
bo.setId(add.getId());
}
sysOssMapper.deleteByTenantId(bo.getId().toString());
+ bo.getImgList().forEach(tenant -> tenant.setTenantId(String.valueOf(bo.getId())));
sysOssMapper.insertBatch(bo.getImgList());
return flag;
}
@@ -102,6 +103,7 @@
public Boolean updateByBo(RsDangerInfoBo bo) {
RsDangerInfo update = MapstructUtils.convert(bo, RsDangerInfo.class);
sysOssMapper.deleteByTenantId(bo.getId().toString());
+ bo.getImgList().forEach(tenant -> tenant.setTenantId(String.valueOf(bo.getId())));
sysOssMapper.insertBatch(bo.getImgList());
return baseMapper.updateById(update) > 0;
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficAccidentServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficAccidentServiceImpl.java
index 98c65ee..638b3d5 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficAccidentServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficAccidentServiceImpl.java
@@ -87,6 +87,7 @@
bo.setId(add.getId());
}
sysOssMapper.deleteByTenantId(bo.getId());
+ bo.getSysOss().setTenantId(bo.getId());
sysOssMapper.insert(bo.getSysOss());
return flag;
}
@@ -98,6 +99,7 @@
public Boolean updateByBo(RsTrafficAccidentBo bo) {
RsTrafficAccident update = MapstructUtils.convert(bo, RsTrafficAccident.class);
sysOssMapper.deleteByTenantId(bo.getId());
+ bo.getSysOss().setTenantId(bo.getId());
sysOssMapper.insert(bo.getSysOss());
return baseMapper.updateById(update) > 0;
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java
index add9d61..9ff7cd0 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java
@@ -90,6 +90,7 @@
// baseMapper.addSequence(bo.getSequence(), bo.getId());
}
sysOssMapper.deleteByTenantId(bo.getId());
+ bo.getSysOss().setTenantId(bo.getId());
sysOssMapper.insert(bo.getSysOss());
return flag;
}
@@ -101,6 +102,7 @@
public Boolean updateByBo(RsTrafficPropagandaBo bo) {
RsTrafficPropaganda update = MapstructUtils.convert(bo, RsTrafficPropaganda.class);
sysOssMapper.deleteByTenantId(bo.getId());
+ bo.getSysOss().setTenantId(bo.getId());
sysOssMapper.insert(bo.getSysOss());
return baseMapper.updateById(update) > 0;
}
--
Gitblit v1.8.0