From bf5d1b405c759de3faa42af37b1f10f42823b105 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
index fb26cc6..b957aac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
@@ -7,10 +7,10 @@
import java.util.UUID;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.tencentcloud.COSManager;
@@ -117,7 +117,7 @@
}
int maxOrder = homeNavbarMapper.getMaxOrder();
record.setOrderby(maxOrder + 1);
-
+ record.setIsFixed(false);//鐩墠鏃犲浐瀹氶」
homeNavbarMapper.insert(record);
} else {
// 淇敼
@@ -138,6 +138,7 @@
record.setOrderby(resultObj.getOrderby());
record.setCreatetime(resultObj.getCreatetime());
record.setUpdatetime(new Date());
+ record.setIsFixed(false);//鐩墠鏃犲浐瀹氶」
homeNavbarMapper.updateByPrimaryKey(record);
}
}
@@ -305,6 +306,22 @@
public List<HomeNavbar> listQueryEffectiveNavbar() {
return homeNavbarMapper.listQueryEffective();
}
+
+
+ @Override
+ @Cacheable(value = "configCache", key = "'listQueryDefaultNavbar-'+#sex")
+ public List<HomeNavbar> listQueryDefaultNavbar(Integer sex) {
+ return homeNavbarMapper.listQueryDefaultNavbar(sex);
+ }
+
+
+
+
+ @Override
+ @Cacheable(value = "configCache", key = "'listQueryFixedNavbar'")
+ public List<HomeNavbar> listQueryFixedNavbar() {
+ return homeNavbarMapper.listQueryFixedNavbar();
+ }
@Override
public HomeNavbar getEffectiveByClassId(Long classId) {
--
Gitblit v1.8.0