feat: 清理无用字段类和代码,解决获取未读消息总数异常问题

pull/1/head
shuliYao 2 years ago
parent 92f56fa136
commit 56116fd0fa

@ -1,156 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.admin.service.TenantService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
import cn.jyjz.xiaoyao.ocr.service.OcrAreaService;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import liquibase.pro.packaged.S;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@RestController
@RequestMapping("/ocr/ocrarea")
public class OcrAreaController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Resource
private OcrAreaService ocrAreaService;
@Resource
private TenantService tenantService;
@Resource
private UserTokenService userTokenService;
@Resource
private UserService userService;
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@ApiOperation(value="ocr_任务计划列表查询", notes="ocr_任务计划列表查询无分页")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@GetMapping("/listall")
public ResultVo<List<OcrArea>> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{
//租户主键,由前端页面传送
String tenantId = request.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrArea ocrArea = new OcrArea();
QueryWrapper<OcrArea> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrArea);
queryWrapper.eq("TENANTID",tenantId);
queryWrapper.orderByDesc("REORDER");
List<OcrArea> page = this.ocrAreaService.queryListNoPage(queryWrapper);;
return ResultVoUtil.success(page);
}
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/list")
public ResultVo<IPage<OcrArea>> listOcrArea(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrArea ocrarea = new OcrArea();
QueryWrapper<OcrArea> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrarea);
IPage<OcrArea> page = this.ocrAreaService.selectSearchListPage(paramterPage,queryWrapper);
for(OcrArea ocrArea:page.getRecords()){
ocrArea.setTenant(tenantService.selectDtoById(ocrArea.getTenantid()));
}
return ResultVoUtil.success(page);
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@PostMapping("/save")
public ResultVo saveOcrArea(HttpServletResponse response,HttpServletRequest request,OcrArea tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setCreateby(userToken.getLoginname());
tab.setCreatetime(System.currentTimeMillis());
this.ocrAreaService.save(tab);
return ResultVoUtil.success();
}
/**
*form
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@PostMapping("/edit")
public ResultVo editOcrArea(HttpServletResponse response,HttpServletRequest request,OcrArea tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setUpdateby(userToken.getLoginname());
tab.setUpdatetime(System.currentTimeMillis());
this.ocrAreaService.updateById(tab);
return ResultVoUtil.success();
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/getdata/{id}")
@ResponseBody
public ResultVo getdateOcrArea(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
OcrArea dto = this.ocrAreaService.selectDtoById(id);
if(null != dto){
return ResultVoUtil.success(dto);
}else{
return ResultVoUtil.error();
}
}
/**
*id1,2,3
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/delmore")
@ResponseBody
public ResultVo delMoreOcrArea(HttpServletResponse response,HttpServletRequest request) throws IOException{
String ids = request.getParameter("id");
this.ocrAreaService.deleteByIdMore(ids);
return ResultVoUtil.success();
}
}

@ -1,75 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.ocr.service.OcrAreaService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@Controller
@RequestMapping("/backstage/oa/ocrareaHtml")
public class OcrAreaHtmlController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private OcrAreaService ocrAreaService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private UserService userService;
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/toList")
public String toListOcrArea(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr/ocrarea/list";
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/toSave")
public String toSaveOcrArea(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr/ocrarea/add";
}
/**
*ID
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/toEdit/{id}")
public String toEditOcrArea(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") String id){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
request.setAttribute("id", id);
return "/backstage/oa/ocr/ocrarea/edit";
}
}

@ -4,8 +4,6 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService; import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;

@ -104,15 +104,8 @@ public class OcrMsgReadController {
public ResultVo msgPolling(HttpServletRequest request) { public ResultVo msgPolling(HttpServletRequest request) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
//获取当前用户所有未读消息
QueryWrapper<OcrMsgRead> wrapperread = new QueryWrapper<>(); int count = iocrmsgservice.queryUnreadMsgCount(userToken.getUserid());
wrapperread.eq("user_id",userToken.getUserid());
List<OcrMsgRead> list = ocrMsgReadService.list(wrapperread);
QueryWrapper<OcrMsg> wrappermsg = new QueryWrapper<>();
wrappermsg.notIn("id", list.stream().map(i->i.getMsgId()).collect(Collectors.toList()));
long count = iocrmsgservice.count(wrappermsg);
return ResultVoUtil.success(count); return ResultVoUtil.success(count);
} }

@ -13,9 +13,7 @@ import cn.jyjz.xiaoyao.admin.service.LogService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService;
import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
import cn.jyjz.xiaoyao.ocr.util.DataUtil; import cn.jyjz.xiaoyao.ocr.util.DataUtil;
import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum; import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum;
@ -49,8 +47,6 @@ public class OcrPictureController extends BaseController {
@Resource @Resource
private OcrPictureService ocrPictureService; private OcrPictureService ocrPictureService;
@Resource @Resource
private OcrPictureclassService ocrPictureclassService;
@Resource
private OcrTaskchildPictureService ocrTaskchildPictureService; private OcrTaskchildPictureService ocrTaskchildPictureService;
@Resource @Resource
private UserTokenService userTokenService; private UserTokenService userTokenService;
@ -299,14 +295,6 @@ public class OcrPictureController extends BaseController {
Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize); Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
IPage<OcrPicture> pageList = ocrPictureService.page(page, queryWrapper); IPage<OcrPicture> pageList = ocrPictureService.page(page, queryWrapper);
for (OcrPicture ocrPicture1 : pageList.getRecords()) {
if (StringUtils.isNotBlank(ocrPicture1.getPictureclassid())) {
OcrPictureclass ocrPictureclass = this.ocrPictureclassService.getById(ocrPicture1.getPictureclassid());
ocrPicture1.setOcrPictureclass(ocrPictureclass);
}
}
return ResultVoUtil.success(pageList); return ResultVoUtil.success(pageList);
} }

@ -1,158 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.admin.service.TenantService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@Api(tags="ocr-分类管理")
@RestController
@RequestMapping("/ocr/ocrPictureclass")
public class OcrPictureclassController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Resource
private OcrPictureclassService ocrPictureclassService;
@Resource
private TenantService tenantService;
@Resource
private UserTokenService userTokenService;
@Resource
private UserService userService;
/**
*
* @return
*/
//@AutoLog(value = "ocr_pictureclass-分页列表查询")
@ApiOperation(value="分类列表", notes="分类列表,无分页")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@GetMapping(value = "/rootList")
public ResultVo<List<OcrPictureclass>> rootList(HttpServletRequest request, HttpServletResponse response) {
//租户主键,由前端页面传送
String tenantId = request.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrPictureclass ocrpictureclass = new OcrPictureclass();
QueryWrapper<OcrPictureclass> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpictureclass);
queryWrapper.eq("TENANTID",tenantId);
queryWrapper.orderByDesc("REORDER");
List<OcrPictureclass> page = this.ocrPictureclassService.queryListNoPage(queryWrapper);;
return ResultVoUtil.success(page);
}
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/list")
public ResultVo<IPage<OcrPictureclass>> listOcrPictureclass(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrPictureclass ocrpictureclass = new OcrPictureclass();
QueryWrapper<OcrPictureclass> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpictureclass);
IPage<OcrPictureclass> page = this.ocrPictureclassService.selectSearchListPage(paramterPage,queryWrapper);
for(OcrPictureclass ocrPictureclass:page.getRecords()){
ocrPictureclass.setTenant(tenantService.selectDtoById(ocrPictureclass.getTenantid()));
}
return ResultVoUtil.success(page);
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@PostMapping("/save")
public ResultVo saveOcrPictureclass(HttpServletResponse response,HttpServletRequest request,OcrPictureclass tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setCreateby(userToken.getLoginname());
tab.setCreatetime(System.currentTimeMillis());
this.ocrPictureclassService.save(tab);
return ResultVoUtil.success();
}
/**
*form
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@PostMapping("/edit")
public ResultVo editOcrPictureclass(HttpServletResponse response,HttpServletRequest request,OcrPictureclass tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setUpdateby(userToken.getLoginname());
tab.setUpdatetime(System.currentTimeMillis());
this.ocrPictureclassService.updateById(tab);
return ResultVoUtil.success();
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/getdata/{id}")
@ResponseBody
public ResultVo getdateOcrPictureclass(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
OcrPictureclass dto = this.ocrPictureclassService.selectDtoById(id);
if(null != dto){
return ResultVoUtil.success(dto);
}else{
return ResultVoUtil.error();
}
}
/**
*id1,2,3
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/delmore")
@ResponseBody
public ResultVo delMoreOcrPictureclass(HttpServletResponse response,HttpServletRequest request) throws IOException{
String ids = request.getParameter("id");
this.ocrPictureclassService.deleteByIdMore(ids);
return ResultVoUtil.success();
}
}

@ -1,75 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@Controller
@RequestMapping("/backstage/oa/ocrpictureclassHtml")
public class OcrPictureclassHtmlController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private OcrPictureclassService ocrPictureclassService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private UserService userService;
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/toList")
public String toListOcrPictureclass(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr/ocrpictureclass/list";
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/toSave")
public String toSaveOcrPictureclass(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr/ocrpictureclass/add";
}
/**
*ID
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/toEdit/{id}")
public String toEditOcrPictureclass(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") String id){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
request.setAttribute("id", id);
return "/backstage/oa/ocr/ocrpictureclass/edit";
}
}

@ -1,113 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturejob;
import cn.jyjz.xiaoyao.ocr.service.OcrPicturejobService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@RestController
@RequestMapping("/backstage/jifen/ocrpicturejob")
public class OcrPicturejobController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private OcrPicturejobService ocrPicturejobService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private UserService userService;
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/list")
public ResultVo<IPage<OcrPicturejob>> listOcrPicturejob(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrPicturejob ocrpicturejob = new OcrPicturejob();
QueryWrapper<OcrPicturejob> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturejob);
IPage<OcrPicturejob> page = this.ocrPicturejobService.selectSearchListPage(paramterPage,queryWrapper);;
return ResultVoUtil.success(page);
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@PostMapping("/save")
public ResultVo saveOcrPicturejob(HttpServletResponse response,HttpServletRequest request,OcrPicturejob tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
this.ocrPicturejobService.save(tab);
return ResultVoUtil.success();
}
/**
*form
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@PostMapping("/edit")
public ResultVo editOcrPicturejob(HttpServletResponse response,HttpServletRequest request,OcrPicturejob tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
this.ocrPicturejobService.updateById(tab);
return ResultVoUtil.success();
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/getdata/{id}")
@ResponseBody
public ResultVo getdateOcrPicturejob(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
OcrPicturejob dto = this.ocrPicturejobService.selectDtoById(id);
if(null != dto){
return ResultVoUtil.success(dto);
}else{
return ResultVoUtil.error();
}
}
/**
*id1,2,3
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/delmore")
@ResponseBody
public ResultVo delMoreOcrPicturejob(HttpServletResponse response,HttpServletRequest request) throws IOException{
String ids = request.getParameter("id");
this.ocrPicturejobService.deleteByIdMore(ids);
return ResultVoUtil.success();
}
}

@ -4,7 +4,6 @@ import java.io.IOException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.ocr.service.OcrPicturejobService;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -28,8 +27,6 @@ public class OcrPicturejobHtmlController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass()); private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private OcrPicturejobService ocrPicturejobService;
@Autowired @Autowired
private UserTokenService userTokenService; private UserTokenService userTokenService;

@ -1,159 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.admin.service.TenantService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
import cn.jyjz.xiaoyao.ocr.service.OcrPicturetypeService;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@RestController
@RequestMapping("/ocr/ocrPicturetype")
public class OcrPicturetypeController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Resource
private OcrPicturetypeService ocrPicturetypeService;
@Resource
private UserTokenService userTokenService;
@Resource
private UserService userService;
@Resource
private TenantService tenantService;
/**
*
*
* @param req
* @return
*/
//@AutoLog(value = "orc_picturetype-分页列表查询")
@ApiOperation(value="图片类型列表", notes="图片类型列表,无分页")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@GetMapping(value = "/rootList")
public ResultVo<List<OcrPicturetype>> queryPageList(HttpServletRequest req) {
//租户主键,由前端页面传送
String tenantId = req.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(req, "search_");
OcrPicturetype ocrpicturetype = new OcrPicturetype();
QueryWrapper<OcrPicturetype> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturetype);
queryWrapper.eq("TENANTID",tenantId);
queryWrapper.orderByDesc("REORDER");
List<OcrPicturetype> list = this.ocrPicturetypeService.queryListNoPage(queryWrapper);
return ResultVoUtil.success(list);
}
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/list")
public ResultVo<IPage<OcrPicturetype>> listOcrPicturetype(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrPicturetype ocrpicturetype = new OcrPicturetype();
QueryWrapper<OcrPicturetype> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturetype);
IPage<OcrPicturetype> page = this.ocrPicturetypeService.selectSearchListPage(paramterPage,queryWrapper);
for(OcrPicturetype ocrPicturetype:page.getRecords()){
ocrPicturetype.setTenant(tenantService.selectDtoById(ocrPicturetype.getTenantid()));
}
return ResultVoUtil.success(page);
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@PostMapping("/save")
public ResultVo saveOcrPicturetype(HttpServletResponse response,HttpServletRequest request,OcrPicturetype tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setCreateby(userToken.getLoginname());
tab.setCreatetime(System.currentTimeMillis());
this.ocrPicturetypeService.save(tab);
return ResultVoUtil.success();
}
/**
*form
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@PostMapping("/edit")
public ResultVo editOcrPicturetype(HttpServletResponse response,HttpServletRequest request,OcrPicturetype tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setUpdateby(userToken.getLoginname());
tab.setUpdatetime(System.currentTimeMillis());
this.ocrPicturetypeService.updateById(tab);
return ResultVoUtil.success();
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/getdata/{id}")
@ResponseBody
public ResultVo getdateOcrPicturetype(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
OcrPicturetype dto = this.ocrPicturetypeService.selectDtoById(id);
if(null != dto){
return ResultVoUtil.success(dto);
}else{
return ResultVoUtil.error();
}
}
/**
*id1,2,3
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/delmore")
@ResponseBody
public ResultVo delMoreOcrPicturetype(HttpServletResponse response,HttpServletRequest request) throws IOException{
String ids = request.getParameter("id");
this.ocrPicturetypeService.deleteByIdMore(ids);
return ResultVoUtil.success();
}
}

@ -1,75 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.ocr.service.OcrPicturetypeService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@Controller
@RequestMapping("/backstage/oa/ocrpicturetypeHtml")
public class OcrPicturetypeHtmlController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private OcrPicturetypeService ocrPicturetypeService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private UserService userService;
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/toList")
public String toListOcrPicturetype(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr/ocrpicturetype/list";
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/toSave")
public String toSaveOcrPicturetype(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr/ocrpicturetype/add";
}
/**
*ID
*mail.zhangyong@gmail.com
*2024-01-14 10:27:01
**/
@GetMapping("/toEdit/{id}")
public String toEditOcrPicturetype(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") String id){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
request.setAttribute("id", id);
return "/backstage/oa/ocr/ocrpicturetype/edit";
}
}

