From c9021afa8f8a42a141540e202687c5b4b3582503 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 25 May 2020 17:23:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=20-=20banner?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E5=8F=8A=E5=BF=97=E6=84=BF=E8=80=85=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/NumConstant.java | 1 + .../esua/epdc/activity/ActBannerDTO.java | 7 +++-- .../controller/ActBannerController.java | 7 +++-- .../modules/activity/dao/ActBannerDao.java | 26 +++++++++++++------ .../activity/entity/ActBannerEntity.java | 6 ++++- .../activity/service/ActBannerService.java | 4 +-- .../service/impl/ActBannerServiceImpl.java | 22 +++++++++++----- .../mapper/activity/ActBannerDao.xml | 21 ++++++++++----- .../resources/mapper/VolunteerInfoDao.xml | 4 +-- 9 files changed, 67 insertions(+), 31 deletions(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java index de7a5042..eec5c228 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java @@ -14,6 +14,7 @@ public interface NumConstant { int TWO = 2; int THREE = 3; int FOUR = 4; + int FIVE = 5; int SIX = 6; int ONE_NEG = -1; diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java index fcf5644e..1bfff225 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java @@ -98,5 +98,8 @@ public class ActBannerDTO implements Serializable { */ private Date createdTime; - -} \ No newline at end of file + /** + * banner排序 + */ + private String sort; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java index a0a9a2ad..40d0d321 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java @@ -46,7 +46,7 @@ import java.util.Map; @RestController @RequestMapping("actbanner") public class ActBannerController { - + @Autowired private ActBannerService actBannerService; @@ -78,8 +78,7 @@ public class ActBannerController { public Result save(@RequestBody ActBannerDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actBannerService.save(dto); - return new Result(); + return actBannerService.save(dto); } @PutMapping @@ -104,4 +103,4 @@ public class ActBannerController { ExcelUtils.exportExcelToTarget(response, null, list, ActBannerExcel.class); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java index 19006032..d5741774 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java @@ -67,12 +67,22 @@ public interface ActBannerDao extends BaseDao { */ void updateBannerByActId(String actId); - /** - * @Description: 手机端banner查询，根据创建时间 正序排列 - * @Param: [params] - * @return: java.util.List - * @Author: zy - * @Date: 2020-02-08 - */ + /** + * @Description: 手机端banner查询，根据创建时间 正序排列 + * @Param: [params] + * @return: java.util.List + * @Author: zy + * @Date: 2020-02-08 + */ List getAppActBannerlist(Map params); -} \ No newline at end of file + + /** + * 获取已经上架的banner数量 + * + * @param + * @return int + * @Author zhangyong + * @Date 16:47 2020-05-25 + **/ + int getBannerStatusNumber(); +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java index ac696aad..7e895f91 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java @@ -87,4 +87,8 @@ public class ActBannerEntity extends BaseEpdcEntity { */ private Long deptId; -} \ No newline at end of file + /** + * banner排序 + */ + private String sort; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java index 40b4d88c..63d381ae 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java @@ -77,7 +77,7 @@ public interface ActBannerService extends BaseService { * @author generator * @date 2019-12-19 */ - void save(ActBannerDTO dto); + Result save(ActBannerDTO dto); /** * 默认更新 @@ -130,4 +130,4 @@ public interface ActBannerService extends BaseService { * @since 2020/2/6 21:22 */ void takeOffBannerByActId(String actId); -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java index 4a16fe7b..19559958 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -101,10 +102,13 @@ public class ActBannerServiceImpl extends BaseServiceImpl baseDao.getBannerStatusNumber()) { + updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_GROUNDING); + updateById(updateEntity); + } else { + return new Result().error("Banner上架数量不能超过5条"); + } // 下架 } else if (ActStateConstant.ACT_BANNER_STATUS_GROUNDING.equals(entity.getStatus())) { updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_UNDERCARRIAGE); @@ -115,9 +119,15 @@ public class ActBannerServiceImpl extends BaseServiceImpl baseDao.getBannerStatusNumber()) { + insert(entity); + } else { + return new Result().error("Banner上架数量不能超过5条"); + } + return new Result(); } @Override diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml index 096b6f50..3b655831 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml @@ -21,6 +21,7 @@ + - \ No newline at end of file + + + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index 73ba68b5..6b3201d2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -178,8 +178,8 @@ DATE_FORMAT(NOW(),'%Y-%m-%d') generate_date, vi.ID volunteer_id, vi.USER_ID, - eu.FACE_IMG, - eu.NICKNAME, + vi.VOLUNTEER_FACE_IMG as FACE_IMG, + vi.VOLUNTEER_NICKNAME as NICKNAME, eu.PARTY_FLAG, vi.KINDNESS_TIME, vi.PARTICIPATION_NUM