From 56116fd0fabcefba8c40c445e24fc54144ec6092 Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Sun, 24 Mar 2024 20:41:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B8=85=E7=90=86=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=92=8C=E4=BB=A3=E7=A0=81,?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=8E=B7=E5=8F=96=E6=9C=AA=E8=AF=BB=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=80=BB=E6=95=B0=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrAreaController.java | 156 --------- .../ocr/controller/OcrAreaHtmlController.java | 75 ----- .../controller/OcrDictionaryController.java | 2 - .../ocr/controller/OcrMsgReadController.java | 11 +- .../ocr/controller/OcrPictureController.java | 12 - .../controller/OcrPictureclassController.java | 158 --------- .../OcrPictureclassHtmlController.java | 75 ----- .../controller/OcrPicturejobController.java | 113 ------- .../OcrPicturejobHtmlController.java | 3 - .../controller/OcrPicturetypeController.java | 159 --------- .../OcrPicturetypeHtmlController.java | 75 ----- .../ocr/controller/OcrPlanController.java | 156 --------- .../ocr/controller/OcrPlanHtmlController.java | 75 ----- .../ocr/controller/OcrProvinceController.java | 73 ----- .../ocr/controller/OcrUpuserController.java | 155 --------- .../controller/OcrUsersearchController.java | 305 ------------------ .../ocr/dataDao/OcrAreaMybatisDao.java | 11 - .../ocr/dataDao/OcrFieldMybatisDao.java | 1 - .../xiaoyao/ocr/dataDao/OcrMsgMapper.java | 2 + .../dataDao/OcrPictureclassMybatisDao.java | 11 - .../ocr/dataDao/OcrPicturejobMybatisDao.java | 30 -- .../ocr/dataDao/OcrPicturetypeMybatisDao.java | 11 - .../ocr/dataDao/OcrPlanMybatisDao.java | 11 - .../ocr/dataDao/OcrProvinceMybatisDao.java | 11 - .../ocr/dataDao/OcrUpuserMybatisDao.java | 11 - .../jyjz/xiaoyao/ocr/dataobject/OcrArea.java | 114 ------- .../xiaoyao/ocr/dataobject/OcrPicture.java | 3 - .../ocr/dataobject/OcrPictureclass.java | 115 ------- .../xiaoyao/ocr/dataobject/OcrPicturejob.java | 71 ---- .../ocr/dataobject/OcrPicturetype.java | 118 ------- .../jyjz/xiaoyao/ocr/dataobject/OcrPlan.java | 112 ------- .../xiaoyao/ocr/dataobject/OcrProvince.java | 91 ------ .../xiaoyao/ocr/dataobject/OcrUpuser.java | 103 ------ .../xiaoyao/ocr/service/IOcrMsgService.java | 7 + .../xiaoyao/ocr/service/OcrAreaService.java | 21 -- .../ocr/service/OcrPictureService.java | 37 --- .../ocr/service/OcrPictureclassService.java | 22 -- .../ocr/service/OcrPicturejobService.java | 27 -- .../ocr/service/OcrPicturetypeService.java | 20 -- .../xiaoyao/ocr/service/OcrPlanService.java | 21 -- .../ocr/service/OcrProvinceService.java | 16 - .../xiaoyao/ocr/service/OcrUpuserService.java | 23 -- .../ocr/service/impl/OcrAreaServiceImpl.java | 39 --- .../ocr/service/impl/OcrFieldServiceImpl.java | 1 - .../ocr/service/impl/OcrMsgServiceImpl.java | 5 + .../service/impl/OcrPictureServiceImpl.java | 75 ----- .../impl/OcrPictureclassServiceImpl.java | 43 --- .../impl/OcrPicturejobServiceImpl.java | 40 --- .../impl/OcrPicturetypeServiceImpl.java | 40 --- .../ocr/service/impl/OcrPlanServiceImpl.java | 39 --- .../service/impl/OcrProvinceServiceImpl.java | 32 -- .../service/impl/OcrUpuserServiceImpl.java | 47 --- .../xiaoyao/ocr/util/DataDictionaryUtil.java | 4 - .../ocr/vo/OcrTaskchildPictureApproVo.java | 5 +- .../resources/mapper/oa/OcrAreaMapper.xml | 47 --- .../main/resources/mapper/oa/OcrMsgMapper.xml | 7 + .../mapper/oa/OcrPictureclassMapper.xml | 50 --- .../mapper/oa/OcrPicturejobMapper.xml | 46 --- .../mapper/oa/OcrPicturetypeMapper.xml | 50 --- .../resources/mapper/oa/OcrPlanMapper.xml | 47 --- .../resources/mapper/oa/OcrProvinceMapper.xml | 51 --- .../resources/mapper/oa/OcrUpuserMapper.xml | 51 --- 62 files changed, 27 insertions(+), 3315 deletions(-) delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaHtmlController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeHtmlController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanHtmlController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUpuserController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrAreaMybatisDao.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturejobMybatisDao.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturetypeMybatisDao.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPlanMybatisDao.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUpuserMybatisDao.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrArea.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureclass.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicturejob.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicturetype.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPlan.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrProvince.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUpuser.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrAreaService.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureclassService.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPicturejobService.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPicturetypeService.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPlanService.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrProvinceService.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUpuserService.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrAreaServiceImpl.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureclassServiceImpl.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPicturejobServiceImpl.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPicturetypeServiceImpl.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPlanServiceImpl.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrProvinceServiceImpl.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUpuserServiceImpl.java delete mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrAreaMapper.xml delete mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureclassMapper.xml delete mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPicturejobMapper.xml delete mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPicturetypeMapper.xml delete mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPlanMapper.xml delete mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrProvinceMapper.xml delete mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUpuserMapper.xml diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaController.java deleted file mode 100644 index 644112c..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaController.java +++ /dev/null @@ -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; - - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：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> 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 queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrArea); - queryWrapper.eq("TENANTID",tenantId); - queryWrapper.orderByDesc("REORDER"); - List page = this.ocrAreaService.queryListNoPage(queryWrapper);; - return ResultVoUtil.success(page); - } - - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：mail.zhangyong@gmail.com - *创建时间：2024-01-14 10:27:02 - **/ - @GetMapping("/list") - public ResultVo> listOcrArea(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{ - SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); - OcrArea ocrarea = new OcrArea(); - QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrarea); - IPage 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(); - } - } - - /** - *方法描述：根据id字符串组删除对象方法，例如1,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(); - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaHtmlController.java deleted file mode 100644 index 1a90fb4..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaHtmlController.java +++ /dev/null @@ -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"; - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java index f4c07a3..7337cfc 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java @@ -4,8 +4,6 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java index 39f2972..aeb3171 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java @@ -104,15 +104,8 @@ public class OcrMsgReadController { public ResultVo msgPolling(HttpServletRequest request) { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - - QueryWrapper wrapperread = new QueryWrapper<>(); - wrapperread.eq("user_id",userToken.getUserid()); - List list = ocrMsgReadService.list(wrapperread); - - QueryWrapper wrappermsg = new QueryWrapper<>(); - wrappermsg.notIn("id", list.stream().map(i->i.getMsgId()).collect(Collectors.toList())); - long count = iocrmsgservice.count(wrappermsg); - + //获取当前用户所有未读消息 + int count = iocrmsgservice.queryUnreadMsgCount(userToken.getUserid()); return ResultVoUtil.success(count); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java index 019f4ab..de6f9c1 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java @@ -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.vo.UserToken; 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.OcrPictureclassService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import cn.jyjz.xiaoyao.ocr.util.DataUtil; import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum; @@ -49,8 +47,6 @@ public class OcrPictureController extends BaseController { @Resource private OcrPictureService ocrPictureService; @Resource - private OcrPictureclassService ocrPictureclassService; - @Resource private OcrTaskchildPictureService ocrTaskchildPictureService; @Resource private UserTokenService userTokenService; @@ -299,14 +295,6 @@ public class OcrPictureController extends BaseController { Page page = new Page(pageNo, pageSize); IPage 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); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java deleted file mode 100644 index 41982d8..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java +++ /dev/null @@ -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> 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 queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpictureclass); - queryWrapper.eq("TENANTID",tenantId); - queryWrapper.orderByDesc("REORDER"); - - List page = this.ocrPictureclassService.queryListNoPage(queryWrapper);; - return ResultVoUtil.success(page); - } - - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：mail.zhangyong@gmail.com - *创建时间：2024-01-14 10:27:01 - **/ - @GetMapping("/list") - public ResultVo> listOcrPictureclass(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{ - SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); - OcrPictureclass ocrpictureclass = new OcrPictureclass(); - QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpictureclass); - IPage 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(); - } - } - - /** - *方法描述：根据id字符串组删除对象方法，例如1,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(); - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java deleted file mode 100644 index af9784f..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java +++ /dev/null @@ -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"; - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobController.java deleted file mode 100644 index 99202ce..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobController.java +++ /dev/null @@ -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; - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：mail.zhangyong@gmail.com - *创建时间：2024-01-14 10:27:01 - **/ - @GetMapping("/list") - public ResultVo> listOcrPicturejob(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{ - SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); - - OcrPicturejob ocrpicturejob = new OcrPicturejob(); - - QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturejob); - IPage 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(); - } - } - - /** - *方法描述：根据id字符串组删除对象方法，例如1,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(); - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobHtmlController.java index 6492c31..8a4c285 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobHtmlController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobHtmlController.java @@ -4,7 +4,6 @@ import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import cn.jyjz.xiaoyao.ocr.service.OcrPicturejobService; import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,8 +27,6 @@ public class OcrPicturejobHtmlController extends BaseController{ private Logger log = LoggerFactory.getLogger(this.getClass()); - @Autowired - private OcrPicturejobService ocrPicturejobService; @Autowired private UserTokenService userTokenService; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeController.java deleted file mode 100644 index c264a95..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeController.java +++ /dev/null @@ -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> 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 queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturetype); - queryWrapper.eq("TENANTID",tenantId); - queryWrapper.orderByDesc("REORDER"); - - List list = this.ocrPicturetypeService.queryListNoPage(queryWrapper); - return ResultVoUtil.success(list); - } - - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：mail.zhangyong@gmail.com - *创建时间：2024-01-14 10:27:01 - **/ - @GetMapping("/list") - public ResultVo> listOcrPicturetype(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{ - SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); - - OcrPicturetype ocrpicturetype = new OcrPicturetype(); - - QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturetype); - IPage 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(); - } - } - - /** - *方法描述：根据id字符串组删除对象方法，例如1,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(); - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeHtmlController.java deleted file mode 100644 index db47509..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeHtmlController.java +++ /dev/null @@ -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"; - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanController.java deleted file mode 100644 index 8df85fa..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanController.java +++ /dev/null @@ -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; - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：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> 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 queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrplan); - queryWrapper.eq("TENANTID",tenantId); - queryWrapper.orderByDesc("REORDER"); - List page = this.ocrPlanService.queryListNoPage(queryWrapper);; - return ResultVoUtil.success(page); - } - - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：mail.zhangyong@gmail.com - *创建时间：2024-01-14 10:27:02 - **/ - @GetMapping("/list") - public ResultVo> listOcrPlan(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{ - SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); - - OcrPlan ocrplan = new OcrPlan(); - - QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrplan); - IPage 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(); - } - } - - /** - *方法描述：根据id字符串组删除对象方法，例如1,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(); - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanHtmlController.java deleted file mode 100644 index 5a7904f..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanHtmlController.java +++ /dev/null @@ -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"; - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java deleted file mode 100644 index 8673913..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java +++ /dev/null @@ -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; - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：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> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{ - //租户主键，由前端页面传送 - String tenantId = request.getHeader("X-Tenant-Id"); - if(StringUtils.isBlank(tenantId)){ - return ResultVoUtil.error("租户主键不能为空"); - } - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tenantid",tenantId); - - List list = this.ocrProvinceService.getProvinceAll(queryWrapper); - - return ResultVoUtil.success(list); - } - - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUpuserController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUpuserController.java deleted file mode 100644 index c39737c..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUpuserController.java +++ /dev/null @@ -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> 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 queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrUpuser); - queryWrapper.eq("tenant_id",tenantId); - queryWrapper.orderByAsc("convert(upname using gbk)"); - - List pageList = ocrUpuserService.queryListNoPage(queryWrapper); - return ResultVoUtil.success(pageList); - } - - /** - *方法描述：返回json字符串，接受参数，dto名称以及分页信息 - *创建人：mail.zhangyong@gmail.com - *创建时间：2024-01-14 10:27:02 - **/ - @GetMapping("/list") - public ResultVo> listOcrUpuser(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{ - SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); - - OcrUpuser ocrupuser = new OcrUpuser(); - - QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrupuser); - IPage 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(); - } - } - - /** - *方法描述：根据id字符串组删除对象方法，例如1,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(); - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java deleted file mode 100644 index cc63334..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java +++ /dev/null @@ -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> 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 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 pageList = ocrUsersearchService.selectSearchListPage(paramterPage, queryWrapper); - - - for(OcrUsersearch ocrUsersearch1:pageList.getRecords()){ - List 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 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 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 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 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 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 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 queryById(@RequestParam(name="id",required=true) String id) { - OcrUsersearch ocrUsersearch = ocrUsersearchService.getById(id); - List list = ocrUsersearchchildService.selectByMainId(id); - ocrUsersearch.setOcrUsersearchchildList(list); - if(ocrUsersearch==null) { - return ResultVoUtil.error("未找到对应数据"); - } - return ResultVoUtil.success(ocrUsersearch); - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrAreaMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrAreaMybatisDao.java deleted file mode 100644 index 5c2cf42..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrAreaMybatisDao.java +++ /dev/null @@ -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 { -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java index 54e8d94..4dcebb4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java @@ -1,6 +1,5 @@ package cn.jyjz.xiaoyao.ocr.dataDao; -import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea; import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java index a5e7da6..375546e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java @@ -22,4 +22,6 @@ public interface OcrMsgMapper extends BaseMapper { List>> selectPage(@Param("userid")String userid,@Param("msgCategory")String msgCategory); Map selectone(@Param("id")String id); + + int selectUnreadMsgCount(@Param("userId") String userid); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java deleted file mode 100644 index 7af2abe..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java +++ /dev/null @@ -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 { -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturejobMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturejobMybatisDao.java deleted file mode 100644 index 9eb7f04..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturejobMybatisDao.java +++ /dev/null @@ -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 { - /** - * 通过主表id删除子表数据 - * - * @param mainId 主表id - * @return boolean - */ - public boolean deleteByMainId(@Param("mainId") String mainId); - - /** - * 通过主表id查询子表数据 - * - * @param mainId 主表id - * @return List - */ - public List selectByMainId(@Param("mainId") String mainId); -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturetypeMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturetypeMybatisDao.java deleted file mode 100644 index 8f8636e..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturetypeMybatisDao.java +++ /dev/null @@ -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 { -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPlanMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPlanMybatisDao.java deleted file mode 100644 index 2a8922f..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPlanMybatisDao.java +++ /dev/null @@ -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 { -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java deleted file mode 100644 index 35e7a45..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java +++ /dev/null @@ -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 { -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUpuserMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUpuserMybatisDao.java deleted file mode 100644 index 94ce693..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUpuserMybatisDao.java +++ /dev/null @@ -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 { -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrArea.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrArea.java deleted file mode 100644 index 6ef7343..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrArea.java +++ /dev/null @@ -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 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; - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index 72561a7..f5c1944 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -354,9 +354,6 @@ public class OcrPicture implements BaseDto, java.io.Serializable { private String location; - //图片分类 - @TableField(exist = false) - private OcrPictureclass ocrPictureclass; //保存当前登录用户的数据权限范围的搜索条件 @TableField(exist = false) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureclass.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureclass.java deleted file mode 100644 index 7c06a5e..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureclass.java +++ /dev/null @@ -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 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; - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicturejob.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicturejob.java deleted file mode 100644 index 60fdeee..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicturejob.java +++ /dev/null @@ -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 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; - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicturetype.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicturetype.java deleted file mode 100644 index 75751fa..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicturetype.java +++ /dev/null @@ -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 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; - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPlan.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPlan.java deleted file mode 100644 index 75cf28c..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPlan.java +++ /dev/null @@ -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 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; - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrProvince.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrProvince.java deleted file mode 100644 index ad9d3b0..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrProvince.java +++ /dev/null @@ -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 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; - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUpuser.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUpuser.java deleted file mode 100644 index 9b07dfd..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUpuser.java +++ /dev/null @@ -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 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; - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java index 8cf853f..f119ee2 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java @@ -32,4 +32,11 @@ public interface IOcrMsgService extends IService { Map selectone(String id); + + /** + * 获取当前用户所有未读消息数量 + * @param userid + * @return + */ + int queryUnreadMsgCount(String userid); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrAreaService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrAreaService.java deleted file mode 100644 index 8917381..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrAreaService.java +++ /dev/null @@ -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 { - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - List queryListNoPage(QueryWrapper queryWrapper); -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java index 0a8ecee..051a714 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java @@ -1,16 +1,11 @@ package cn.jyjz.xiaoyao.ocr.service; -import java.io.Serializable; -import java.util.Collection; import java.util.List; import java.util.Map; - import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; 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.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -50,38 +45,6 @@ public interface OcrPictureService extends BaseService { */ public List listByTaskChild(List pictureid); - /** - * 添加一对多 - * - * @param ocrPicture - * @param ocrPicturejobList - * @param ocrPictureNotesList - */ - public void saveMain(OcrPicture ocrPicture, List ocrPicturejobList, List ocrPictureNotesList) ; - - /** - * 修改一对多 - * - * @param ocrPicture - * @param ocrPicturejobList - * @param ocrPictureNotesList - */ - public void updateMain(OcrPicture ocrPicture,List ocrPicturejobList,List ocrPictureNotesList); - - /** - * 删除一对多 - * - * @param id - */ - public void delMain (String id); - - /** - * 批量删除一对多 - * - * @param idList - */ - public void delBatchMain (Collection idList); - /** * 根本预设检索条件id，分页查询图片信息 * @param pageNo diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureclassService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureclassService.java deleted file mode 100644 index f75b65f..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureclassService.java +++ /dev/null @@ -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 { - - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - List queryListNoPage(QueryWrapper queryWrapper); -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPicturejobService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPicturejobService.java deleted file mode 100644 index 5cc0866..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPicturejobService.java +++ /dev/null @@ -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 { - /** - * 通过主表id删除子表数据 - * - * @param mainId 主表id - * @return boolean - */ - public boolean deleteByMainId(String mainId); - - /** - * 通过主表id查询子表数据 - * - * @param mainId 主表id - * @return List - */ - public List selectByMainId(String mainId); -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPicturetypeService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPicturetypeService.java deleted file mode 100644 index 64ff294..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPicturetypeService.java +++ /dev/null @@ -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 { - - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - List queryListNoPage(QueryWrapper queryWrapper); -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPlanService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPlanService.java deleted file mode 100644 index ffd8c9c..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPlanService.java +++ /dev/null @@ -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 { - - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - List queryListNoPage(QueryWrapper queryWrapper); -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrProvinceService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrProvinceService.java deleted file mode 100644 index 4c1e3ba..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrProvinceService.java +++ /dev/null @@ -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 { - - public List getProvinceAll(QueryWrapper queryWrapper); -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUpuserService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUpuserService.java deleted file mode 100644 index 5f581ca..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUpuserService.java +++ /dev/null @@ -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 { - - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - List queryListNoPage(QueryWrapper queryWrapper); - - Long selectByUpNameCount(String upname,Long tenantId); -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrAreaServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrAreaServiceImpl.java deleted file mode 100644 index 3a8a1ed..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrAreaServiceImpl.java +++ /dev/null @@ -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 implements OcrAreaService { - @Autowired - private OcrAreaMybatisDao ocrareamybatisdao; - - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - public List queryListNoPage(QueryWrapper queryWrapper){ - Long count = ocrareamybatisdao.selectCount(queryWrapper); - - Page page = new Page(1,count); - page.setMaxLimit(count); - - IPage iPage = this.page(page,queryWrapper); - return iPage.getRecords(); - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java index 9669669..139418e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java @@ -5,7 +5,6 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrFieldMybatisDao; import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; import cn.jyjz.xiaoyao.ocr.service.OcrFieldService; -import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java index 68eb158..3869630 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java @@ -43,4 +43,9 @@ public class OcrMsgServiceImpl extends ServiceImpl impleme return ocrmsgmapper.selectone(id); } + @Override + public int queryUnreadMsgCount(String userid) { + return ocrmsgmapper.selectUnreadMsgCount(userid); + } + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index 701e624..92cf218 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -73,8 +73,6 @@ public class OcrPictureServiceImpl extends BaseServiceImpl ocrPicturejobList, List 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 ocrPicturejobList, List 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 idList) { - for (Serializable id : idList) { - ocrPicturejobService.deleteByMainId(id.toString()); - ocrPictureNotesService.deleteByMainId(id.toString()); - ocrpicturemybatisdao.deleteById(id); - } - } - @Override public IPage queryPageByUserSearchId(Integer pageNo, Integer pageSize, String userSearchId) { OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId); @@ -676,12 +607,6 @@ public class OcrPictureServiceImpl extends BaseServiceImpl page = new Page(pageNo, pageSize); IPage 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; } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureclassServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureclassServiceImpl.java deleted file mode 100644 index 2431e36..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureclassServiceImpl.java +++ /dev/null @@ -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 implements OcrPictureclassService { - @Autowired - private OcrPictureclassMybatisDao ocrpictureclassmybatisdao; - - - @Override - public List queryListNoPage(QueryWrapper queryWrapper) { - - Long count = ocrpictureclassmybatisdao.selectCount(queryWrapper); - - Page page = new Page(1,count); - page.setMaxLimit(count); - - IPage iPage = this.page(page,queryWrapper); - return iPage.getRecords(); - } - -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPicturejobServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPicturejobServiceImpl.java deleted file mode 100644 index 42b9690..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPicturejobServiceImpl.java +++ /dev/null @@ -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 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 - */ - public List selectByMainId(String mainId){ - return ocrpicturejobmybatisdao.selectByMainId(mainId); - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPicturetypeServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPicturetypeServiceImpl.java deleted file mode 100644 index 940533b..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPicturetypeServiceImpl.java +++ /dev/null @@ -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 implements OcrPicturetypeService { - @Autowired - private OcrPicturetypeMybatisDao ocrpicturetypemybatisdao; - - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - public List queryListNoPage(QueryWrapper queryWrapper){ - Long count = this.ocrpicturetypemybatisdao.selectCount(queryWrapper); - - Page page = new Page(1,count); - page.setMaxLimit(count); - - IPage iPage = this.ocrpicturetypemybatisdao.selectPage(page,queryWrapper); - - return iPage.getRecords(); - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPlanServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPlanServiceImpl.java deleted file mode 100644 index 52f39fe..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPlanServiceImpl.java +++ /dev/null @@ -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 implements OcrPlanService { - @Autowired - private OcrPlanMybatisDao ocrplanmybatisdao; - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - public List queryListNoPage(QueryWrapper queryWrapper){ - - Long count = ocrplanmybatisdao.selectCount(queryWrapper); - - Page page = new Page(1,count); - page.setMaxLimit(count); - - IPage iPage = this.page(page,queryWrapper); - return iPage.getRecords(); - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrProvinceServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrProvinceServiceImpl.java deleted file mode 100644 index 9e1c223..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrProvinceServiceImpl.java +++ /dev/null @@ -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 implements OcrProvinceService { - @Autowired - private OcrProvinceMybatisDao ocrprovincemybatisdao; - - public List getProvinceAll(QueryWrapper queryWrapper){ - Long count = this.count(queryWrapper); - - Page page = new Page<>(0, count); - - IPage iPage = this.ocrprovincemybatisdao.selectPage(page,queryWrapper); - return iPage.getRecords(); - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUpuserServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUpuserServiceImpl.java deleted file mode 100644 index 887ec62..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUpuserServiceImpl.java +++ /dev/null @@ -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 implements OcrUpuserService { - @Autowired - private OcrUpuserMybatisDao ocrupusermybatisdao; - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - public List queryListNoPage(QueryWrapper queryWrapper){ - - Long count = ocrupusermybatisdao.selectCount(queryWrapper); - - Page page = new Page(1,count); - page.setMaxLimit(count); - - IPage 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); - } -} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/DataDictionaryUtil.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/DataDictionaryUtil.java index bf62d41..c99fded 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/DataDictionaryUtil.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/DataDictionaryUtil.java @@ -3,11 +3,7 @@ package cn.jyjz.xiaoyao.ocr.util; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; 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.OcrPlanService; -import cn.jyjz.xiaoyao.ocr.service.OcrUpuserService; -import liquibase.pro.packaged.E; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java index 2de2ed4..1e6faf6 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java @@ -41,9 +41,12 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable { @ApiModelProperty(value = "拜访地区") private String releaseProvince; - @ApiModelProperty(value = "所属项目") + @ApiModelProperty(value = "所属项目id") private String fromprojectid; + @ApiModelProperty(value = "所属项目名称") + private String projectName; + @ApiModelProperty(value = "产品名称") private String productName; diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrAreaMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrAreaMapper.xml deleted file mode 100644 index 0c4b4f9..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrAreaMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - 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 - - - - - - and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend} - and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend} - and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend} - and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend} - and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend} - and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend} - and PROVINCEID ${provinceid.dataOp} ${provinceid.likestar}#{provinceid.value}${provinceid.likeend} - and CITYNAME ${cityname.dataOp} ${cityname.likestar}#{cityname.value}${cityname.likeend} - and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend} - - - - order by ${page.sortname} ${page.sortorder} - limit ${page.start}, ${page.Pagesize} - - - - diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml index 8905b07..7704c6d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml @@ -84,4 +84,11 @@ id = #{id} + + + diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureclassMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureclassMapper.xml deleted file mode 100644 index f4184fc..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureclassMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - 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 - - - - - - and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend} - and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend} - and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend} - and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend} - and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend} - and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend} - and PID ${pid.dataOp} ${pid.likestar}#{pid.value}${pid.likeend} - and HASCHILD ${haschild.dataOp} ${haschild.likestar}#{haschild.value}${haschild.likeend} - and CLASSNAME ${classname.dataOp} ${classname.likestar}#{classname.value}${classname.likeend} - and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend} - - - - order by ${page.sortname} ${page.sortorder} - limit ${page.start}, ${page.Pagesize} - - - - diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPicturejobMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPicturejobMapper.xml deleted file mode 100644 index 3b7f238..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPicturejobMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - ID AS id, - pictureid AS pictureid, - jobnotes AS jobnotes - - - - - - and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend} - and pictureid ${pictureid.dataOp} ${pictureid.likestar}#{pictureid.value}${pictureid.likeend} - and jobnotes ${jobnotes.dataOp} ${jobnotes.likestar}#{jobnotes.value}${jobnotes.likeend} - and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend} - - and DEPARTID in - - #{item} - - - - - - order by ${page.sortname} ${page.sortorder} - limit ${page.start}, ${page.Pagesize} - - - - DELETE - FROM ocr_picturejob - WHERE - pictureid = #{mainId} - - - diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPicturetypeMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPicturetypeMapper.xml deleted file mode 100644 index a7dbd86..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPicturetypeMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - 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 - - - - - - and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend} - and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend} - and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend} - and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend} - and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend} - and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend} - and PID ${pid.dataOp} ${pid.likestar}#{pid.value}${pid.likeend} - and HASCHILD ${haschild.dataOp} ${haschild.likestar}#{haschild.value}${haschild.likeend} - and TYPENAME ${typename.dataOp} ${typename.likestar}#{typename.value}${typename.likeend} - and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend} - - - - order by ${page.sortname} ${page.sortorder} - limit ${page.start}, ${page.Pagesize} - - - - diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPlanMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPlanMapper.xml deleted file mode 100644 index 29aba17..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPlanMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - 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 - - - - - - and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend} - and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend} - and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend} - and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend} - and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend} - and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend} - and SOURCEPLANID ${sourceplanid.dataOp} ${sourceplanid.likestar}#{sourceplanid.value}${sourceplanid.likeend} - and PLANNAME ${planname.dataOp} ${planname.likestar}#{planname.value}${planname.likeend} - and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend} - - - - order by ${page.sortname} ${page.sortorder} - limit ${page.start}, ${page.Pagesize} - - - - diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrProvinceMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrProvinceMapper.xml deleted file mode 100644 index 5b22f3f..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrProvinceMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - ID AS id, - CREATEBY AS createby, - CREATETIME AS createtime, - UPDATEBY AS updateby, - UPDATETIME AS updatetime, - TENANTID AS tenantid, - PRONAME AS proname, - REORDER AS reorder - - - - - - and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend} - and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend} - and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend} - and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend} - and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend} - and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend} - and PRONAME ${proname.dataOp} ${proname.likestar}#{proname.value}${proname.likeend} - and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend} - and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend} - - and DEPARTID in - - #{item} - - - - - - order by ${page.sortname} ${page.sortorder} - limit ${page.start}, ${page.Pagesize} - - - - diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUpuserMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUpuserMapper.xml deleted file mode 100644 index 34ec377..0000000 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUpuserMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - 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 - - - - - - and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend} - and create_by ${createBy.dataOp} ${createBy.likestar}#{createBy.value}${createBy.likeend} - and create_time ${createTime.dataOp} ${createTime.likestar}#{createTime.value}${createTime.likeend} - and update_by ${updateBy.dataOp} ${updateBy.likestar}#{updateBy.value}${updateBy.likeend} - and update_time ${updateTime.dataOp} ${updateTime.likestar}#{updateTime.value}${updateTime.likeend} - and tenant_id ${tenantId.dataOp} ${tenantId.likestar}#{tenantId.value}${tenantId.likeend} - and upuserid ${upuserid.dataOp} ${upuserid.likestar}#{upuserid.value}${upuserid.likeend} - and upname ${upname.dataOp} ${upname.likestar}#{upname.value}${upname.likeend} - and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend} - - and DEPARTID in - - #{item} - - - - - - order by ${page.sortname} ${page.sortorder} - limit ${page.start}, ${page.Pagesize} - - - -