@ -1,156 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.admin.service.TenantService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
import cn.jyjz.xiaoyao.ocr.service.OcrPlanService;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@RestController
@RequestMapping("/ocr/ocrPlan")
public class OcrPlanController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Resource
private OcrPlanService ocrPlanService;
@Resource
private UserTokenService userTokenService;
@Resource
private UserService userService;
@Resource
private TenantService tenantService;
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@ApiOperation(value="ocr_任务计划列表查询", notes="ocr_任务计划列表查询无分页")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@GetMapping("/listall")
public ResultVo<List<OcrPlan>> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{
//租户主键,由前端页面传送
String tenantId = request.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrPlan ocrplan = new OcrPlan();
QueryWrapper<OcrPlan> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrplan);
queryWrapper.eq("TENANTID",tenantId);
queryWrapper.orderByDesc("REORDER");
List<OcrPlan> page = this.ocrPlanService.queryListNoPage(queryWrapper);;
return ResultVoUtil.success(page);
}
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/list")
public ResultVo<IPage<OcrPlan>> listOcrPlan(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrPlan ocrplan = new OcrPlan();
QueryWrapper<OcrPlan> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrplan);
IPage<OcrPlan> page = this.ocrPlanService.selectSearchListPage(paramterPage,queryWrapper);
for(OcrPlan ocrPlan:page.getRecords()){
ocrPlan.setTenant(tenantService.selectDtoById(ocrPlan.getTenantid()));
}
return ResultVoUtil.success(page);
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@PostMapping("/save")
public ResultVo saveOcrPlan(HttpServletResponse response,HttpServletRequest request,OcrPlan tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setCreateby(userToken.getLoginname());
tab.setCreatetime(System.currentTimeMillis());
this.ocrPlanService.save(tab);
return ResultVoUtil.success();
}
/**
*form
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@PostMapping("/edit")
public ResultVo editOcrPlan(HttpServletResponse response,HttpServletRequest request,OcrPlan tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setUpdateby(userToken.getLoginname());
tab.setUpdatetime(System.currentTimeMillis());
this.ocrPlanService.updateById(tab);
return ResultVoUtil.success();
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/getdata/{id}")
@ResponseBody
public ResultVo getdateOcrPlan(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
OcrPlan dto = this.ocrPlanService.selectDtoById(id);
if(null != dto){
return ResultVoUtil.success(dto);
}else{
return ResultVoUtil.error();
}
}
/**
*id1,2,3
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/delmore")
@ResponseBody
public ResultVo delMoreOcrPlan(HttpServletResponse response,HttpServletRequest request) throws IOException{
String ids = request.getParameter("id");
this.ocrPlanService.deleteByIdMore(ids);
return ResultVoUtil.success();
}
}

@ -1,75 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.ocr.service.OcrPlanService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@Controller
@RequestMapping("/backstage/oa/ocrplanHtml")
public class OcrPlanHtmlController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private OcrPlanService ocrPlanService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private UserService userService;
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/toList")
public String toListOcrPlan(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr/ocrplan/list";
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/toSave")
public String toSaveOcrPlan(HttpServletResponse response,HttpServletRequest request){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
return "/backstage/oa/ocr/ocrplan/add";
}
/**
*ID
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/toEdit/{id}")
public String toEditOcrPlan(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") String id){
String resourceid = request.getParameter("resourceid");
request.setAttribute("resourceid",resourceid);
request.setAttribute("id", id);
return "/backstage/oa/ocr/ocrplan/edit";
}
}

@ -1,73 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince;
import cn.jyjz.xiaoyao.ocr.service.OcrProvinceService;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@Api(tags="ocr_省份管理")
@RestController
@RequestMapping("/backstage/ocrnewtest/ocrprovince")
public class OcrProvinceController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private OcrProvinceService ocrProvinceService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private UserService userService;
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-03-10 23:18:35
**/
@ApiOperation(value="省份列表", notes="省份列表")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@GetMapping("/listall")
public ResultVo<List<OcrProvince>> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{
//租户主键,由前端页面传送
String tenantId = request.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
QueryWrapper<OcrProvince> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("tenantid",tenantId);
List<OcrProvince> list = this.ocrProvinceService.getProvinceAll(queryWrapper);
return ResultVoUtil.success(list);
}
}

