diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/DynamicController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/DynamicController.java index 274d4ea..eb3ef38 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/DynamicController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/DynamicController.java @@ -14,6 +14,7 @@ import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.Dynamic; import com.ruoyi.xq.dto.admin.common.AuditFailReq; +import com.ruoyi.xq.dto.admin.dynamic.DynamicAddReq; import com.ruoyi.xq.dto.admin.dynamic.DynamicAdminVo; import com.ruoyi.xq.dto.app.common.IdsReq; import com.ruoyi.xq.service.DynamicService; @@ -87,8 +88,9 @@ public class DynamicController extends BaseController { @Log(title = "动态", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody Dynamic bo) { - return toAjax(dynamicService.save(bo)); + public R add(@RequestBody DynamicAddReq bo) { + dynamicService.saveDynamic(bo); + return R.ok(); } /** diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java index eb7a19c..90b6fbd 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java @@ -11,6 +11,7 @@ import com.ruoyi.xq.dto.app.areacode.AreaCodeHomeVo; import com.ruoyi.xq.dto.app.areacode.AreaCodeQuery; import com.ruoyi.xq.dto.app.areacode.AreaCodeTree; import com.ruoyi.xq.dto.app.setting.AgreementDTO; +import com.ruoyi.xq.mapper.AreaCodeMapper; import com.ruoyi.xq.service.AgreementSettingService; import com.ruoyi.xq.service.AreaCodeService; import io.swagger.v3.oas.annotations.Operation; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.List; @RestController @@ -57,12 +59,14 @@ public class SettingAppController { return R.ok(new AgreementDTO(anchorJoinAgreement)); } + @Resource + private AreaCodeMapper areaCodeMapper; + @GetMapping("/areaCode/homeCity") @Operation(summary = "获取首页城市选择列表") @Log(title = "获取首页城市选择列表", businessType = BusinessType.OTHER, isSaveDb = false) public R> homeCity(){ - List list = areaCodeService.list(Wrappers.lambdaQuery(AreaCode.class).eq(AreaCode::getLevel, "city")); - List vos = BeanConvertUtil.convertListTo(list, AreaCodeHomeVo::new); + List vos = areaCodeMapper.homeCity(); return R.ok(vos); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/dynamic/DynamicAddReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/dynamic/DynamicAddReq.java new file mode 100644 index 0000000..5bc4f00 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/dynamic/DynamicAddReq.java @@ -0,0 +1,9 @@ +package com.ruoyi.xq.dto.admin.dynamic; + +import com.ruoyi.xq.domain.Dynamic; +import lombok.Data; + +@Data +public class DynamicAddReq extends Dynamic { + private String dynamicImages; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AreaCodeMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AreaCodeMapper.java index d43a47e..35e8d23 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AreaCodeMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AreaCodeMapper.java @@ -2,6 +2,9 @@ package com.ruoyi.xq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xq.domain.AreaCode; +import com.ruoyi.xq.dto.app.areacode.AreaCodeHomeVo; + +import java.util.List; /** * 行政区划Mapper接口 @@ -11,4 +14,6 @@ import com.ruoyi.xq.domain.AreaCode; */ public interface AreaCodeMapper extends BaseMapper { + List homeCity(); + } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/DynamicService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/DynamicService.java index f4f3a4c..643179f 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/DynamicService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/DynamicService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.Dynamic; +import com.ruoyi.xq.dto.admin.dynamic.DynamicAddReq; import com.ruoyi.xq.dto.admin.dynamic.DynamicAdminVo; import com.ruoyi.xq.dto.app.dynamic.AddDynamicReq; import com.ruoyi.xq.dto.app.dynamic.DynamicListVo; @@ -31,4 +32,6 @@ public interface DynamicService extends IService { Page currentPage(PageQuery pageQuery); void removeDynamicOfApp(Long id); + + void saveDynamic(DynamicAddReq bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java index e8a2cd4..fdaacec 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java @@ -7,7 +7,9 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.xq.domain.*; +import com.ruoyi.xq.dto.admin.dynamic.DynamicAddReq; import com.ruoyi.xq.dto.admin.dynamic.DynamicAdminVo; import com.ruoyi.xq.dto.app.auth.LoginUser; import com.ruoyi.xq.dto.app.dynamic.AddDynamicReq; @@ -111,6 +113,35 @@ public class DynamicServiceImpl extends ServiceImpl imple dynamicStarService.removeByDynamicId(id); } + @Override + @Transactional(rollbackFor = Exception.class) + public void saveDynamic(DynamicAddReq bo) { + String usercode = bo.getUsercode(); + User user = userService.getByUsercode(usercode); + if(user == null){ + throw new ServiceException("用户不存在"); + } + if(StringUtils.isEmpty(bo.getDynamicImages())){ + throw new ServiceException("请上传动态图"); + } + Dynamic dynamic = new Dynamic(); + dynamic.setUserId(user.getId()); + dynamic.setUsercode(user.getUsercode()); + dynamic.setContent(bo.getContent()); + dynamic.setAuditStatus(AuditEnum.SUCCESS.getCode()); + dynamic.setAuditRemark("后台新增"); + this.save(dynamic); + String[] dynamicPictures = bo.getDynamicImages().split(","); + for (String dynamicPicture : dynamicPictures) { + DynamicImage dynamicImage = new DynamicImage(); + dynamicImage.setUserId(user.getId()); + dynamicImage.setUsercode(user.getUsercode()); + dynamicImage.setDynamicId(dynamic.getId()); + dynamicImage.setUrl(dynamicPicture); + dynamicImageService.save(dynamicImage); + } + } + @Override public Page pageApp(PageQuery pageQuery, DynamicQuery dynamicQuery) { Page page = baseMapper.pageApp(pageQuery.build(), dynamicQuery); diff --git a/ruoyi-xq/src/main/resources/mapper/xq/AreaCodeMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/AreaCodeMapper.xml index 32461fc..8d0ea15 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/AreaCodeMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/AreaCodeMapper.xml @@ -4,16 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - + diff --git a/ruoyi-xq/src/main/resources/mapper/xq/DynamicMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/DynamicMapper.xml index d2ebf0c..3c97d05 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/DynamicMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/DynamicMapper.xml @@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t2.mobile = #{bo.mobile} + + and t1.audit_status = #{bo.auditStatus} + order by create_time desc diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserAuthAuditMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserAuthAuditMapper.xml index 26b9b55..ba236aa 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserAuthAuditMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserAuthAuditMapper.xml @@ -18,6 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t2.mobile = #{bo.mobile} + + and t1.audit_status = #{bo.auditStatus} + order by t1.create_time desc diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserInfoAuditMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserInfoAuditMapper.xml index 2748730..2e0329a 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserInfoAuditMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserInfoAuditMapper.xml @@ -18,6 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t2.mobile = #{bo.mobile} + + and t1.audit_status = #{bo.auditStatus} + order by create_time desc diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml index bacd481..bc995d8 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml @@ -31,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t2.mobile = #{bo.mobile} + + and t1.audit_status = #{bo.auditStatus} + order by create_time desc