guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

忘记密码和综合搜索和消息接口 统一修改了返回方式code

Browse Source
dev
lijingtao 1 year ago
parent 051c6043c9
commit fb536bee37
7 changed files with 102 additions and 72 deletions
Show Stats Download Patch File Download Diff File

54
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java
Unescape View File

@ -2,31 +2,24 @@ package cn.jyjz.xiaoyao.ocr.controller;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.util.StringUtils;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.oa.from.dataobject.Candidateuser;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsgRead;
import cn.jyjz.xiaoyao.ocr.service.IOcrMsgService;
import cn.jyjz.xiaoyao.ocr.util.PageRequest;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import cn.jyjz.xiaoyao.ocr.service.IOcrMsgReadService;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -54,14 +47,15 @@ public class OcrMsgReadController {
/**
* 分页查询
*
* @return
*/
@ApiOperation(value = "系统消息分页", notes = "系统消息分页")
@RequestMapping(value = "/systemPage", method = RequestMethod.GET)
public ResponseEntity<?> systemPage(HttpServletRequest request,
@RequestParam(value = "pageNo", required = false, defaultValue = "1") int pageNo,
@RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize,
@RequestParam(value = "msgCategory", required = false) String msgCategory) {
public ResultVo systemPage(HttpServletRequest request,
@RequestParam(value = "pageNo", required = false, defaultValue = "1") int pageNo,
@RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize,
@RequestParam(value = "msgCategory", required = false) String msgCategory) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
@ -76,39 +70,42 @@ public class OcrMsgReadController {
PageInfo<List<Map<Object, String>>> findPage = iocrmsgservice.selectPage(pageQuery,userToken.getUserid(),msgCategory);
//执行查询方法
return new ResponseEntity<Object>(findPage, HttpStatus.OK);
// return new ResponseEntity<Object>(findPage, HttpStatus.OK);
return ResultVoUtil.success(findPage);
}
/**
* 查询 单条 信息
* 查询 单条 信息
*
* @param id
* @param id 编号
* @param id 编号
* @return
*/
@ApiOperation(value = "消息详情", notes = "消息详情")
@RequestMapping(value = "/msgOne", method = RequestMethod.GET)
public ResponseEntity<?> msgOne(@RequestParam(value = "id", required = false)String id) {
public ResultVo msgOne(@RequestParam(value = "id", required = false)String id) {
QueryWrapper<OcrMsg> wrapper = new QueryWrapper<>();
wrapper.select("titile","msg_content as msgContent","sender","msg_category as msgCategory","send_time as sendTime");
wrapper.eq("id", id);
//执行查询方法
OcrMsg one = iocrmsgservice.getOne(wrapper);
// QueryWrapper<OcrMsg> wrapper = new QueryWrapper<>();
// wrapper.select("titile","msg_content as msgContent","'系统管理员' as qweqwe","sender","msg_category as msgCategory","send_time as sendTime");
// wrapper.eq("id", id);
// //执行查询方法
// OcrMsg one = iocrmsgservice.getOne(wrapper);
return new ResponseEntity<Object>(one,HttpStatus.OK);
Map<Object, String> selectone = iocrmsgservice.selectone(id);
return ResultVoUtil.success(selectone);
}
/**
* 添加
*
* @return
*/
@ApiOperation(value = "消除未读所有", notes = "消除未读所有")
@RequestMapping(value = "eliminateUnreadfull", method = RequestMethod.POST)
public ResponseEntity<?> eliminateUnreadfull(HttpServletRequest request,@RequestParam(value = "msgCategory", required = false)String msgCategory) {
public ResultVo eliminateUnreadfull(HttpServletRequest request, @RequestParam(value = "msgCategory", required = false)String msgCategory) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
@ -131,15 +128,17 @@ public class OcrMsgReadController {
ocrmsgread.setReadFlag(1);
ocrmsgread.setReadTime(System.currentTimeMillis());
ocrMsgReadService.save(ocrmsgread);
return ResultVoUtil.success(ResultVo.SUCCESS);
}
}
//此处需要手工处理 返回需要将修改后的数据返回
return new ResponseEntity<Object>("true",HttpStatus.OK);
// return new ResponseEntity<Object>("true",HttpStatus.OK);
return ResultVoUtil.success(ResultVo.SUCCESS);
}
@ApiOperation(value = "消除未读单个", notes = "消除未读单个")
@RequestMapping(value = "eliminateUnreadone", method = RequestMethod.POST)
public ResponseEntity<?> eliminateUnreadone(HttpServletRequest request,@RequestParam(value = "msgid", required = false)String msgid) {
public ResultVo eliminateUnreadone(HttpServletRequest request, @RequestParam(value = "msgid", required = false)String msgid) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
@ -156,7 +155,8 @@ public class OcrMsgReadController {
boolean save = ocrMsgReadService.save(ocrmsgread);
//此处需要手工处理 返回需要将修改后的数据返回
return new ResponseEntity<Object>(save,HttpStatus.OK);
// return new ResponseEntity<Object>(save,HttpStatus.OK);
return ResultVoUtil.success(save);
}
}

66
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java
Unescape View File

@ -1,18 +1,13 @@
package cn.jyjz.xiaoyao.ocr.controller;
import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.admin.dataobject.User;
import cn.jyjz.xiaoyao.admin.service.TenantService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.redis.cache.ICacheManager;
import cn.jyjz.xiaoyao.common.redis.cache.constants.CacheConstants;
import cn.jyjz.xiaoyao.framework.security.service.SmsLoginService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrSUserT;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
import cn.jyjz.xiaoyao.ocr.service.OcrISUserTService;
import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -21,19 +16,11 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -62,11 +49,12 @@ public class OcrSUserTController {
@Autowired
OcrTaskchildPictureService ocrtaskchildpictureservice;
/** 忘记密码
/**
* 忘记密码
*/
@ApiOperation(value = "重置密码", notes = "重置密码")
@RequestMapping(value = "/updateSUser", method = RequestMethod.POST)
public ResponseEntity<?> updateSUser(@RequestBody Map<String,String> map) {
public ResultVo updateSUser(@RequestBody Map<String,String> map) {
// System.out.println(map);
// Map<String, String> map=new HashMap<String,String>();
@ -82,34 +70,39 @@ public class OcrSUserTController {
boolean update = sUserTService.update(updatewrapper);
if(update){
return new ResponseEntity<Object>("密码重设成功！",HttpStatus.OK);
// return new ResponseEntity<Object>("密码重设成功！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"密码重设成功！");
}
}else{
return new ResponseEntity<Object>("两次密码输入不一致！",HttpStatus.OK);
// return new ResponseEntity<Object>("两次密码输入不一致！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"两次密码输入不一致！");
}
}else{
return new ResponseEntity<Object>("请再次输入新密码！",HttpStatus.OK);
// return new ResponseEntity<Object>("请再次输入新密码！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请再次输入新密码！");
}
}else{
return new ResponseEntity<Object>("请输入新密码！",HttpStatus.OK);
// return new ResponseEntity<Object>("请输入新密码！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入新密码！");
}
}else {
return new ResponseEntity<Object>("请输入同时包含英文、数字的8~16位密码！",HttpStatus.OK);
// return new ResponseEntity<Object>("请输入同时包含英文、数字的8~16位密码！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入同时包含英文、数字的8~16位密码！");
}
return new ResponseEntity<Object>(HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS);
}
@ApiOperation(value = "忘记密码", notes = "忘记密码")
@RequestMapping(value = "/selectSUser", method = RequestMethod.POST)
public ResponseEntity<?> selectSUser(@RequestBody Map<String,Object> map) {
public ResultVo selectSUser(@RequestBody Map<String,Object> map) {
if(null!=map.get("loginname")){
if(null!=map.get("phone")){
@ -134,35 +127,44 @@ public class OcrSUserTController {
if(!StringUtils.isBlank(sysCode) && !sysCode.equals(map.get("phone").toString())){
Map<Object, String> list = new HashMap<>();
list.put("loginname",map.get("loginname").toString());
return new ResponseEntity<Map<Object, String>>(list, HttpStatus.OK);
// return new ResponseEntity<Map<Object, String>>(list, HttpStatus.OK);
return ResultVoUtil.success(ResultVo.SUCCESS,list);
}else {
return new ResponseEntity<Object>("验证码错误！",HttpStatus.OK);
// return new ResponseEntity<Object>("验证码错误！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"验证码错误！");
}
}else {
return new ResponseEntity<Object>("手机号错误！",HttpStatus.OK);
// return new ResponseEntity<Object>("手机号错误！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"手机号错误！");
}
}else {
return new ResponseEntity<Object>("账号不存在！",HttpStatus.OK);
// return new ResponseEntity<Object>("账号不存在！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"账号不存在！");
}
}else {
return new ResponseEntity<Object>("企业编码错误！",HttpStatus.OK);
// return new ResponseEntity<Object>("企业编码错误！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"企业编码错误！");
}
}else {
return new ResponseEntity<Object>("请输入企业编码！",HttpStatus.OK);
// return new ResponseEntity<Object>("请输入企业编码！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入企业编码！");
}
}else {
return new ResponseEntity<Object>("请输入验证码！",HttpStatus.OK);
// return new ResponseEntity<Object>("请输入验证码！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入验证码！");
}
}else {
return new ResponseEntity<Object>("请输入手机号！",HttpStatus.OK);
// return new ResponseEntity<Object>("请输入手机号！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入手机号！");
}
}else {
return new ResponseEntity<Object>("请输入账号！",HttpStatus.OK);
// return new ResponseEntity<Object>("请输入账号！",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入账号！");
}