@ -1,155 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
import cn.jyjz.xiaoyao.ocr.service.OcrUpuserService;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@Api(tags="ocr_提报人管理")
@RestController
@RequestMapping("/ocr/ocrUpuser")
public class OcrUpuserController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Autowired
private OcrUpuserService ocrUpuserService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private UserService userService;
/**
*
*
* @return
*/
//@AutoLog(value = "ocr_upuser-分页列表查询")
@ApiOperation(value="ocr_提报人查询", notes="ocr_提报人查询无分页")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@GetMapping(value = "/listall")
public ResultVo<IPage<OcrUpuser>> queryPageList(
HttpServletRequest req) {
//租户主键,由前端页面传送
String tenantId = req.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(req, "search_");
OcrUpuser ocrUpuser = new OcrUpuser();
QueryWrapper<OcrUpuser> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrUpuser);
queryWrapper.eq("tenant_id",tenantId);
queryWrapper.orderByAsc("convert(upname using gbk)");
List<OcrUpuser> pageList = ocrUpuserService.queryListNoPage(queryWrapper);
return ResultVoUtil.success(pageList);
}
/**
*jsondto
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/list")
public ResultVo<IPage<OcrUpuser>> listOcrUpuser(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
OcrUpuser ocrupuser = new OcrUpuser();
QueryWrapper<OcrUpuser> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrupuser);
IPage<OcrUpuser> page = this.ocrUpuserService.selectSearchListPage(paramterPage,queryWrapper);;
return ResultVoUtil.success(page);
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@PostMapping("/save")
public ResultVo saveOcrUpuser(HttpServletResponse response,HttpServletRequest request,OcrUpuser tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setCreateBy(userToken.getLoginname());
tab.setCreateTime(System.currentTimeMillis());
this.ocrUpuserService.save(tab);
return ResultVoUtil.success();
}
/**
*form
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@PostMapping("/edit")
public ResultVo editOcrUpuser(HttpServletResponse response,HttpServletRequest request,OcrUpuser tab) throws IOException{
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
tab.setUpdateBy(userToken.getLoginname());
tab.setUpdateTime(System.currentTimeMillis());
this.ocrUpuserService.updateById(tab);
return ResultVoUtil.success();
}
/**
*
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/getdata/{id}")
@ResponseBody
public ResultVo getdateOcrUpuser(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
OcrUpuser dto = this.ocrUpuserService.selectDtoById(id);
if(null != dto){
return ResultVoUtil.success(dto);
}else{
return ResultVoUtil.error();
}
}
/**
*id1,2,3
*mail.zhangyong@gmail.com
*2024-01-14 10:27:02
**/
@GetMapping("/delmore")
@ResponseBody
public ResultVo delMoreOcrUpuser(HttpServletResponse response,HttpServletRequest request) throws IOException{
String ids = request.getParameter("id");
this.ocrUpuserService.deleteByIdMore(ids);
return ResultVoUtil.success();
}
}

@ -1,305 +0,0 @@
package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrConfiguration;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchchildService;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import cn.jyjz.xiaoyao.admin.service.UserService;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.controller.BaseController;
import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@Api(tags="ocr-过滤条件管理")
@RestController
@RequestMapping("/ocr/ocrUsersearch")
public class OcrUsersearchController extends BaseController{
private Logger log = LoggerFactory.getLogger(this.getClass());
@Resource
private OcrUsersearchService ocrUsersearchService;
@Resource
private OcrUsersearchchildService ocrUsersearchchildService;
@Resource
private UserTokenService userTokenService;
@Resource
private UserService userService;
/**
*
*
* @param pageNo
* @param pageSize
* @param request
* @return
*/
@ApiOperation(value="过滤条件列表", notes="过滤条件列表")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@GetMapping(value = "/list")
public ResultVo<IPage<OcrUsersearch>> queryPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="type") @ApiParam(value = "类型(首页为0终审为1)", required = true) Integer type,
HttpServletRequest request) {
//获取当前登录人
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
ParamterPage paramterPage = new ParamterPage();
paramterPage.setPagesize(pageSize);
paramterPage.setStart(pageNo);
//租户主键,由前端页面传送
String tenantId = request.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
OcrUsersearch ocrUsersearch = new OcrUsersearch();
SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
QueryWrapper<OcrUsersearch> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrUsersearch);
queryWrapper.eq("USERID",userToken.getUserid());
queryWrapper.eq("TENANTID",tenantId);
queryWrapper.eq("TYPE",type);
queryWrapper.orderByDesc(Arrays.asList("IZTOP","REORDER"));
IPage<OcrUsersearch> pageList = ocrUsersearchService.selectSearchListPage(paramterPage, queryWrapper);
for(OcrUsersearch ocrUsersearch1:pageList.getRecords()){
List<OcrUsersearchchild> ocrUsersearchchildList = ocrUsersearchchildService.selectByMainId(ocrUsersearch1.getId().toString());
ocrUsersearch1.setOcrUsersearchchildList(ocrUsersearchchildList);
}
return ResultVoUtil.success(pageList);
}
/**
*
*
* @param ocrUsersearch
* @return
*/
@ApiOperation(value="添加过滤条件", notes="添加过滤条件")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@PostMapping(value = "/add")
public ResultVo<String> add(@RequestBody OcrUsersearch ocrUsersearch, HttpServletRequest req) {
//租户主键,由前端页面传送
String tenantId = req.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
//获取当前登录人
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
ocrUsersearch.setUserid(Long.parseLong(userToken.getUserid()));
ocrUsersearch.setCreatetime(System.currentTimeMillis());
ocrUsersearch.setCreateby(userToken.getLoginname());
ocrUsersearch.setTenantid(Long.parseLong(tenantId));
ocrUsersearch.setReorder(this.ocrUsersearchService.getReorder(ocrUsersearch.getUserid(),ocrUsersearch.getType()));
ocrUsersearch.setType(ocrUsersearch.getType());
if(null != ocrUsersearch.getId()){
this.ocrUsersearchService.removeByIds(ocrUsersearch.getId().toString());
}
this.ocrUsersearchService.save(ocrUsersearch);
if(null != ocrUsersearch.getOcrUsersearchchildList()){
for(OcrUsersearchchild ocrUsersearchchild:ocrUsersearch.getOcrUsersearchchildList()){
ocrUsersearchchild.setUsersearchid(ocrUsersearch.getId());
}
this.ocrUsersearchchildService.saveBatch(ocrUsersearch.getOcrUsersearchchildList());
}
return ResultVoUtil.success("添加成功!");
}
/**
*
*
* @param ocrUsersearch
* @return
*/
@ApiOperation(value="修改过滤条件", notes="修改过滤条件")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
})
@PostMapping(value = "/edit")
public ResultVo<String> edit(@RequestBody OcrUsersearch ocrUsersearch, HttpServletRequest req) {
//租户主键,由前端页面传送
String tenantId = req.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
OcrUsersearch old = this.ocrUsersearchService.getById(ocrUsersearch.getId());
if(null == old){
return ResultVoUtil.error("数据错误。");
}
//获取当前登录人
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
ocrUsersearch.setUserid(old.getUserid());
ocrUsersearch.setCreatetime(old.getCreatetime());
ocrUsersearch.setCreateby(old.getCreateby());
ocrUsersearch.setTenantid(old.getTenantid());
ocrUsersearch.setReorder(old.getReorder());
ocrUsersearch.setIztop(old.getIztop());
ocrUsersearch.setUpdateby(userToken.getLoginname());
ocrUsersearch.setUpdatetime(System.currentTimeMillis());
if(null != ocrUsersearch.getId()){
this.ocrUsersearchService.removeChildByIds(ocrUsersearch.getId().toString());
}
this.ocrUsersearchService.updateById(ocrUsersearch);
if(null != ocrUsersearch.getOcrUsersearchchildList()){
for(OcrUsersearchchild ocrUsersearchchild:ocrUsersearch.getOcrUsersearchchildList()){
ocrUsersearchchild.setUsersearchid(ocrUsersearch.getId());
}
this.ocrUsersearchchildService.saveBatch(ocrUsersearch.getOcrUsersearchchildList());
}
return ResultVoUtil.success("添加成功!");
}
/**
*
*
* @return
*/
@ApiOperation(value="调整顺序", notes="调整顺序")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
@ApiImplicitParam(paramType = "path",name = "searchid", value = "个人过滤主键", required = true),
@ApiImplicitParam(paramType = "path",name = "reorder", value = "排序数值,数值越大越靠前", required = true)
})
@GetMapping(value = "/reorder")
public ResultVo<String> reorder( HttpServletRequest req ,
@RequestParam(name="searchid", required = true) String searchid,
@RequestParam(name="reorder", defaultValue="1") Integer reorder) {
OcrUsersearch old = this.ocrUsersearchService.getById(searchid);
if(null == old){
return ResultVoUtil.error("数据错误。");
}
old.setReorder(reorder);
return this.ocrUsersearchService.updateById(old)?ResultVoUtil.success():ResultVoUtil.error();
}
/**
*
*
* @return
*/
@ApiOperation(value="收藏", notes="收藏")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
@ApiImplicitParam(paramType = "path",name = "searchid", value = "个人过滤主键", required = true)
})
@GetMapping(value = "/collect")
public ResultVo<String> collect( HttpServletRequest req) {
String searchid = req.getParameter("searchid");
OcrUsersearch old = this.ocrUsersearchService.getById(searchid);
if(null == old){
return ResultVoUtil.error("数据错误。");
}
old.setIztop(1);
return this.ocrUsersearchService.updateById(old)?ResultVoUtil.success():ResultVoUtil.error();
}
/**
*
*
* @return
*/
@ApiOperation(value="取消收藏", notes="取消收藏")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
@ApiImplicitParam(paramType = "path",name = "searchid", value = "个人过滤主键", required = true)
})
@GetMapping(value = "/collectreset")
public ResultVo<String> collectreset(HttpServletRequest req) {
String searchid = req.getParameter("searchid");
OcrUsersearch old = this.ocrUsersearchService.getById(searchid);
if(null == old){
return ResultVoUtil.error("数据错误。");
}
old.setIztop(0);
return this.ocrUsersearchService.updateById(old)?ResultVoUtil.success():ResultVoUtil.error();
}
/**
*
*
* @param ids
* @return
*/
@ApiOperation(value="批量删除过滤条件-通过id", notes="批量删除过滤条件-通过id")
@GetMapping(value = "/deleteBatch")
public ResultVo<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
return this.ocrUsersearchService.removeByIds(ids)?ResultVoUtil.success("批量删除成功!"):ResultVoUtil.error();
}
/**
* id
*
* @param id
* @return
*/
//@AutoLog(value = "ocr_usersearch-通过id查询")
@ApiOperation(value="查询过滤条件详情-通过id", notes="查询过滤条件详情-通过id")
@GetMapping(value = "/queryById")
public ResultVo<OcrUsersearch> queryById(@RequestParam(name="id",required=true) String id) {
OcrUsersearch ocrUsersearch = ocrUsersearchService.getById(id);
List<OcrUsersearchchild> list = ocrUsersearchchildService.selectByMainId(id);
ocrUsersearch.setOcrUsersearchchildList(list);
if(ocrUsersearch==null) {
return ResultVoUtil.error("未找到对应数据");
}
return ResultVoUtil.success(ocrUsersearch);
}
}

