This commit is contained in:
77
2024-04-23 23:33:03 +08:00
parent 02cb0db041
commit eaa659b415
11 changed files with 76 additions and 14 deletions

View File

@@ -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<Void> add(@Validated(AddGroup.class) @RequestBody Dynamic bo) {
return toAjax(dynamicService.save(bo));
public R<Void> add(@RequestBody DynamicAddReq bo) {
dynamicService.saveDynamic(bo);
return R.ok();
}
/**

View File

@@ -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<List<AreaCodeHomeVo>> homeCity(){
List<AreaCode> list = areaCodeService.list(Wrappers.lambdaQuery(AreaCode.class).eq(AreaCode::getLevel, "city"));
List<AreaCodeHomeVo> vos = BeanConvertUtil.convertListTo(list, AreaCodeHomeVo::new);
List<AreaCodeHomeVo> vos = areaCodeMapper.homeCity();
return R.ok(vos);
}

View File

@@ -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;
}

View File

@@ -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<AreaCode> {
List<AreaCodeHomeVo> homeCity();
}

View File

@@ -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<Dynamic> {
Page<MyDynamicListVo> currentPage(PageQuery pageQuery);
void removeDynamicOfApp(Long id);
void saveDynamic(DynamicAddReq bo);
}

View File

@@ -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<DynamicMapper,Dynamic> 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<DynamicListVo> pageApp(PageQuery pageQuery, DynamicQuery dynamicQuery) {
Page<DynamicListVo> page = baseMapper.pageApp(pageQuery.build(), dynamicQuery);

View File

@@ -4,16 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.xq.mapper.AreaCodeMapper">
<resultMap type="com.ruoyi.xq.domain.AreaCode" id="AreaCodeResult">
<result property="code" column="code"/>
<result property="name" column="name"/>
<result property="level" column="level"/>
<result property="pcode" column="pcode"/>
<result property="pname" column="pname"/>
<result property="fullname" column="fullname"/>
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
</resultMap>
<select id="homeCity" resultType="com.ruoyi.xq.dto.app.areacode.AreaCodeHomeVo">
select t1.code,t1.name,t1.first_spell
from area_code t1
left join area_code t2 on t1.pcode = t2.code
where t1.level = 'city' and t1.enable_status = 1 and t2.enable_status = 1
</select>
</mapper>

View File

@@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bo.mobile != null and bo.mobile != ''">
and t2.mobile = #{bo.mobile}
</if>
<if test="bo.auditStatus != null ">
and t1.audit_status = #{bo.auditStatus}
</if>
</where>
order by create_time desc
</select>

View File

@@ -18,6 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bo.mobile != null and bo.mobile != ''">
and t2.mobile = #{bo.mobile}
</if>
<if test="bo.auditStatus != null ">
and t1.audit_status = #{bo.auditStatus}
</if>
</where>
order by t1.create_time desc
</select>

View File

@@ -18,6 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bo.mobile != null and bo.mobile != ''">
and t2.mobile = #{bo.mobile}
</if>
<if test="bo.auditStatus != null ">
and t1.audit_status = #{bo.auditStatus}
</if>
</where>
order by create_time desc
</select>

View File

@@ -31,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bo.mobile != null and bo.mobile != ''">
and t2.mobile = #{bo.mobile}
</if>
<if test="bo.auditStatus != null ">
and t1.audit_status = #{bo.auditStatus}
</if>
</where>
order by create_time desc
</select>