29
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java
Unescape View File

@ -2,17 +2,14 @@ package cn.jyjz.xiaoyao.ocr.controller;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsgRead;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService;
@ -39,12 +36,13 @@ public class OcrSearchHistoryController {
/**
* 搜索查询
*
* @param request
* @return
*/
@RequestMapping(value = "/searchList", method = RequestMethod.GET)
public ResponseEntity<?> searchList(HttpServletRequest request,
@RequestParam(value = "search", required = false) String search) {
public ResultVo searchList(HttpServletRequest request,
@RequestParam(value = "search", required = false) String search) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
//执行查询方法
List<String> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getUsername());
@ -55,23 +53,27 @@ public class OcrSearchHistoryController {
ocrsearchhistory.setCreatedate(System.currentTimeMillis());
ocrSearchHistoryService.save(ocrsearchhistory);
return new ResponseEntity<Object>(selectsearch, HttpStatus.OK);
// return new ResponseEntity<Object>(selectsearch, HttpStatus.OK);
return ResultVoUtil.success(selectsearch);
}
/**
* 通过 删除历史记录
*
* @param request
* @return
*/
@RequestMapping(value = "/searchdelete", method = RequestMethod.DELETE)
public ResponseEntity<?> searchdelete(HttpServletRequest request) {
public ResultVo searchdelete(HttpServletRequest request) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
QueryWrapper<OcrSearchHistory> wrapper = new QueryWrapper<>();
wrapper.eq("userid",userToken.getUserid());
//根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据
ocrSearchHistoryService.remove(wrapper);
return new ResponseEntity<Object>("true",HttpStatus.OK);
ocrSearchHistoryService.remove(wrapper);
// return new ResponseEntity<Object>("true",HttpStatus.OK);
return ResultVoUtil.success(ResultVo.SUCCESS);
}
/**
@ -81,14 +83,15 @@ public class OcrSearchHistoryController {
* @return
*/
@RequestMapping(value = "/historySearch", method = RequestMethod.GET)
public ResponseEntity<?> historySearch(HttpServletRequest request) {
public ResultVo historySearch(HttpServletRequest request) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
QueryWrapper<OcrSearchHistory> wrapper = new QueryWrapper<>();
wrapper.select("historyname","createdate").eq("userid",userToken.getUserid()).orderByDesc("createdate").last("limit 8");
List<OcrSearchHistory> list = ocrSearchHistoryService.list(wrapper);
return new ResponseEntity<List<OcrSearchHistory>>(list, HttpStatus.OK);
// return new ResponseEntity<List<OcrSearchHistory>>(list, HttpStatus.OK);
return ResultVoUtil.success(list);
}
}

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java
Unescape View File