@ -1,11 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
*
*/
@Mapper
public interface OcrAreaMybatisDao extends BaseMapper<OcrArea> {
}

@ -1,6 +1,5 @@
package cn.jyjz.xiaoyao.ocr.dataDao; package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

@ -22,4 +22,6 @@ public interface OcrMsgMapper extends BaseMapper<OcrMsg> {
List<List<Map<Object, String>>> selectPage(@Param("userid")String userid,@Param("msgCategory")String msgCategory); List<List<Map<Object, String>>> selectPage(@Param("userid")String userid,@Param("msgCategory")String msgCategory);
Map<Object, String> selectone(@Param("id")String id); Map<Object, String> selectone(@Param("id")String id);
int selectUnreadMsgCount(@Param("userId") String userid);
} }

@ -1,11 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
*
*/
@Mapper
public interface OcrPictureclassMybatisDao extends BaseMapper<OcrPictureclass> {
}

@ -1,30 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturejob;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
*/
@Mapper
public interface OcrPicturejobMybatisDao extends BaseMapper<OcrPicturejob> {
/**
* id
*
* @param mainId id
* @return boolean
*/
public boolean deleteByMainId(@Param("mainId") String mainId);
/**
* id
*
* @param mainId id
* @return List<OcrPicturejob>
*/
public List<OcrPicturejob> selectByMainId(@Param("mainId") String mainId);
}

@ -1,11 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
*
*/
@Mapper
public interface OcrPicturetypeMybatisDao extends BaseMapper<OcrPicturetype> {
}

@ -1,11 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
*
*/
@Mapper
public interface OcrPlanMybatisDao extends BaseMapper<OcrPlan> {
}

@ -1,11 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
*
*/
@Mapper
public interface OcrProvinceMybatisDao extends BaseMapper<OcrProvince> {
}

@ -1,11 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
*
*/
@Mapper
public interface OcrUpuserMybatisDao extends BaseMapper<OcrUpuser> {
}

@ -1,114 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "图片地区管理", title = "图片地区管理")
@TableName(value = "ocr_area")
public class OcrArea implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = 8088861709460050761L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID")
private Long id;
@Schema(description = "创建人")
@TableField(value="CREATEBY")
private String createby;
@Schema(description = "创建时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="CREATETIME")
private Long createtime;
@Schema(description = "修改人")
@TableField(value="UPDATEBY")
private String updateby;
@Schema(description = "修改时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="UPDATETIME")
private Long updatetime;
@Schema(description = "租户ID")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="TENANTID")
private Long tenantid;
@Schema(description = "省份主键")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="PROVINCEID")
private Long provinceid;
@Schema(description = "地区名称")
@TableField(value="CITYNAME")
private String cityname;
@Schema(description = "排序字段")
@TableField(value="REORDER")
private Integer reorder;
//租户对象
@TableField(exist = false)
private Tenant tenant;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
@JsonIgnore
private final Map<String,String> query = Stream.of(
new SimpleEntry<>("listdept","deptid"),
new SimpleEntry<>("ID","id"),
new SimpleEntry<>("create_by","createBy"),
new SimpleEntry<>("create_time","createTime"),
new SimpleEntry<>("update_by","updateBy"),
new SimpleEntry<>("update_time","updateTime"),
new SimpleEntry<>("TENANTID","tenant_id"),
new SimpleEntry<>("PID","pid"),
new SimpleEntry<>("HASCHILD","has_child"),
new SimpleEntry<>("TYPENAME","typename")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname){
String obj = null;
if(null != query && query.size() > 0){
obj = query.get(filedname);
}
return obj;
}
}

@ -354,9 +354,6 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
private String location; private String location;
//图片分类
@TableField(exist = false)
private OcrPictureclass ocrPictureclass;
//保存当前登录用户的数据权限范围的搜索条件 //保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false) @TableField(exist = false)

@ -1,115 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer;
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "图片分类表", title = "图片分类表")
@TableName(value = "ocr_pictureclass")
public class OcrPictureclass implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = -2826818582872L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID")
private Long id;
@Schema(description = "创建人")
@TableField(value="CREATEBY")
private String createby;
@Schema(description = "创建时间")
@TableField(value="CREATETIME")
private Long createtime;
@Schema(description = "修改人")
@TableField(value="UPDATEBY")
private String updateby;
@Schema(description = "修改时间")
@TableField(value="UPDATETIME")
private Long updatetime;
@Schema(description = "租户ID")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="TENANTID")
private Long tenantid;
@Schema(description = "父节点默认为0表示根")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="PID")
private Long pid;
@Schema(description = "是否有子节点")
@TableField(value="HASCHILD")
private String haschild;
@Schema(description = "分类名称")
@TableField(value="CLASSNAME")
private String classname;
@Schema(description = "排序字段")
@TableField(value="REORDER")
private Integer reorder;
//租户对象
@TableField(exist = false)
private Tenant tenant;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
@JsonIgnore
private final Map<String,String> query = Stream.of(
new SimpleEntry<>("ID","id"),
new SimpleEntry<>("CREATEBY","createby"),
new SimpleEntry<>("CREATETIME","createtime"),
new SimpleEntry<>("UPDATEBY","updateby"),
new SimpleEntry<>("UPDATETIME","updatetime"),
new SimpleEntry<>("TENANTID","tenantid"),
new SimpleEntry<>("PID","pid"),
new SimpleEntry<>("HASCHILD","haschild"),
new SimpleEntry<>("CLASSNAME","classname"),
new SimpleEntry<>("REORDER","reorder")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname){
String obj = null;
if(null != query && query.size() > 0){
obj = query.get(filedname);
}
return obj;
}
}

