From 7aac89af7c8b8a633cb0a0c870e81724b0ec5def Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 03 二月 2023 10:54:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/common/service/impl/CommonServiceImpl.java | 5 +++++
src/main/java/com/hx/common/service/impl/CommonDaoImpl.java | 5 +++++
src/main/java/com/hx/util/DateUtil.java | 8 ++++----
src/main/java/com/hx/common/service/CommonService.java | 7 +++++++
src/main/java/com/hx/common/dao/CommonDao.java | 7 +++++++
5 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/hx/common/dao/CommonDao.java b/src/main/java/com/hx/common/dao/CommonDao.java
index ddc43e8..9333082 100644
--- a/src/main/java/com/hx/common/dao/CommonDao.java
+++ b/src/main/java/com/hx/common/dao/CommonDao.java
@@ -20,6 +20,13 @@
*/
<T extends Serializable> int insert(Class<?> mapperClass, T entity);
+ /**鏂板锛岃繑鍥炰富閿�
+ * @param mapperClass mapper绫�
+ * @param entity 瀹炰綋绫�
+ * @return 鏉℃暟
+ */
+ <T extends Serializable> int insertById(Class<?> mapperClass, T entity);
+
/**鏌ヨ鏉℃暟
* @param mapperClass mapper绫�
* @param sqlSentence 鏌ヨ鍙傛暟绫�
diff --git a/src/main/java/com/hx/common/service/CommonService.java b/src/main/java/com/hx/common/service/CommonService.java
index d2b0642..81e1adb 100644
--- a/src/main/java/com/hx/common/service/CommonService.java
+++ b/src/main/java/com/hx/common/service/CommonService.java
@@ -20,6 +20,13 @@
*/
<T extends Serializable> int insert(Class<?> mapperClass, T entity);
+ /**鏂板锛岃繑鍥炰富閿�
+ * @param mapperClass mapper绫�
+ * @param entity 瀹炰綋绫�
+ * @return 鏉℃暟
+ */
+ <T extends Serializable> int insertById(Class<?> mapperClass, T entity);
+
/**鏌ヨ鏉℃暟
* @param mapperClass mapper绫�
* @param sqlSentence 鏌ヨ鍙傛暟绫�
diff --git a/src/main/java/com/hx/common/service/impl/CommonDaoImpl.java b/src/main/java/com/hx/common/service/impl/CommonDaoImpl.java
index 32fdd9a..8ccd28d 100644
--- a/src/main/java/com/hx/common/service/impl/CommonDaoImpl.java
+++ b/src/main/java/com/hx/common/service/impl/CommonDaoImpl.java
@@ -29,6 +29,11 @@
return sqlSessionFactory.openSession().insert(getStatement(mapperClass,"insert"),entity);
}
+ @Override
+ public <T extends Serializable> int insertById(Class<?> mapperClass, T entity) {
+ return sqlSessionFactory.openSession().insert(getStatement(mapperClass,"insertById"),entity);
+ }
+
/**鑾峰彇鏉℃暟
* @return*/
@Override
diff --git a/src/main/java/com/hx/common/service/impl/CommonServiceImpl.java b/src/main/java/com/hx/common/service/impl/CommonServiceImpl.java
index ec5b0f4..22108d6 100644
--- a/src/main/java/com/hx/common/service/impl/CommonServiceImpl.java
+++ b/src/main/java/com/hx/common/service/impl/CommonServiceImpl.java
@@ -25,6 +25,11 @@
return commonDao.insert(mapperClass,entity);
}
+ @Override
+ public <T extends Serializable> int insertById(Class<?> mapperClass, T entity) {
+ return commonDao.insertById(mapperClass,entity);
+ }
+
/**鑾峰彇鏉℃暟*/
@Override
public <T extends Serializable> int selectCount(Class<?> mapperClass,SqlSentence sqlSentence) {
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index a52169c..ddefebf 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -455,7 +455,7 @@
* endTime姣攕tartTime澶氱殑澶╂暟
* @param startTime 鏈�灏忔椂闂�
* @param endTime 鏈�澶ф椂闂�
- * @return
+ * @return 杩斿洖
*/
public static Integer differDay(Date startTime,Date endTime){
Calendar cal1 = Calendar.getInstance();
@@ -500,8 +500,7 @@
}
/**鎶婄杞崲鎴怷澶鏃禭鍒哫绉�*/
- public static String getChineseStr(Integer second)
- {
+ public static String getChineseStr(Integer second) {
int day = 24 * 60 * 60;
int hour = 60 * 60;
int min = 60;
@@ -695,6 +694,7 @@
cal.roll(Calendar.DATE, -1);
return cal.getActualMaximum(Calendar.DATE);
}
+
/**鑾峰彇鏈堜唤鐨勫ぉ鏁�
* @param year 骞翠唤
* @param month 鏈堜唤
@@ -712,7 +712,7 @@
/**鑾峰彇鏈堜唤鐨勫ぉ鏁�
* @param yearMonth 骞存湀
* @param format 鏃堕棿鏍煎紡
- * @return
+ * @return 杩斿洖
*/
public static int getMonthDays(String yearMonth,String format) {
SimpleDateFormat sdf = new SimpleDateFormat(format);
--
Gitblit v1.8.0