diff --git a/jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java b/jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java index 4102415f..d8796620 100644 --- a/jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java +++ b/jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java @@ -20,7 +20,7 @@ public interface CacheConstants { //缓存超时时间，单位：秒,目前验证码使用 int CACHE_TIME = 300;//300; - //缓存超时时间，单位：秒,目前ai统计使用 24小时 + //缓存超时时间，单位：秒,目前ai统计使用 24小时,获取验证码在使用 int TOOLSCOUNT_TENANTID_CACHE_TIME = 86400; //保存ai统计租户id对象 diff --git a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java index 38e6f497..be3ad913 100644 --- a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java +++ b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java @@ -84,7 +84,7 @@ public class SmsLoginServiceImpl implements SmsLoginService { iCacheManager.put(CacheConstants.USER_PHONE_MODEL_NAME,phone,code,CacheConstants.CACHE_TIME); // 更新手机号当天获取验证码的次数 - iCacheManager.put(CacheConstants.USER_PHONE_MODEL_NAME, cacheKey, count + 1, CacheConstants.CACHE_TIME); + iCacheManager.put(CacheConstants.USER_PHONE_MODEL_NAME, cacheKey, count + 1, CacheConstants.TOOLSCOUNT_TENANTID_CACHE_TIME); //保存验证码到 缓存中 return ResultVoUtil.success(code); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java index 7337cfc9..cb85fc1d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java @@ -59,4 +59,26 @@ public class OcrDictionaryController { } return new ResultVo<>(ResultVo.ERROR,"根据field查询不到字典组!"); } + + + /** + *根据字典value获取对应lable值 + * + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:02 + **/ + @GetMapping("/getLabelByValue") + @ResponseBody + public ResultVo> getLabelByValue(HttpServletResponse response, + HttpServletRequest request, + @RequestParam(name="field", defaultValue="upName",required = true) String field, + @RequestParam(name="value", defaultValue="",required = true) String value) { + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + String result= ocrDictionaryService.queryLabelByValue(field,value,tenantId); + return new ResultVo<>(ResultVo.ERROR,result); + } + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java index 4f3736b1..440f3d19 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java @@ -66,38 +66,38 @@ public class OcrSUserTController { if(map.get("newPassword").equals(map.get("rePasswrod"))){ BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); UpdateWrapper updatewrapper = new UpdateWrapper<>(); - updatewrapper.eq("LOGINNAME", map.get("loginname")).set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword"))); + updatewrapper.eq("MOBILE", map.get("loginname")).set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword"))); boolean update = sUserTService.update(updatewrapper); if(update){ // return new ResponseEntity("密码重设成功！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"密码重设成功！"); + return ResultVoUtil.success(ResultVo.SUCCESS,"密码重设成功！"); } }else{ // return new ResponseEntity("两次密码输入不一致！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"两次密码输入不一致！"); + return ResultVoUtil.error(ResultVo.ERROR,"两次密码输入不一致！"); } }else{ // return new ResponseEntity("请再次输入新密码！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"请再次输入新密码！"); + return ResultVoUtil.error(ResultVo.ERROR,"请再次输入新密码！"); } }else{ // return new ResponseEntity("请输入新密码！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"请输入新密码！"); + return ResultVoUtil.error(ResultVo.ERROR,"请输入新密码！"); } }else { // return new ResponseEntity("请输入同时包含英文、数字的8~16位密码！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"请输入同时包含英文、数字的8~16位密码！"); + return ResultVoUtil.error(ResultVo.ERROR,"请输入同时包含英文、数字的8~16位密码！"); } - return ResultVoUtil.error(ResultVo.SUCCESS); + return ResultVoUtil.error(ResultVo.ERROR); } @ApiOperation(value = "忘记密码", notes = "忘记密码") diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java index 6b40d5d8..35fe3bda 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java @@ -110,7 +110,11 @@ public class OcrTaskPackageController extends BaseController { @RequestParam(name = "pageNo") Integer pageNo, @RequestParam(name = "pageSize") Integer pageSize, HttpServletRequest req) { - Page> result = ocrTaskPackageService.getPackageList(pageNo, pageSize, packageName); + String tenantId = req.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + Page> result = ocrTaskPackageService.getPackageList(pageNo, pageSize, packageName,tenantId); return ResultVoUtil.success(result); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java index 3fccfb7a..d66ed3d3 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java @@ -20,5 +20,6 @@ import java.util.Map; @Mapper public interface OcrTaskPackageMapper extends BaseMapper { - Page> getPackageList(Page> page, @Param("packageName") String packageName); + Page> getPackageList(Page> page, @Param("packageName") String packageName, + @Param("tenantId") String tenantId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java index df9f3eea..6dd46f0c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java @@ -1,9 +1,12 @@ package cn.jyjz.xiaoyao.ocr.dataobject; +import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.Data; /** * ClassName： $className$.java @@ -12,6 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * Date： 2024/3/22 07:09 */ @TableName(value = "ocr_picture_info") +@Data public class OcrPictureInfo { /** * 主键 @@ -47,12 +51,14 @@ public class OcrPictureInfo { * 上传时间 */ @TableField(value = "upload_time") + @JsonSerialize(using = DateNotimeSerializer.class) private Long uploadTime; /** * 创建时间 */ @TableField(value = "create_time") + @JsonSerialize(using = DateNotimeSerializer.class) private Long createTime; /** @@ -65,6 +71,7 @@ public class OcrPictureInfo { * 标记时间 */ @TableField(value = "tag_time") + @JsonSerialize(using = DateNotimeSerializer.class) private Long tagTime; /** @@ -73,183 +80,4 @@ public class OcrPictureInfo { @TableField(value = "`source`") private String source; - /** - * 获取主键 - * - * @return id - 主键 - */ - public Long getId() { - return id; - } - - /** - * 设置主键 - * - * @param id 主键 - */ - public void setId(Long id) { - this.id = id; - } - - /** - * 获取原图片主键 - * - * @return picture_id - 原图片主键 - */ - public Long getPictureId() { - return pictureId; - } - - /** - * 设置原图片主键 - * - * @param pictureId 原图片主键 - */ - public void setPictureId(Long pictureId) { - this.pictureId = pictureId; - } - - /** - * 获取图片大小 - * - * @return img_size - 图片大小 - */ - public String getImgSize() { - return imgSize; - } - - /** - * 设置图片大小 - * - * @param imgSize 图片大小 - */ - public void setImgSize(String imgSize) { - this.imgSize = imgSize; - } - - /** - * 获取图片格式 - * - * @return img_format - 图片格式 - */ - public String getImgFormat() { - return imgFormat; - } - - /** - * 设置图片格式 - * - * @param imgFormat 图片格式 - */ - public void setImgFormat(String imgFormat) { - this.imgFormat = imgFormat; - } - - /** - * 获取图片尺寸 - * - * @return img_measure - 图片尺寸 - */ - public String getImgMeasure() { - return imgMeasure; - } - - /** - * 设置图片尺寸 - * - * @param imgMeasure 图片尺寸 - */ - public void setImgMeasure(String imgMeasure) { - this.imgMeasure = imgMeasure; - } - - /** - * 获取上传时间 - * - * @return upload_time - 上传时间 - */ - public Long getUploadTime() { - return uploadTime; - } - - /** - * 设置上传时间 - * - * @param uploadTime 上传时间 - */ - public void setUploadTime(Long uploadTime) { - this.uploadTime = uploadTime; - } - - /** - * 获取创建时间 - * - * @return create_time - 创建时间 - */ - public Long getCreateTime() { - return createTime; - } - - /** - * 设置创建时间 - * - * @param createTime 创建时间 - */ - public void setCreateTime(Long createTime) { - this.createTime = createTime; - } - - /** - * 获取图片色彩空间 - * - * @return img_space - 图片色彩空间 - */ - public String getImgSpace() { - return imgSpace; - } - - /** - * 设置图片色彩空间 - * - * @param imgSpace 图片色彩空间 - */ - public void setImgSpace(String imgSpace) { - this.imgSpace = imgSpace; - } - - /** - * 获取标记时间 - * - * @return tag_time - 标记时间 - */ - public Long getTagTime() { - return tagTime; - } - - /** - * 设置标记时间 - * - * @param tagTime 标记时间 - */ - public void setTagTime(Long tagTime) { - this.tagTime = tagTime; - } - - /** - * 获取图片来源 - * - * @return source - 图片来源 - */ - public String getSource() { - return source; - } - - /** - * 设置图片来源 - * - * @param source 图片来源 - */ - public void setSource(String source) { - this.source = source; - } } \ No newline at end of file diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java index 161eaa9a..63c2209f 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java @@ -34,5 +34,5 @@ public interface IOcrTaskPackageService extends IService { * @param packageName * @return */ - Page> getPackageList(Integer pageNo, Integer pageSize, String packageName); + Page> getPackageList(Integer pageNo, Integer pageSize, String packageName,String tenantId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java index 7599c434..6563b7f5 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java @@ -2,7 +2,6 @@ package cn.jyjz.xiaoyao.ocr.service; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; -import liquibase.pro.packaged.L; /** * 业务向 数据字典 操作接口 @@ -27,4 +26,14 @@ public interface OcrDictionaryService extends BaseService { * @return */ OcrDictionaryGroup queryGroupByField(String field); + + /** + * 根据value 获取字典lable + * + * @param field + * @param value 支持两种格式： 1.单value(xxx) ,2.多value(xxx,xxx) + * @param tenantId + * @return + */ + String queryLabelByValue(String field, String value, String tenantId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryServiceImpl.java index fc94d3f8..67aa0245 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryServiceImpl.java @@ -1,5 +1,7 @@ package cn.jyjz.xiaoyao.ocr.service.impl; +import cn.hutool.core.util.ArrayUtil; +import cn.jyjz.xiaoyao.common.base.util.StringUtils; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; import cn.jyjz.xiaoyao.ocr.dataDao.OcrDictionaryDao; import cn.jyjz.xiaoyao.ocr.dataDao.OcrDictionaryGroupDao; @@ -8,9 +10,12 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.List; /** @@ -47,4 +52,33 @@ public class OcrDictionaryServiceImpl extends BaseServiceImpl0){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("group_id",dictionaryGroup.getId()); + queryWrapper.eq("tenant_id",tenantId); + queryWrapper.in("value",values); + List dictionaries = baseMapper.selectList(queryWrapper); + List result = new ArrayList<>(); + if(dictionaries!=null && dictionaries.size()>0){ + for (OcrDictionary dictionary: dictionaries) { + result.add(dictionary.getLable()); + } + return String.join(",",result); + } + } + return null; + } + + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index e9da0f49..f0574221 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -743,15 +743,14 @@ public class OcrPictureServiceImpl extends BaseServiceImpl> getPackageList(Integer pageNo, Integer pageSize, String packageName) { + public Page> getPackageList(Integer pageNo, Integer pageSize, String packageName,String tenantId) { Page> page = new Page<>(pageNo, pageSize); - Page> result = taskPackageMapper.getPackageList(page, packageName); + Page> result = taskPackageMapper.getPackageList(page, packageName,tenantId); if (CollectionUtils.isNotEmpty(result.getRecords())) { List list = fieldService.list(new LambdaQueryWrapper().eq(OcrField::getReviewType, 1)); List> records = result.getRecords(); @@ -83,7 +86,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl>>>>>>"+pictureSourceResult.getSubmitTime()); System.out.println("SubmitDateTimestamp2=================>>>>>>>"+picture.getSubmitDateTimestamp()); diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml index c898c7f5..ffc46f88 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml @@ -9,10 +9,10 @@ LEFT JOIN ocr_check_duplicate t2 ON t1.check_duplicate_id = t2.id left join s_user_t t3 on t1.create_by = t3.ID + t1.tenant_id = #{tenantId} - t1.name like concat('%', #{packageName}, '%') or T3.USERNAME like concat('%', #{packageName}, '%') + and t1.name like concat('%', #{packageName}, '%') or T3.USERNAME like concat('%', #{packageName}, '%') - ORDER BY T1.create_time desc \ No newline at end of file