@ -1,71 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "任务信息", title = "任务信息")
@TableName(value = "ocr_picturejob")
public class OcrPicturejob implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = -6013503038149483309L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID")
private Long id;
@Schema(description = "原图片主键")
@TableField(value="pictureid")
@JsonSerialize(using = ToStringSerializer.class)
private Long pictureid;
@Schema(description = "任务信息")
@TableField(value="jobnotes")
private String jobnotes;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
@JsonIgnore
private final Map<String,String> query = Stream.of(
new SimpleEntry<>("listdept","deptid"),
new SimpleEntry<>("ID","id"),
new SimpleEntry<>("pictureid","pictureid"),
new SimpleEntry<>("jobnotes","jobnotes")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname){
String obj = null;
if(null != query && query.size() > 0){
obj = query.get(filedname);
}
return obj;
}
}

@ -1,118 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "图片类型表", title = "图片类型表")
@TableName(value = "ocr_picturetype")
public class OcrPicturetype implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = -8397167347516537770L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID")
private Long id;
@Schema(description = "创建人")
@TableField(value="CREATEBY")
private String createby;
@Schema(description = "创建时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="CREATETIME")
private Long createtime;
@Schema(description = "修改人")
@TableField(value="UPDATEBY")
private String updateby;
@Schema(description = "修改时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="UPDATETIME")
private Long updatetime;
@Schema(description = "租户ID")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="TENANTID")
private Long tenantid;
@Schema(description = "父节点默认为0表示根")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="PID")
private Long pid;
@Schema(description = "是否有子节点")
@TableField(value="HASCHILD")
private String haschild;
@Schema(description = "图片类型名称")
@TableField(value="TYPENAME")
private String typename;
@Schema(description = "排序字段")
@TableField(value="REORDER")
private Integer reorder;
//租户对象
@TableField(exist = false)
private Tenant tenant;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
@JsonIgnore
private final Map<String,String> query = Stream.of(
new SimpleEntry<>("ID","id"),
new SimpleEntry<>("CREATEBY","createby"),
new SimpleEntry<>("CREATETIME","createtime"),
new SimpleEntry<>("UPDATEBY","updateby"),
new SimpleEntry<>("UPDATETIME","updatetime"),
new SimpleEntry<>("TENANTID","tenantid"),
new SimpleEntry<>("PID","pid"),
new SimpleEntry<>("HASCHILD","haschild"),
new SimpleEntry<>("TYPENAME","typename"),
new SimpleEntry<>("REORDER","reorder")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname){
String obj = null;
if(null != query && query.size() > 0){
obj = query.get(filedname);
}
return obj;
}
}

@ -1,112 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "任务计划管理", title = "任务计划管理")
@TableName(value = "ocr_plan")
public class OcrPlan implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = 2047885576025511238L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID")
private Long id;
@Schema(description = "创建人")
@TableField(value="CREATEBY")
private String createby;
@Schema(description = "创建时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="CREATETIME")
private Long createtime;
@Schema(description = "修改人")
@TableField(value="UPDATEBY")
private String updateby;
@Schema(description = "修改时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="UPDATETIME")
private Long updatetime;
@Schema(description = "租户ID")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="TENANTID")
private Long tenantid;
@Schema(description = "源系统主键")
@TableField(value="SOURCEPLANID")
private String sourceplanid;
@Schema(description = "计划名称")
@TableField(value="PLANNAME")
private String planname;
@Schema(description = "排序字段")
@TableField(value="REORDER")
private Integer reorder;
//租户对象
@TableField(exist = false)
private Tenant tenant;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
@JsonIgnore
private final Map<String,String> query = Stream.of(
new SimpleEntry<>("ID","id"),
new SimpleEntry<>("CREATEBY","createby"),
new SimpleEntry<>("CREATETIME","createtime"),
new SimpleEntry<>("UPDATEBY","updateby"),
new SimpleEntry<>("UPDATETIME","updatetime"),
new SimpleEntry<>("TENANTID","tenantid"),
new SimpleEntry<>("SOURCEPLANID","sourceplanid"),
new SimpleEntry<>("PLANNAME","planname"),
new SimpleEntry<>("REORDER","reorder")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname){
String obj = null;
if(null != query && query.size() > 0){
obj = query.get(filedname);
}
return obj;
}
}

@ -1,91 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "拜访省份/直辖市", title = "拜访省份/直辖市")
@TableName(value = "ocr_province")
public class OcrProvince implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = 5578479019938662516L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID")
private Long id;
@Schema(description = "创建人")
@TableField(value="CREATEBY")
private String createby;
@Schema(description = "创建时间")
@TableField(value="CREATETIME")
private Long createtime;
@Schema(description = "修改人")
@TableField(value="UPDATEBY")
private String updateby;
@Schema(description = "修改时间")
@TableField(value="UPDATETIME")
private Long updatetime;
@Schema(description = "租户ID")
@TableField(value="TENANTID")
private Long tenantid;
@Schema(description = "省份名称")
@TableField(value="PRONAME")
private String proname;
@Schema(description = "排序字段")
@TableField(value="REORDER")
private Integer reorder;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
private final Map<String,String> query = Stream.of(
new SimpleEntry<>("listdept","deptid"),
new SimpleEntry<>("ID","id"),
new SimpleEntry<>("CREATEBY","createby"),
new SimpleEntry<>("CREATETIME","createtime"),
new SimpleEntry<>("UPDATEBY","updateby"),
new SimpleEntry<>("UPDATETIME","updatetime"),
new SimpleEntry<>("TENANTID","tenantid"),
new SimpleEntry<>("PRONAME","proname"),
new SimpleEntry<>("REORDER","reorder")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname){
String obj = null;
if(null != query && query.size() > 0){
obj = query.get(filedname);
}
return obj;
}
}

@ -1,103 +0,0 @@
package cn.jyjz.xiaoyao.ocr.dataobject;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer;
import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "提报人管理", title = "提报人管理")
@TableName(value = "ocr_upuser")
public class OcrUpuser implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = 2809984041577736011L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID")
private Long id;
@Schema(description = "创建人")
@TableField(value="create_by")
private String createBy;
@Schema(description = "创建时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="create_time")
private Long createTime;
@Schema(description = "修改人")
@TableField(value="update_by")
private String updateBy;
@Schema(description = "修改时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="update_time")
private Long updateTime;
@Schema(description = "租户ID")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="tenant_id")
private Long tenantId;
@Schema(description = "源系统提报人主键")
@TableField(value="upuserid")
private String upuserid;
@Schema(description = "提报人名称")
@TableField(value="upname")
private String upname;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
@JsonIgnore
private final Map<String,String> query = Stream.of(
new SimpleEntry<>("listdept","deptid"),
new SimpleEntry<>("ID","id"),
new SimpleEntry<>("create_by","createBy"),
new SimpleEntry<>("create_time","createTime"),
new SimpleEntry<>("update_by","updateBy"),
new SimpleEntry<>("update_time","updateTime"),
new SimpleEntry<>("tenant_id","tenantId"),
new SimpleEntry<>("upuserid","upuserid"),
new SimpleEntry<>("upname","upname")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname){
String obj = null;
if(null != query && query.size() > 0){
obj = query.get(filedname);
}
return obj;
}
}

@ -32,4 +32,11 @@ public interface IOcrMsgService extends IService<OcrMsg> {
Map<Object, String> selectone(String id); Map<Object, String> selectone(String id);
/**
*
* @param userid
* @return
*/
int queryUnreadMsgCount(String userid);
} }

@ -1,21 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service;
import java.util.List;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
*
*/
public interface OcrAreaService extends BaseService<OcrArea> {
/**
*
*
* @param queryWrapper
* @return List<OcrArea>
*/
List<OcrArea> queryListNoPage(QueryWrapper<OcrArea> queryWrapper);
}

