Browse Source

完善功能

master
zhangyeguang 7 months ago
parent
commit
f98f2caaff
  1. 1
      common/src/main/java/com/jiagutech/ams/mapper/UserMapper.java
  2. 4
      social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java
  3. 17
      system/src/main/java/com/jiagutech/ams/controller/CommonController.java
  4. 6
      system/src/main/resources/mapper/UserMapper.xml

1
common/src/main/java/com/jiagutech/ams/mapper/UserMapper.java

@ -28,6 +28,7 @@ public interface UserMapper extends BaseMapper<UserDTO> {
List<UserDTO> getUsersByLikeRegionPath( @Param("regionPath") String regionPath);
List<Long> getRegionCodesByLikeRegionPath( @Param("regionPath") String regionPath);
Page<UserDetail> userPage(Page<UserDetail> page,@Param("ew") QueryWrapper<UserDetail> queryWrapper);

4
social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java

@ -215,8 +215,8 @@ public class JobServiceImpl implements JobService {
queryWrapper.eq("j.dept_id", loginUser.getDept().getId());
}
if (hasGov && loginUser.getRegionCode() != null && StringUtils.isNotBlank(loginUser.getRegionPath())) {
List<Long> farmerIds = userMapper.getUsersByLikeRegionPath(loginUser.getRegionPath()).stream().map(u -> u.getId()).collect(Collectors.toList());
queryWrapper.in("j.farmer_id", farmerIds);
List<Long> regionCodes = userMapper.getRegionCodesByLikeRegionPath(loginUser.getRegionPath());
queryWrapper.in("j.region_code", regionCodes);
if (requestParam != null && requestParam.getDeptId() != 0l) {
queryWrapper.eq("d.id", requestParam.getDeptId());
}

17
system/src/main/java/com/jiagutech/ams/controller/CommonController.java

@ -1,12 +1,14 @@
package com.jiagutech.ams.controller;
import cn.hutool.captcha.CaptchaUtil;
import cn.hutool.captcha.ShearCaptcha;
import cn.hutool.captcha.LineCaptcha;
import cn.hutool.core.img.ImgUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import com.jiagutech.ams.constant.Constants;
import com.jiagutech.ams.constant.GlobalConstants;
import com.jiagutech.ams.model.response.CaptchaVO;
import com.jiagutech.ams.model.common.R;
import com.jiagutech.ams.model.response.CaptchaVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.awt.*;
import java.time.Duration;
/**
@ -39,13 +42,13 @@ public class CommonController {
String uuid = IdUtil.simpleUUID();
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + uuid;
ShearCaptcha shearCaptcha = CaptchaUtil.createShearCaptcha(150, 40, 5, 4);
String code = shearCaptcha.getCode();
LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(150, 40, 4, 50);
String code = RandomUtil.randomNumbers(4);
Image image = lineCaptcha.createImage(code);
String base64 = ImgUtil.toBase64(image, "jpg");
redisTemplate.opsForValue().set(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
captchaVo.setUuid(uuid);
captchaVo.setImg(shearCaptcha.getImageBase64());
captchaVo.setImg(base64);
return R.ok(captchaVo);
}
}

6
system/src/main/resources/mapper/UserMapper.xml

@ -102,5 +102,11 @@
left join ams_role r on ur.role_id = r.id
${ew.getCustomSqlSegment}
</select>
<select id="getRegionCodesByLikeRegionPath" resultType="java.lang.Long">
select distinct region_code
from ams_user
where region_path like CONCAT(#{regionPath}, '%')
and del_flag = 0
</select>
</mapper>
Loading…
Cancel
Save