WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch: 添加id内容
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
筱锋xiao_lfeng 2024-02-04 00:54:28 +08:00
parent b2a268ff29
commit f0fcfba065
Signed by: XiaoLFeng
GPG Key ID: F693AA12AABBFA87
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/jsl/oa/dao/InfoDAO.java
View File

@ -39,7 +39,7 @@ public class InfoDAO {
log.info("\t\t> 从 MySQL 获取数据"); log.info("\t\t> 从 MySQL 获取数据");
String getCarouselSql = infoMapper.getCarousel(); String getCarouselSql = infoMapper.getCarousel();
CarouselDO getCarousel = null; CarouselDO getCarousel = null;
if (getCarouselSql != null && !getCarouselSql.equals("{}")) { if (getCarouselSql != null && !"{}".equals(getCarouselSql)) {
getCarousel = gson.fromJson(getCarouselSql, CarouselDO.class); getCarousel = gson.fromJson(getCarouselSql, CarouselDO.class);
} }
if (getCarousel == null) { if (getCarousel == null) {
@ -54,13 +54,17 @@ public class InfoDAO {
} }
// 获取排序 // 获取排序
sortCarousel(getCarousel); sortCarousel(getCarousel);
// 添加id
for (int i = 0; i < getCarousel.getData().size(); i++) {
getCarousel.getData().get(i).setId(i + 1);
}
return getCarousel; return getCarousel;
} }
private void sortCarousel(CarouselDO getCarousel) { private void sortCarousel(CarouselDO getCarousel) {
for (int i = 0; i < getCarousel.getData().size(); i++) { for (int i = 0; i < getCarousel.getData().size(); i++) {
for (int j = 0; j < getCarousel.getData().size(); j++) { for (int j = 0; j < getCarousel.getData().size(); j++) {
if (getCarousel.getOrder().equals("desc")) { if ("desc".equals(getCarousel.getOrder())) {
if (getCarousel.getData().get(i).getDisplayOrder() > getCarousel.getData().get(j).getDisplayOrder()) { if (getCarousel.getData().get(i).getDisplayOrder() > getCarousel.getData().get(j).getDisplayOrder()) {
Collections.swap(getCarousel.getData(), i, j); Collections.swap(getCarousel.getData(), i, j);
} }
@ -84,6 +88,10 @@ public class InfoDAO {
public boolean setCarousel(CarouselDO carouselDO) { public boolean setCarousel(CarouselDO carouselDO) {
log.info("\t> 执行 DAO 层 InfoDAO.setCarousel 方法"); log.info("\t> 执行 DAO 层 InfoDAO.setCarousel 方法");
sortCarousel(carouselDO); sortCarousel(carouselDO);
// 添加id
for (int i = 0; i < carouselDO.getData().size(); i++) {
carouselDO.getData().get(i).setId(i + 1);
}
String setCarouselSql = gson.toJson(carouselDO); String setCarouselSql = gson.toJson(carouselDO);
log.info("\t\t> 从 MySQL 获取数据"); log.info("\t\t> 从 MySQL 获取数据");
return infoMapper.setCarousel(setCarouselSql); return infoMapper.setCarousel(setCarouselSql);

1
src/main/java/com/jsl/oa/model/doData/info/CarouselDO.java
View File

@ -22,6 +22,7 @@ public class CarouselDO {
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public static class DataDO { public static class DataDO {
private Integer id;
private Integer displayOrder; private Integer displayOrder;
private String image; private String image;
private String title; private String title;