@ -1,16 +1,11 @@
package cn.jyjz.xiaoyao.ocr.service; package cn.jyjz.xiaoyao.ocr.service;
import java.io.Serializable;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureNotes;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturejob;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -50,38 +45,6 @@ public interface OcrPictureService extends BaseService<OcrPicture> {
*/ */
public List<OcrPicture> listByTaskChild(List<String> pictureid); public List<OcrPicture> listByTaskChild(List<String> pictureid);
/**
*
*
* @param ocrPicture
* @param ocrPicturejobList
* @param ocrPictureNotesList
*/
public void saveMain(OcrPicture ocrPicture, List<OcrPicturejob> ocrPicturejobList, List<OcrPictureNotes> ocrPictureNotesList) ;
/**
*
*
* @param ocrPicture
* @param ocrPicturejobList
* @param ocrPictureNotesList
*/
public void updateMain(OcrPicture ocrPicture,List<OcrPicturejob> ocrPicturejobList,List<OcrPictureNotes> ocrPictureNotesList);
/**
*
*
* @param id
*/
public void delMain (String id);
/**
*
*
* @param idList
*/
public void delBatchMain (Collection<? extends Serializable> idList);
/** /**
* id * id
* @param pageNo * @param pageNo

@ -1,22 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service;
import java.util.List;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
*
*/
public interface OcrPictureclassService extends BaseService<OcrPictureclass> {
/**
*
*
* @param queryWrapper
* @return List<OcrPictureclass>
*/
List<OcrPictureclass> queryListNoPage(QueryWrapper<OcrPictureclass> queryWrapper);
}

@ -1,27 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service;
import java.util.List;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturejob;
import org.apache.ibatis.annotations.Param;
/**
*
*/
public interface OcrPicturejobService extends BaseService<OcrPicturejob> {
/**
* id
*
* @param mainId id
* @return boolean
*/
public boolean deleteByMainId(String mainId);
/**
* id
*
* @param mainId id
* @return List<OcrPicturejob>
*/
public List<OcrPicturejob> selectByMainId(String mainId);
}

@ -1,20 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service;
import java.util.List;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
*
*/
public interface OcrPicturetypeService extends BaseService<OcrPicturetype> {
/**
*
*
* @param queryWrapper
* @return List<OcrPicturetype>
*/
List<OcrPicturetype> queryListNoPage(QueryWrapper<OcrPicturetype> queryWrapper);
}

@ -1,21 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service;
import java.util.List;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
*
*/
public interface OcrPlanService extends BaseService<OcrPlan> {
/**
*
*
* @param queryWrapper
* @return List<OcrPictureclass>
*/
List<OcrPlan> queryListNoPage(QueryWrapper<OcrPlan> queryWrapper);
}

@ -1,16 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.List;
/**
*
*/
public interface OcrProvinceService extends BaseService<OcrProvince> {
public List<OcrProvince> getProvinceAll(QueryWrapper<OcrProvince> queryWrapper);
}

@ -1,23 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service;
import java.util.List;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
*
*/
public interface OcrUpuserService extends BaseService<OcrUpuser> {
/**
*
*
* @param queryWrapper
* @return List<OcrPictureclass>
*/
List<OcrUpuser> queryListNoPage(QueryWrapper<OcrUpuser> queryWrapper);
Long selectByUpNameCount(String upname,Long tenantId);
}

@ -1,39 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrAreaMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
import cn.jyjz.xiaoyao.ocr.service.OcrAreaService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
/**
*
*/
@Service
@Slf4j
public class OcrAreaServiceImpl extends BaseServiceImpl<OcrAreaMybatisDao, OcrArea> implements OcrAreaService {
@Autowired
private OcrAreaMybatisDao ocrareamybatisdao;
/**
*
*
* @param queryWrapper
* @return List<OcrArea>
*/
public List<OcrArea> queryListNoPage(QueryWrapper<OcrArea> queryWrapper){
Long count = ocrareamybatisdao.selectCount(queryWrapper);
Page<OcrArea> page = new Page(1,count);
page.setMaxLimit(count);
IPage<OcrArea> iPage = this.page(page,queryWrapper);
return iPage.getRecords();
}
}

@ -5,7 +5,6 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrFieldMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
import cn.jyjz.xiaoyao.ocr.service.OcrFieldService; import cn.jyjz.xiaoyao.ocr.service.OcrFieldService;
import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;

@ -43,4 +43,9 @@ public class OcrMsgServiceImpl extends ServiceImpl<OcrMsgMapper, OcrMsg> impleme
return ocrmsgmapper.selectone(id); return ocrmsgmapper.selectone(id);
} }
@Override
public int queryUnreadMsgCount(String userid) {
return ocrmsgmapper.selectUnreadMsgCount(userid);
}
} }

