ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysBannerController.java
@@ -9,6 +9,7 @@ import com.ruoyi.system.model.TSysBanner; import com.ruoyi.system.query.TSysBannerQuery; import com.ruoyi.system.service.TSysBannerService; import com.ruoyi.system.vo.TSysBannerVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +41,7 @@ */ @ApiOperation(value = "获取banner管理分页列表") @PostMapping(value = "/pageList") public R<PageInfo<TSysBanner>> pageList(@RequestBody TSysBannerQuery query) { public R<PageInfo<TSysBannerVO>> pageList(@RequestBody TSysBannerQuery query) { return R.ok(sysBannerService.pageList(query)); }
@@ -207,8 +207,8 @@ subAppId: 1 appId: OP00000003 serialNo: 00dfba8194c41b84cf priKeyStr: C:\Users\Admin\Desktop\test\OP00000003_private_key.pem lklNotifyCerStr: F:\demo\demo\src\lkl-apigw-v2.cer priKeyStr: D:\lakalapay\OP00000003_private_key.pem lklNotifyCerStr: D:\lakalapay\lkl-apigw-v2.cer sm4Key: LHo55AjrT4aDhAIBZhb5KQ== serverUrl: https://test.wsmsd.cn/ payment: ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysBannerController.java
@@ -9,6 +9,7 @@ import com.ruoyi.system.model.TSysBanner; import com.ruoyi.system.query.TSysBannerQuery; import com.ruoyi.system.service.TSysBannerService; import com.ruoyi.system.vo.TSysBannerVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +41,7 @@ */ @ApiOperation(value = "获取banner管理分页列表") @PostMapping(value = "/pageList") public R<PageInfo<TSysBanner>> pageList(@RequestBody TSysBannerQuery query) { public R<PageInfo<TSysBannerVO>> pageList(@RequestBody TSysBannerQuery query) { return R.ok(sysBannerService.pageList(query)); }
@@ -61,6 +61,8 @@ @ApiOperation(value = "获取直播管理分页列表") @PostMapping(value = "/pageList") public R<PageInfo<TSysLiveVO>> pageListApp(@RequestBody TSysLiveQuery query) { String userId = tokenService.getLoginUserApplet().getUserId(); query.setAppUserId(userId); return R.ok(sysLiveService.pageListApp(query)); }
@@ -4,6 +4,7 @@ import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TSysBanner; import com.ruoyi.system.query.TSysBannerQuery; import com.ruoyi.system.vo.TSysBannerVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,5 +25,5 @@ * @param query 查询参数 * @return List<TSysBanner> */ List<TSysBanner> pageList(@Param("query") TSysBannerQuery query, @Param("pageInfo")PageInfo<TSysBanner> pageInfo); List<TSysBannerVO> pageList(@Param("query") TSysBannerQuery query, @Param("pageInfo")PageInfo<TSysBannerVO> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/model/TSysLive.java
@@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDateTime; @@ -42,6 +43,7 @@ @TableField("live_introduction") private String liveIntroduction; @NotNull(message = "开始时间不能为空") @ApiModelProperty(value = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("start_time") ruoyi-system/src/main/java/com/ruoyi/system/service/TSysBannerService.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TSysBanner; import com.ruoyi.system.query.TSysBannerQuery; import com.ruoyi.system.vo.TSysBannerVO; /** * <p> @@ -27,5 +28,5 @@ * @param query * @return */ PageInfo<TSysBanner> pageList(TSysBannerQuery query); PageInfo<TSysBannerVO> pageList(TSysBannerQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java
@@ -84,18 +84,22 @@ List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class)); for (TSysAppUserVO sysAppUserVO : list) { String chronicDiseaseId = sysAppUserVO.getChronicDiseaseId(); String[] split = chronicDiseaseId.split(","); StringBuilder stringBuilder = new StringBuilder(); for (String diseaseId : split) { List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList()); // 最后一位不拼接逗号 if(diseaseId.equals(split[split.length-1])){ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()); }else{ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(","); if(StringUtils.isNotBlank(chronicDiseaseId)){ String[] split = chronicDiseaseId.split(","); StringBuilder stringBuilder = new StringBuilder(); for (String diseaseId : split) { List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(chronicDiseaseList)){ // 最后一位不拼接逗号 if(diseaseId.equals(split[split.length-1])){ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()); }else{ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(","); } } } sysAppUserVO.setSysChronicDiseaseNames(stringBuilder.toString()); } sysAppUserVO.setSysChronicDiseaseNames(stringBuilder.toString()); } pageInfo.setRecords(list); @@ -111,18 +115,22 @@ List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class)); for (TSysAppUserListExport sysAppUserListExport : list) { String chronicDiseaseId = sysAppUserListExport.getChronicDiseaseId(); String[] split = chronicDiseaseId.split(","); StringBuilder stringBuilder = new StringBuilder(); for (String diseaseId : split) { List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList()); // 最后一位不拼接逗号 if(diseaseId.equals(split[split.length-1])){ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()); }else{ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(","); if(StringUtils.isNotBlank(chronicDiseaseId)){ String[] split = chronicDiseaseId.split(","); StringBuilder stringBuilder = new StringBuilder(); for (String diseaseId : split) { List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(chronicDiseaseList)){ // 最后一位不拼接逗号 if(diseaseId.equals(split[split.length-1])){ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()); }else{ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(","); } } } sysAppUserListExport.setSysChronicDiseaseNames(stringBuilder.toString()); } sysAppUserListExport.setSysChronicDiseaseNames(stringBuilder.toString()); } return list; } @@ -136,18 +144,22 @@ List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class)); for (TSysAppUserClinicExport sysAppUserClinicExport : list) { String chronicDiseaseId = sysAppUserClinicExport.getChronicDiseaseId(); String[] split = chronicDiseaseId.split(","); StringBuilder stringBuilder = new StringBuilder(); for (String diseaseId : split) { List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList()); // 最后一位不拼接逗号 if(diseaseId.equals(split[split.length-1])){ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()); }else{ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(","); if(StringUtils.isNotBlank(chronicDiseaseId)){ String[] split = chronicDiseaseId.split(","); StringBuilder stringBuilder = new StringBuilder(); for (String diseaseId : split) { List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(chronicDiseaseList)){ // 最后一位不拼接逗号 if(diseaseId.equals(split[split.length-1])){ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()); }else{ stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(","); } } } sysAppUserClinicExport.setSysChronicDiseaseNames(stringBuilder.toString()); } sysAppUserClinicExport.setSysChronicDiseaseNames(stringBuilder.toString()); } return list; } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysBannerServiceImpl.java
@@ -4,15 +4,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.TSysBannerMapper; import com.ruoyi.system.mapper.*; import com.ruoyi.system.model.*; import com.ruoyi.system.model.TSysBanner; import com.ruoyi.system.model.TSysBanner; import com.ruoyi.system.model.TSysChronicDisease; import com.ruoyi.system.query.TSysBannerQuery; import com.ruoyi.system.service.TSysBannerService; import com.ruoyi.system.vo.TSysBannerVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; /** * <p> @@ -24,6 +27,15 @@ */ @Service public class TSysBannerServiceImpl extends ServiceImpl<TSysBannerMapper, TSysBanner> implements TSysBannerService { @Autowired private TSysEducationalInfoMapper sysEducationalInfoMapper; @Autowired private TSysLiveMapper sysLiveMapper; @Autowired private TSysProductIntroductionMapper sysProductIntroductionMapper; @Autowired private TSysActivityMapper sysActivityMapper; @Override public boolean isExit(TSysBanner dto) { @@ -37,9 +49,39 @@ } @Override public PageInfo<TSysBanner> pageList(TSysBannerQuery query) { PageInfo<TSysBanner> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TSysBanner> list = this.baseMapper.pageList(query,pageInfo); public PageInfo<TSysBannerVO> pageList(TSysBannerQuery query) { PageInfo<TSysBannerVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TSysBannerVO> list = this.baseMapper.pageList(query,pageInfo); if(CollectionUtils.isEmpty(list)){ return pageInfo; } for (TSysBannerVO sysBannerVO : list) { switch (sysBannerVO.getJumpType()){ case 2: TSysEducationalInfo educationalInfo = sysEducationalInfoMapper.selectById(sysBannerVO.getContentId()); if(Objects.nonNull(educationalInfo)){ sysBannerVO.setContentName(educationalInfo.getInfoTitle()); } break; case 3: TSysLive sysLive = sysLiveMapper.selectById(sysBannerVO.getContentId()); if(Objects.nonNull(sysLive)){ sysBannerVO.setContentName(sysLive.getLiveTitle()); } break; case 4: TSysProductIntroduction sysProductIntroduction = sysProductIntroductionMapper.selectById(sysBannerVO.getContentId()); if(Objects.nonNull(sysProductIntroduction)){ sysBannerVO.setContentName(sysProductIntroduction.getProductName()); } break; case 5: TSysActivity sysActivity = sysActivityMapper.selectById(sysBannerVO.getContentId()); if(Objects.nonNull(sysActivity)){ sysBannerVO.setContentName(sysActivity.getActivityName()); } } } pageInfo.setRecords(list); return pageInfo; } ruoyi-system/src/main/java/com/ruoyi/system/vo/TSysBannerVO.java
New file @@ -0,0 +1,15 @@ package com.ruoyi.system.vo; import com.ruoyi.system.model.TSysBanner; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "banner管理视图对象TSysBannerVO", description = "banner管理视图对象") public class TSysBannerVO extends TSysBanner { @ApiModelProperty(value = "内容名称") private String contentName; } ruoyi-system/src/main/resources/mapper/system/TSysActivityMapper.xml
@@ -56,9 +56,7 @@ <if test="query.showType != null"> AND show_type = #{query.showType} </if> <if test="query.status != null"> AND status = #{query.status} </if> AND status = 1 AND show_type in (1,3) AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ruoyi-system/src/main/resources/mapper/system/TSysBannerMapper.xml
@@ -23,7 +23,7 @@ <sql id="Base_Column_List"> id, banner_name, banner_type, pictures, url_link, sort_by,jump_type, content_id, create_time, update_time, create_by, update_by, disabled </sql> <select id="pageList" resultType="com.ruoyi.system.model.TSysBanner"> <select id="pageList" resultType="com.ruoyi.system.vo.TSysBannerVO"> select <include refid="Base_Column_List"/> from t_sys_banner ruoyi-system/src/main/resources/mapper/system/TSysEducationalInfoMapper.xml
@@ -55,9 +55,7 @@ <if test="query.showType != null"> and show_type = #{query.showType} </if> <if test="query.status != null"> and status = #{query.status} </if> AND status = 1 and show_type in (1,3) AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ruoyi-system/src/main/resources/mapper/system/TSysProductIntroductionMapper.xml
@@ -56,9 +56,7 @@ <if test="query.showType != null"> AND show_type = #{query.showType} </if> <if test="query.status != null"> AND status = #{query.status} </if> AND status = 1 AND show_type in (1,3) AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where>