@ -20,4 +20,6 @@ import java.util.Map;
@Mapper
public interface OcrMsgMapper extends BaseMapper<OcrMsg> {
List<List<Map<Object, String>>> selectPage(@Param("userid")String userid,@Param("msgCategory")String msgCategory);
Map<Object, String> selectone(@Param("id")String id);
}

4
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java
Unescape View File

@ -5,6 +5,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import cn.jyjz.xiaoyao.ocr.util.PageRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@ -28,4 +29,7 @@ public interface IOcrMsgService extends IService<OcrMsg> {
* @return PageResult 自定义，统一分页查询结果
*/
PageInfo<List<Map<Object,String>>> selectPage(PageRequest pageRequest,String userid, String msgCategory);
Map<Object, String> selectone(String id);
}

5
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java
Unescape View File

@ -38,4 +38,9 @@ public class OcrMsgServiceImpl extends ServiceImpl<OcrMsgMapper, OcrMsg> impleme
return new PageInfo<List<Map<Object,String>>>(selectPage);
}
@Override
public Map<Object, String> selectone(String id) {
return ocrmsgmapper.selectone(id);
}
}

14
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml
Unescape View File

@ -98,4 +98,18 @@
</select>
<select id="selectone" resultType="map">
SELECT
titile,
msg_content AS msgContent,
'系统管理员' AS userNcame,
sender,
msg_category AS msgCategory,
send_time AS sendTime
FROM
ocr_msg
WHERE
id = #{id}
</select>
</mapper>

Write Preview
Loading…
Cancel
Save