@ -73,8 +73,6 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
@Resource @Resource
private OcrPictureMybatisDao ocrpicturemybatisdao; private OcrPictureMybatisDao ocrpicturemybatisdao;
@Resource
private OcrPicturejobService ocrPicturejobService;
@Resource @Resource
private OcrPictureNotesService ocrPictureNotesService; private OcrPictureNotesService ocrPictureNotesService;
@ -92,9 +90,6 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
@Resource @Resource
private OcrUsersearchService ocrUsersearchService; private OcrUsersearchService ocrUsersearchService;
@Resource
private OcrPictureclassService ocrPictureclassService;
@Resource @Resource
private CategoryService categoryService; private CategoryService categoryService;
@ -598,70 +593,6 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
return null; return null;
} }
@Override
@Transactional(rollbackFor = Exception.class)
public void saveMain(OcrPicture ocrPicture, List<OcrPicturejob> ocrPicturejobList, List<OcrPictureNotes> ocrPictureNotesList) {
ocrpicturemybatisdao.insert(ocrPicture);
if (ocrPicturejobList != null && ocrPicturejobList.size() > 0) {
for (OcrPicturejob entity : ocrPicturejobList) {
//外键设置
entity.setPictureid(ocrPicture.getId());
ocrPicturejobService.save(entity);
}
}
if (ocrPictureNotesList != null && ocrPictureNotesList.size() > 0) {
for (OcrPictureNotes entity : ocrPictureNotesList) {
//外键设置
entity.setPictureid(ocrPicture.getId());
ocrPictureNotesService.save(entity);
}
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateMain(OcrPicture ocrPicture, List<OcrPicturejob> ocrPicturejobList, List<OcrPictureNotes> ocrPictureNotesList) {
ocrpicturemybatisdao.updateById(ocrPicture);
//1.先删除子表数据
ocrPicturejobService.deleteByMainId(ocrPicture.getId().toString());
ocrPictureNotesService.deleteByMainId(ocrPicture.getId().toString());
//2.子表数据重新插入
if (ocrPicturejobList != null && ocrPicturejobList.size() > 0) {
for (OcrPicturejob entity : ocrPicturejobList) {
//外键设置
entity.setPictureid(ocrPicture.getId());
ocrPicturejobService.save(entity);
}
}
if (ocrPictureNotesList != null && ocrPictureNotesList.size() > 0) {
for (OcrPictureNotes entity : ocrPictureNotesList) {
//外键设置
entity.setPictureid(ocrPicture.getId());
ocrPictureNotesService.save(entity);
}
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delMain(String id) {
ocrPicturejobService.deleteByMainId(id);
ocrPictureNotesService.deleteByMainId(id);
ocrpicturemybatisdao.deleteById(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delBatchMain(Collection<? extends Serializable> idList) {
for (Serializable id : idList) {
ocrPicturejobService.deleteByMainId(id.toString());
ocrPictureNotesService.deleteByMainId(id.toString());
ocrpicturemybatisdao.deleteById(id);
}
}
@Override @Override
public IPage<OcrPicture> queryPageByUserSearchId(Integer pageNo, Integer pageSize, String userSearchId) { public IPage<OcrPicture> queryPageByUserSearchId(Integer pageNo, Integer pageSize, String userSearchId) {
OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId); OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId);
@ -676,12 +607,6 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
//分页查询并组装子集数据 //分页查询并组装子集数据
Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize); Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
IPage<OcrPicture> pageList = this.page(page, queryWrapper); IPage<OcrPicture> pageList = this.page(page, queryWrapper);
for (OcrPicture ocrPicture1 : pageList.getRecords()) {
if (StringUtils.isNotBlank(ocrPicture1.getPictureclassid())) {
OcrPictureclass ocrPictureclass = ocrPictureclassService.getById(ocrPicture1.getPictureclassid());
ocrPicture1.setOcrPictureclass(ocrPictureclass);
}
}
return pageList; return pageList;
} }

@ -1,43 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrPictureclassMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService;
import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
*
*/
@Service
@Slf4j
public class OcrPictureclassServiceImpl extends BaseServiceImpl<OcrPictureclassMybatisDao, OcrPictureclass> implements OcrPictureclassService {
@Autowired
private OcrPictureclassMybatisDao ocrpictureclassmybatisdao;
@Override
public List<OcrPictureclass> queryListNoPage(QueryWrapper<OcrPictureclass> queryWrapper) {
Long count = ocrpictureclassmybatisdao.selectCount(queryWrapper);
Page<OcrPictureclass> page = new Page(1,count);
page.setMaxLimit(count);
IPage<OcrPictureclass> iPage = this.page(page,queryWrapper);
return iPage.getRecords();
}
}

@ -1,40 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrPicturejobMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturejob;
import cn.jyjz.xiaoyao.ocr.service.OcrPicturejobService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
/**
*
*/
@Service
@Slf4j
public class OcrPicturejobServiceImpl extends BaseServiceImpl<OcrPicturejobMybatisDao, OcrPicturejob> implements OcrPicturejobService {
@Autowired
private OcrPicturejobMybatisDao ocrpicturejobmybatisdao;
/**
* id
*
* @param mainId id
* @return boolean
*/
public boolean deleteByMainId(String mainId){
return ocrpicturejobmybatisdao.deleteByMainId(mainId);
}
/**
* id
*
* @param mainId id
* @return List<OcrPicturejob>
*/
public List<OcrPicturejob> selectByMainId(String mainId){
return ocrpicturejobmybatisdao.selectByMainId(mainId);
}
}

@ -1,40 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrPicturetypeMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
import cn.jyjz.xiaoyao.ocr.service.OcrPicturetypeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
/**
*
*/
@Service
@Slf4j
public class OcrPicturetypeServiceImpl extends BaseServiceImpl<OcrPicturetypeMybatisDao, OcrPicturetype> implements OcrPicturetypeService {
@Autowired
private OcrPicturetypeMybatisDao ocrpicturetypemybatisdao;
/**
*
*
* @param queryWrapper
* @return List<OcrPicturetype>
*/
public List<OcrPicturetype> queryListNoPage(QueryWrapper<OcrPicturetype> queryWrapper){
Long count = this.ocrpicturetypemybatisdao.selectCount(queryWrapper);
Page<OcrPicturetype> page = new Page(1,count);
page.setMaxLimit(count);
IPage<OcrPicturetype> iPage = this.ocrpicturetypemybatisdao.selectPage(page,queryWrapper);
return iPage.getRecords();
}
}

@ -1,39 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrPlanMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
import cn.jyjz.xiaoyao.ocr.service.OcrPlanService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
/**
*
*/
@Service
@Slf4j
public class OcrPlanServiceImpl extends BaseServiceImpl<OcrPlanMybatisDao, OcrPlan> implements OcrPlanService {
@Autowired
private OcrPlanMybatisDao ocrplanmybatisdao;
/**
*
*
* @param queryWrapper
* @return List<OcrPlan>
*/
public List<OcrPlan> queryListNoPage(QueryWrapper<OcrPlan> queryWrapper){
Long count = ocrplanmybatisdao.selectCount(queryWrapper);
Page<OcrPlan> page = new Page(1,count);
page.setMaxLimit(count);
IPage<OcrPlan> iPage = this.page(page,queryWrapper);
return iPage.getRecords();
}
}

@ -1,32 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrProvinceMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince;
import cn.jyjz.xiaoyao.ocr.service.OcrProvinceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
/**
*
*/
@Service
@Slf4j
public class OcrProvinceServiceImpl extends BaseServiceImpl<OcrProvinceMybatisDao, OcrProvince> implements OcrProvinceService {
@Autowired
private OcrProvinceMybatisDao ocrprovincemybatisdao;
public List<OcrProvince> getProvinceAll(QueryWrapper<OcrProvince> queryWrapper){
Long count = this.count(queryWrapper);
Page<OcrProvince> page = new Page<>(0, count);
IPage<OcrProvince> iPage = this.ocrprovincemybatisdao.selectPage(page,queryWrapper);
return iPage.getRecords();
}
}

@ -1,47 +0,0 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrUpuserMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
import cn.jyjz.xiaoyao.ocr.service.OcrUpuserService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
/**
*
*/
@Service
@Slf4j
public class OcrUpuserServiceImpl extends BaseServiceImpl<OcrUpuserMybatisDao, OcrUpuser> implements OcrUpuserService {
@Autowired
private OcrUpuserMybatisDao ocrupusermybatisdao;
/**
*
*
* @param queryWrapper
* @return List<OcrPictureclass>
*/
public List<OcrUpuser> queryListNoPage(QueryWrapper<OcrUpuser> queryWrapper){
Long count = ocrupusermybatisdao.selectCount(queryWrapper);
Page<OcrUpuser> page = new Page(1,count);
page.setMaxLimit(count);
IPage<OcrUpuser> iPage = this.page(page,queryWrapper);
return iPage.getRecords();
}
@Override
public Long selectByUpNameCount(String upname,Long tenantId) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("tenant_id",tenantId);
queryWrapper.eq("upname",upname);
return baseMapper.selectCount(queryWrapper);
}
}

@ -3,11 +3,7 @@ package cn.jyjz.xiaoyao.ocr.util;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService; import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService;
import cn.jyjz.xiaoyao.ocr.service.OcrPlanService;
import cn.jyjz.xiaoyao.ocr.service.OcrUpuserService;
import liquibase.pro.packaged.E;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

@ -41,9 +41,12 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable {
@ApiModelProperty(value = "拜访地区") @ApiModelProperty(value = "拜访地区")
private String releaseProvince; private String releaseProvince;
@ApiModelProperty(value = "所属项目") @ApiModelProperty(value = "所属项目id")
private String fromprojectid; private String fromprojectid;
@ApiModelProperty(value = "所属项目名称")
private String projectName;
@ApiModelProperty(value = "产品名称") @ApiModelProperty(value = "产品名称")
private String productName; private String productName;

@ -1,47 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrAreaMybatisDao">
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrArea">
<id column="ID" property="id" jdbcType="BIGINT"/>
<result column="CREATEBY" property="createby" jdbcType="VARCHAR"/>
<result column="CREATETIME" property="createtime" jdbcType="BIGINT"/>
<result column="UPDATEBY" property="updateby" jdbcType="VARCHAR"/>
<result column="UPDATETIME" property="updatetime" jdbcType="BIGINT"/>
<result column="TENANTID" property="tenantid" jdbcType="BIGINT"/>
<result column="PROVINCEID" property="provinceid" jdbcType="BIGINT"/>
<result column="CITYNAME" property="cityname" jdbcType="VARCHAR"/>
<result column="REORDER" property="reorder" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
ID AS id,
CREATEBY AS createby,
CREATETIME AS createtime,
UPDATEBY AS updateby,
UPDATETIME AS updatetime,
TENANTID AS tenantid,
PROVINCEID AS provinceid,
CITYNAME AS cityname,
REORDER AS reorder
</sql>
<sql id="Base_Where">
<where>
<trim prefixOverrides="and|or">
<if test="id != null"> and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="createby != null"> and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend}</if>
<if test="createtime != null"> and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend}</if>
<if test="updateby != null"> and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend}</if>
<if test="updatetime != null"> and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if>
<if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="provinceid != null"> and PROVINCEID ${provinceid.dataOp} ${provinceid.likestar}#{provinceid.value}${provinceid.likeend}</if>
<if test="cityname != null"> and CITYNAME ${cityname.dataOp} ${cityname.likestar}#{cityname.value}${cityname.likeend}</if>
<if test="reorder != null"> and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend}</if>
</trim>
</where>
<if test="page != null">
<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if>
limit ${page.start}, ${page.Pagesize}
</if>
</sql>
</mapper>

@ -84,4 +84,11 @@
id = #{id} id = #{id}
</select> </select>
<select id="selectUnreadMsgCount" resultType="int">
select count(om.id) from ocr_msg om
left join ocr_msg_read omr on om.id = omr.msg_id
where (om.receive_user_ids like CONCAT('%', #{userId}, '%') or om.receive_user_type = 2) and omr.read_flag is NULL
</select>
</mapper> </mapper>

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrPictureclassMybatisDao">
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass">
<id column="ID" property="id" jdbcType="BIGINT"/>
<result column="CREATEBY" property="createby" jdbcType="VARCHAR"/>
<result column="CREATETIME" property="createtime" jdbcType="BIGINT"/>
<result column="UPDATEBY" property="updateby" jdbcType="VARCHAR"/>
<result column="UPDATETIME" property="updatetime" jdbcType="BIGINT"/>
<result column="TENANTID" property="tenantid" jdbcType="BIGINT"/>
<result column="PID" property="pid" jdbcType="BIGINT"/>
<result column="HASCHILD" property="haschild" jdbcType="VARCHAR"/>
<result column="CLASSNAME" property="classname" jdbcType="VARCHAR"/>
<result column="REORDER" property="reorder" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
ID AS id,
CREATEBY AS createby,
CREATETIME AS createtime,
UPDATEBY AS updateby,
UPDATETIME AS updatetime,
TENANTID AS tenantid,
PID AS pid,
HASCHILD AS haschild,
CLASSNAME AS classname,
REORDER AS reorder
</sql>
<sql id="Base_Where">
<where>
<trim prefixOverrides="and|or">
<if test="id != null"> and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="createby != null"> and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend}</if>
<if test="createtime != null"> and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend}</if>
<if test="updateby != null"> and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend}</if>
<if test="updatetime != null"> and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if>
<if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="pid != null"> and PID ${pid.dataOp} ${pid.likestar}#{pid.value}${pid.likeend}</if>
<if test="haschild != null"> and HASCHILD ${haschild.dataOp} ${haschild.likestar}#{haschild.value}${haschild.likeend}</if>
<if test="classname != null"> and CLASSNAME ${classname.dataOp} ${classname.likestar}#{classname.value}${classname.likeend}</if>
<if test="reorder != null"> and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend}</if>
</trim>
</where>
<if test="page != null">
<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if>
limit ${page.start}, ${page.Pagesize}
</if>
</sql>
</mapper>

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrPicturejobMybatisDao">
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturejob">
<id column="ID" property="id" jdbcType="BIGINT"/>
<result column="pictureid" property="pictureid" jdbcType="BIGINT"/>
<result column="jobnotes" property="jobnotes" jdbcType="LONGVARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
ID AS id,
pictureid AS pictureid,
jobnotes AS jobnotes
</sql>
<sql id="Base_Where">
<where>
<trim prefixOverrides="and|or">
<if test="id != null"> and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="pictureid != null"> and pictureid ${pictureid.dataOp} ${pictureid.likestar}#{pictureid.value}${pictureid.likeend}</if>
<if test="jobnotes != null"> and jobnotes ${jobnotes.dataOp} ${jobnotes.likestar}#{jobnotes.value}${jobnotes.likeend}</if>
<if test="userid != null"> and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
<if test="listdept != null">
and DEPARTID in
<foreach collection="listdept.value" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</trim>
</where>
<if test="page != null">
<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if>
limit ${page.start}, ${page.Pagesize}
</if>
</sql>
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
FROM ocr_picturejob
WHERE
pictureid = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturejob">
SELECT *
FROM ocr_picturejob
WHERE
pictureid = #{mainId} </select>
</mapper>

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrPicturetypeMybatisDao">
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype">
<id column="ID" property="id" jdbcType="BIGINT"/>
<result column="CREATEBY" property="createby" jdbcType="VARCHAR"/>
<result column="CREATETIME" property="createtime" jdbcType="BIGINT"/>
<result column="UPDATEBY" property="updateby" jdbcType="VARCHAR"/>
<result column="UPDATETIME" property="updatetime" jdbcType="BIGINT"/>
<result column="TENANTID" property="tenantid" jdbcType="BIGINT"/>
<result column="PID" property="pid" jdbcType="BIGINT"/>
<result column="HASCHILD" property="haschild" jdbcType="VARCHAR"/>
<result column="TYPENAME" property="typename" jdbcType="VARCHAR"/>
<result column="REORDER" property="reorder" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
ID AS id,
CREATEBY AS createby,
CREATETIME AS createtime,
UPDATEBY AS updateby,
UPDATETIME AS updatetime,
TENANTID AS tenantid,
PID AS pid,
HASCHILD AS haschild,
TYPENAME AS typename,
REORDER AS reorder
</sql>
<sql id="Base_Where">
<where>
<trim prefixOverrides="and|or">
<if test="id != null"> and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="createby != null"> and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend}</if>
<if test="createtime != null"> and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend}</if>
<if test="updateby != null"> and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend}</if>
<if test="updatetime != null"> and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if>
<if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="pid != null"> and PID ${pid.dataOp} ${pid.likestar}#{pid.value}${pid.likeend}</if>
<if test="haschild != null"> and HASCHILD ${haschild.dataOp} ${haschild.likestar}#{haschild.value}${haschild.likeend}</if>
<if test="typename != null"> and TYPENAME ${typename.dataOp} ${typename.likestar}#{typename.value}${typename.likeend}</if>
<if test="reorder != null"> and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend}</if>
</trim>
</where>
<if test="page != null">
<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if>
limit ${page.start}, ${page.Pagesize}
</if>
</sql>
</mapper>

@ -1,47 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrPlanMybatisDao">
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan">
<id column="ID" property="id" jdbcType="BIGINT"/>
<result column="CREATEBY" property="createby" jdbcType="VARCHAR"/>
<result column="CREATETIME" property="createtime" jdbcType="BIGINT"/>
<result column="UPDATEBY" property="updateby" jdbcType="VARCHAR"/>
<result column="UPDATETIME" property="updatetime" jdbcType="BIGINT"/>
<result column="TENANTID" property="tenantid" jdbcType="BIGINT"/>
<result column="SOURCEPLANID" property="sourceplanid" jdbcType="VARCHAR"/>
<result column="PLANNAME" property="planname" jdbcType="VARCHAR"/>
<result column="REORDER" property="reorder" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
ID AS id,
CREATEBY AS createby,
CREATETIME AS createtime,
UPDATEBY AS updateby,
UPDATETIME AS updatetime,
TENANTID AS tenantid,
SOURCEPLANID AS sourceplanid,
PLANNAME AS planname,
REORDER AS reorder
</sql>
<sql id="Base_Where">
<where>
<trim prefixOverrides="and|or">
<if test="id != null"> and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="createby != null"> and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend}</if>
<if test="createtime != null"> and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend}</if>
<if test="updateby != null"> and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend}</if>
<if test="updatetime != null"> and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if>
<if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="sourceplanid != null"> and SOURCEPLANID ${sourceplanid.dataOp} ${sourceplanid.likestar}#{sourceplanid.value}${sourceplanid.likeend}</if>
<if test="planname != null"> and PLANNAME ${planname.dataOp} ${planname.likestar}#{planname.value}${planname.likeend}</if>
<if test="reorder != null"> and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend}</if>
</trim>
</where>
<if test="page != null">
<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if>
limit ${page.start}, ${page.Pagesize}
</if>
</sql>
</mapper>

@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrProvinceMybatisDao">
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince">
<id column="ID" property="id" jdbcType="BIGINT"/>
<result column="CREATEBY" property="createby" jdbcType="VARCHAR"/>
<result column="CREATETIME" property="createtime" jdbcType="BIGINT"/>
<result column="UPDATEBY" property="updateby" jdbcType="VARCHAR"/>
<result column="UPDATETIME" property="updatetime" jdbcType="BIGINT"/>
<result column="TENANTID" property="tenantid" jdbcType="BIGINT"/>
<result column="PRONAME" property="proname" jdbcType="VARCHAR"/>
<result column="REORDER" property="reorder" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
ID AS id,
CREATEBY AS createby,
CREATETIME AS createtime,
UPDATEBY AS updateby,
UPDATETIME AS updatetime,
TENANTID AS tenantid,
PRONAME AS proname,
REORDER AS reorder
</sql>
<sql id="Base_Where">
<where>
<trim prefixOverrides="and|or">
<if test="id != null"> and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="createby != null"> and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend}</if>
<if test="createtime != null"> and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend}</if>
<if test="updateby != null"> and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend}</if>
<if test="updatetime != null"> and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend}</if>
<if test="tenantid != null"> and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend}</if>
<if test="proname != null"> and PRONAME ${proname.dataOp} ${proname.likestar}#{proname.value}${proname.likeend}</if>
<if test="reorder != null"> and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend}</if>
<if test="userid != null"> and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
<if test="listdept != null">
and DEPARTID in
<foreach collection="listdept.value" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</trim>
</where>
<if test="page != null">
<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if>
limit ${page.start}, ${page.Pagesize}
</if>
</sql>
</mapper>

@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrUpuserMybatisDao">
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser">
<id column="ID" property="id" jdbcType="BIGINT"/>
<result column="create_by" property="createBy" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="BIGINT"/>
<result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
<result column="update_time" property="updateTime" jdbcType="BIGINT"/>
<result column="tenant_id" property="tenantId" jdbcType="BIGINT"/>
<result column="upuserid" property="upuserid" jdbcType="VARCHAR"/>
<result column="upname" property="upname" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
ID AS id,
create_by AS createBy,
create_time AS createTime,
update_by AS updateBy,
update_time AS updateTime,
tenant_id AS tenantId,
upuserid AS upuserid,
upname AS upname
</sql>
<sql id="Base_Where">
<where>
<trim prefixOverrides="and|or">
<if test="id != null"> and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend}</if>
<if test="createBy != null"> and create_by ${createBy.dataOp} ${createBy.likestar}#{createBy.value}${createBy.likeend}</if>
<if test="createTime != null"> and create_time ${createTime.dataOp} ${createTime.likestar}#{createTime.value}${createTime.likeend}</if>
<if test="updateBy != null"> and update_by ${updateBy.dataOp} ${updateBy.likestar}#{updateBy.value}${updateBy.likeend}</if>
<if test="updateTime != null"> and update_time ${updateTime.dataOp} ${updateTime.likestar}#{updateTime.value}${updateTime.likeend}</if>
<if test="tenantId != null"> and tenant_id ${tenantId.dataOp} ${tenantId.likestar}#{tenantId.value}${tenantId.likeend}</if>
<if test="upuserid != null"> and upuserid ${upuserid.dataOp} ${upuserid.likestar}#{upuserid.value}${upuserid.likeend}</if>
<if test="upname != null"> and upname ${upname.dataOp} ${upname.likestar}#{upname.value}${upname.likeend}</if>
<if test="userid != null"> and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}</if>
<if test="listdept != null">
and DEPARTID in
<foreach collection="listdept.value" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
</trim>
</where>
<if test="page != null">
<if test="page.sortname != null"> order by ${page.sortname} ${page.sortorder}</if>
limit ${page.start}, ${page.Pagesize}
</if>
</sql>
</mapper>
Loading…
Cancel
Save