diff --git a/htmlweb/web/backstage/oa/ocr/distionary/add.html b/htmlweb/web/backstage/oa/ocr/distionary/add.html new file mode 100644 index 00000000..a6cded77 --- /dev/null +++ b/htmlweb/web/backstage/oa/ocr/distionary/add.html @@ -0,0 +1,214 @@ +<#include "/common/taglibs.html" /> + + + + + 数据字典 + + + +<#include "/head/headaddedit.html" /> + + +
+
+
+
+
+
基本信息
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+<#include "/head/footadd.html" /> + + + + diff --git a/htmlweb/web/backstage/oa/ocr/distionary/edit.html b/htmlweb/web/backstage/oa/ocr/distionary/edit.html new file mode 100644 index 00000000..e6b16e51 --- /dev/null +++ b/htmlweb/web/backstage/oa/ocr/distionary/edit.html @@ -0,0 +1,230 @@ +<#include "/common/taglibs.html" /> + + + + + 数据字典 + + + +<#include "/head/headaddedit.html" /> + + +
+
+
+
+
+
基本信息
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+<#include "/head/footadd.html" /> + + + + diff --git a/htmlweb/web/backstage/oa/ocr/distionary/list.html b/htmlweb/web/backstage/oa/ocr/distionary/list.html new file mode 100644 index 00000000..41e146b8 --- /dev/null +++ b/htmlweb/web/backstage/oa/ocr/distionary/list.html @@ -0,0 +1,374 @@ +<#include "/common/taglibs.html" /> + + + + + 数据字典 + +<#include "/head/headlist.html" /> + + + +
+
+
+
+
+ +
+ +
+
+ +
+ +
+  搜索 +  重置 +
+
+
+
+
+
+
+
+
+
+   + +
+
+
+
+
+
+
+
+
+
+ + +<#include "/head/footlist.html" /> + + + + + + + + + diff --git a/htmlweb/web/backstage/oa/ocr/distionarygroup/add.html b/htmlweb/web/backstage/oa/ocr/distionarygroup/add.html new file mode 100644 index 00000000..b6bf37e0 --- /dev/null +++ b/htmlweb/web/backstage/oa/ocr/distionarygroup/add.html @@ -0,0 +1,238 @@ +<#include "/common/taglibs.html" /> + + + + + 数据字典分组 + + + +<#include "/head/headaddedit.html" /> + + + +
+
+
+
+
+
基本信息
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ + + +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+ + + +
+
+
+
+
+
+
+
+ +
+
+ + +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+<#include "/head/footadd.html" /> + + + + + + diff --git a/htmlweb/web/backstage/oa/ocr/distionarygroup/edit.html b/htmlweb/web/backstage/oa/ocr/distionarygroup/edit.html new file mode 100644 index 00000000..e834eb08 --- /dev/null +++ b/htmlweb/web/backstage/oa/ocr/distionarygroup/edit.html @@ -0,0 +1,258 @@ +<#include "/common/taglibs.html" /> + + + + + 数据字典分组 + + + +<#include "/head/headaddedit.html" /> + + + +
+
+
+
+
+
基本信息
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + + +
+
+
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+<#include "/head/footadd.html" /> + + + + + diff --git a/htmlweb/web/backstage/oa/ocr/distionarygroup/list.html b/htmlweb/web/backstage/oa/ocr/distionarygroup/list.html new file mode 100644 index 00000000..0327960c --- /dev/null +++ b/htmlweb/web/backstage/oa/ocr/distionarygroup/list.html @@ -0,0 +1,569 @@ +<#include "/common/taglibs.html" /> + + + + + 数据字典分组 + + + +<#include "/head/headlist.html" /> + + + + +
+ +
+
+
+
+ +
+

+ 字典分类 +

+
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+ +
+ +
+  搜索 +  重置 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + + + +<#include "/head/footlist.html" /> + + + + + + + + + + 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 cb85fc1d..dd2f716e 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 @@ -1,10 +1,25 @@ package cn.jyjz.xiaoyao.ocr.controller; +import cn.jyjz.xiaoyao.admin.service.ResourcesService; +import cn.jyjz.xiaoyao.admin.service.UserService; +import cn.jyjz.xiaoyao.common.base.constant.SystemConstants; +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; +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 cn.jyjz.xiaoyao.common.base.vo.UserToken; +import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat; +import cn.jyjz.xiaoyao.framework.security.model.AdminUserModel; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,6 +31,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Objects; /** * ocr_业务数据数据字典 @@ -27,11 +43,22 @@ import java.io.IOException; @Api(tags="ocr_业务数据数据字典") @RestController @RequestMapping("/ocr/dictionary") -public class OcrDictionaryController { +public class OcrDictionaryController extends BaseController { @Autowired private OcrDictionaryService ocrDictionaryService; + + @Autowired + private UserTokenService userTokenService; + + @Autowired + private UserService userService; + + @Autowired + private ResourcesService resourcesService; + + /** *通过列表获取字典数据 *创建人：mail.zhangyong@gmail.com @@ -81,4 +108,80 @@ public class OcrDictionaryController { return new ResultVo<>(ResultVo.ERROR,result); } + /** + *方法描述：返回json字符串，接受参数，dto名称以及分页信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/list") + public ResultVo> listDistionarygroup(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException { + SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); + cn.jyjz.xiaoyao.admin.dataobject.User user = this.userService.getSessionUser(request); + OcrDictionary distionarygroup = new OcrDictionary(); + distionarygroup.setSearchQueryrolesShowleave(user.getSearchQueryrolesShowleave()); + QueryWrapper queryWrapper = SearchQueryFormat + .queryStringFormat(searchQuery,distionarygroup); + IPage page = this.ocrDictionaryService.selectSearchListPage(paramterPage,queryWrapper);; + return ResultVoUtil.success(page); + } + + + + /** + *方法描述：保存添加数据 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @PostMapping("/save") + public ResultVo saveDistionarygroup(HttpServletResponse response,HttpServletRequest request,OcrDictionary tab) throws IOException{ + OcrDictionary ocrDictionaryGroup = ocrDictionaryService.getOne(new LambdaQueryWrapper().eq(OcrDictionary::getValue, tab.getValue())); + if(Objects.nonNull(ocrDictionaryGroup)){ + return ResultVoUtil.error("字段名称重复"); + } + this.ocrDictionaryService.save(tab); + return ResultVoUtil.success(); + } + + /** + *方法描述：根据页面form传来的对象修改数据 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @PostMapping("/edit") + public ResultVo editDistionarygroup(HttpServletResponse response,HttpServletRequest request,OcrDictionary tab) throws IOException{ + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + this.ocrDictionaryService.updateById(tab); + return ResultVoUtil.success(); + } + + /** + *方法描述：通过主键获得对象信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/getdata/{id}") + @ResponseBody + public ResultVo getdateDistionarygroup(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{ + OcrDictionary dto = this.ocrDictionaryService.selectDtoById(id); + if(null != dto){ + return ResultVoUtil.success(dto); + }else{ + return ResultVoUtil.error(); + } + } + + /** + *方法描述：根据id字符串组删除对象方法，例如1,2,3 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/delmore") + @ResponseBody + public ResultVo delMoreDistionarygroup(HttpServletResponse response,HttpServletRequest request) throws IOException{ + String ids = request.getParameter("id"); + this.ocrDictionaryService.deleteByIdMore(ids); + return ResultVoUtil.success(); + } + + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryGropuController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryGropuController.java new file mode 100644 index 00000000..e7262e72 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryGropuController.java @@ -0,0 +1,231 @@ +package cn.jyjz.xiaoyao.ocr.controller; + + +import cn.jyjz.xiaoyao.admin.dataobject.Distionarygroup; +import cn.jyjz.xiaoyao.admin.dataobject.Distionarytype; +import cn.jyjz.xiaoyao.admin.service.ResourcesService; +import cn.jyjz.xiaoyao.admin.service.UserService; +import cn.jyjz.xiaoyao.common.base.constant.SystemConstants; +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; +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 cn.jyjz.xiaoyao.common.base.vo.UserToken; +import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat; +import cn.jyjz.xiaoyao.framework.security.model.AdminUserModel; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; +import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto; +import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryGroupService; +import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService; +import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * ocr_业务数据数据字典 + * + * @author hugh(shuli.yao) 1397940314@qq.com + * @version 1.0 + * @date 2024/3/16 15:16 + */ +@Api(tags="ocr_业务数据数据字典") +@RestController +@RequestMapping("/ocr/dictionaryGroup") +public class OcrDictionaryGropuController extends BaseController { + + @Autowired + private OcrDictionaryGroupService ocrDictionaryGroupService; + + @Autowired + private UserTokenService userTokenService; + + @Autowired + private UserService userService; + + @Autowired + private ResourcesService resourcesService; + + /** + *方法描述：返回json字符串，接受参数，dto名称以及分页信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/list") + public ResultVo> listDistionarygroup(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException { + SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); + cn.jyjz.xiaoyao.admin.dataobject.User user = this.userService.getSessionUser(request); + OcrDictionaryGroup distionarygroup = new OcrDictionaryGroup(); + distionarygroup.setSearchQueryrolesShowleave(user.getSearchQueryrolesShowleave()); + QueryWrapper queryWrapper = SearchQueryFormat + .queryStringFormat(searchQuery,distionarygroup); + IPage page = this.ocrDictionaryGroupService.selectSearchListPage(paramterPage,queryWrapper);; + return ResultVoUtil.success(page); + } + + + /** + *方法描述：跳转到保存页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/toolsbarOther") + @ResponseBody + public ResultVo toolsbarOther(HttpServletResponse response, HttpServletRequest request){ + String resourceid = request.getParameter("resourceid"); + if(StringUtils.isBlank(resourceid)){ + resourceid = "26"; + } + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + AdminUserModel adminUserModel = (AdminUserModel) this.userTokenService.getSessionUserFromCache(userToken.getTokenid()); + + cn.jyjz.xiaoyao.common.base.vo.User user = adminUserModel.getUser(); + + JSONObject jsonObject = this.resourcesService.getResourceMethod(Long.decode(resourceid), user); + + JSONArray toolsbar = (JSONArray) jsonObject.get(SystemConstants.SYS_JSP_TOOLSBAR); + if(null == toolsbar || toolsbar.isEmpty()){ + jsonObject = this.resourcesService.getObjectByResourceid(resourceid); + } + + + return ResultVoUtil.success(jsonObject); + } + + /** + *方法描述：保存添加数据 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @PostMapping("/save") + public ResultVo saveDistionarygroup(HttpServletResponse response,HttpServletRequest request,OcrDictionaryGroup tab) throws IOException{ + OcrDictionaryGroup ocrDictionaryGroup = ocrDictionaryGroupService.getOne(new LambdaQueryWrapper().eq(OcrDictionaryGroup::getField, tab.getField())); + if(Objects.nonNull(ocrDictionaryGroup)){ + return ResultVoUtil.error("字段名称重复"); + } + this.ocrDictionaryGroupService.save(tab); + return ResultVoUtil.success(); + } + + /** + *方法描述：根据页面form传来的对象修改数据 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @PostMapping("/edit") + public ResultVo editDistionarygroup(HttpServletResponse response,HttpServletRequest request,OcrDictionaryGroup tab) throws IOException{ + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + this.ocrDictionaryGroupService.updateById(tab); + return ResultVoUtil.success(); + } + + /** + *方法描述：通过主键获得对象信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/getdata/{id}") + @ResponseBody + public ResultVo getdateDistionarygroup(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{ + OcrDictionaryGroup dto = this.ocrDictionaryGroupService.selectDtoById(id); + if(null != dto){ + return ResultVoUtil.success(dto); + }else{ + return ResultVoUtil.error(); + } + } + + /** + *方法描述：根据id字符串组删除对象方法，例如1,2,3 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/delmore") + @ResponseBody + public ResultVo delMoreDistionarygroup(HttpServletResponse response,HttpServletRequest request) throws IOException{ + String ids = request.getParameter("id"); + this.ocrDictionaryGroupService.deleteByIdMore(ids); + return ResultVoUtil.success(); + } + + + + @GetMapping("/listall") + public ResultVo> listall(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{ + + List list = this.ocrDictionaryGroupService.list(); + return ResultVoUtil.success(list); + } + /** + *方法描述：保存添加数据 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:07 + **/ + @PostMapping("/save") + public ResultVo saveDistionarytype(HttpServletResponse response,HttpServletRequest request,OcrDictionaryGroup tab) throws IOException{ + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + boolean isok = false; + if(null != tab.getId()){ + isok = this.ocrDictionaryGroupService.updateById(tab); + }else { + isok = this.ocrDictionaryGroupService.save(tab); + } + return isok?ResultVoUtil.success():ResultVoUtil.error(); + } + + /** + *方法描述：通过主键获得对象信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:07 + **/ + @GetMapping("/getdata/{id}") + @ResponseBody + public ResultVo getdateDistionarytype(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{ + OcrDictionaryGroup dto = this.ocrDictionaryGroupService.selectDtoById(id); + + if(null != dto){ + return ResultVoUtil.success(dto); + }else{ + return ResultVoUtil.error(); + } + } + + /** + *方法描述：根据id字符串组删除对象方法，例如1,2,3 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:07 + **/ + @GetMapping("/delmore") + @ResponseBody + public ResultVo delMoreDistionarytype(HttpServletResponse response,HttpServletRequest request) throws IOException{ + String ids = request.getParameter("id"); + this.ocrDictionaryGroupService.deleteByIdMore(ids); + return ResultVoUtil.success(); + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDistionaryHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDistionaryHtmlController.java new file mode 100644 index 00000000..4d8f569f --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDistionaryHtmlController.java @@ -0,0 +1,83 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.admin.dataobject.Distionarygroup; +import cn.jyjz.xiaoyao.admin.service.DistionaryService; +import cn.jyjz.xiaoyao.admin.service.DistionarygroupService; +import cn.jyjz.xiaoyao.admin.service.UserService; +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +@Controller +@RequestMapping("/backstage/admin/ocrDistionaryHtml") +public class OcrDistionaryHtmlController extends BaseController{ + + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private DistionaryService distionaryService; + + @Autowired + private DistionarygroupService distionarygroupService; + + @Autowired + private UserTokenService userTokenService; + @Autowired + private UserService userService; + /** + *方法描述：跳转到列表页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-29 16:00:28 + **/ + @GetMapping("/toList") + public String toListDistionary(HttpServletResponse response,HttpServletRequest request){ + + + + String resourceid = request.getParameter("resourceid"); + String distionarygroupid = request.getParameter("distionarygroupid"); + + Distionarygroup distionarygroup = distionarygroupService.selectDtoById(Long.parseLong(distionarygroupid)); + + request.setAttribute("resourceid",resourceid); + request.setAttribute("distionarygroupid",distionarygroupid); + request.setAttribute("distionarytypeid",distionarygroup.getDistionarytypeid().toString()); + return "/backstage/oa/ocr/distionary/list"; + } + + /** + *方法描述：跳转到保存页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-29 16:00:28 + **/ + @GetMapping("/toSave") + public String toSaveDistionary(HttpServletResponse response,HttpServletRequest request){ + String resourceid = request.getParameter("resourceid"); + request.setAttribute("resourceid",resourceid); + return "/backstage/oa/ocr/distionary/add"; + } + + /** + *方法描述：根据ID跳转到修改页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-29 16:00:28 + **/ + @GetMapping("/toEdit/{id}") + public String toEditDistionary(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/distionary/edit"; + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDistionarygroupHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDistionarygroupHtmlController.java new file mode 100644 index 00000000..241ad45f --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDistionarygroupHtmlController.java @@ -0,0 +1,71 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.admin.service.DistionarygroupService; +import cn.jyjz.xiaoyao.admin.service.UserService; +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +@Controller +@RequestMapping("/backstage/admin/ocrDistionarygroupHtml") +public class OcrDistionarygroupHtmlController extends BaseController{ + + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private DistionarygroupService distionarygroupService; + + @Autowired + private UserTokenService userTokenService; + + @Autowired + private UserService userService; + + /** + *方法描述：跳转到列表页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/toList") + public String toListDistionarygroup(HttpServletResponse response,HttpServletRequest request){ + String resourceid = request.getParameter("resourceid"); + request.setAttribute("resourceid",resourceid); + return "/backstage/oa/ocr/distionarygroup/list"; + } + + /** + *方法描述：跳转到保存页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/toSave") + public String toSaveDistionarygroup(HttpServletResponse response,HttpServletRequest request){ + String resourceid = request.getParameter("resourceid"); + request.setAttribute("resourceid",resourceid); + return "/backstage/oa/ocr//distionarygroup/add"; + } + + /** + *方法描述：根据ID跳转到修改页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2022-03-07 15:15:08 + **/ + @GetMapping("/toEdit/{id}") + public String toEditDistionarygroup(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//distionarygroup/edit"; + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrDictionary.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrDictionary.java index 16d10659..f352811a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrDictionary.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrDictionary.java @@ -1,10 +1,13 @@ package cn.jyjz.xiaoyao.ocr.dataobject; import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer; +import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; +import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; @@ -15,6 +18,11 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.AbstractMap; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * TODO * @@ -29,7 +37,7 @@ import lombok.NoArgsConstructor; @Schema(name = "业务数据字典值表", title = "业务数据字典值表") @ApiModel(value="业务数据字典值表", description="业务数据字典值表") @TableName(value = "ocr_dictionary") -public class OcrDictionary { +public class OcrDictionary implements BaseDto,java.io.Serializable{ @ApiModelProperty(value ="主键") @TableId(value = "id",type = IdType.ASSIGN_ID) @@ -57,4 +65,32 @@ public class OcrDictionary { @TableField(value="group_id") private Long groupId; + + @TableField(exist = false) + @JsonIgnore + private final Map query = Stream.of( + new AbstractMap.SimpleEntry<>("listdept","deptid"), + new AbstractMap.SimpleEntry<>("ID","id"), + new AbstractMap.SimpleEntry<>("CODENO","codeno"), + new AbstractMap.SimpleEntry<>("DISTIONARYTYPEID","distionarytypeid"), + new AbstractMap.SimpleEntry<>("GROUPNAME","groupname"), + new AbstractMap.SimpleEntry<>("USEMODE","usemode") + ) + .collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue)); + + + @Override + public String getQueryFiled(String filedname){ + String obj = null; + if(null != query && query.size() > 0){ + obj = query.get(filedname); + } + return obj; + } + + + //保存当前登录用户的数据权限范围的搜索条件 + @TableField(exist = false) + @JsonIgnore + private SearchQuery searchQueryrolesShowleave; } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrDictionaryGroup.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrDictionaryGroup.java index 3fb96d34..9f5871ac 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrDictionaryGroup.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrDictionaryGroup.java @@ -1,9 +1,14 @@ package cn.jyjz.xiaoyao.ocr.dataobject; +import cn.jyjz.xiaoyao.admin.dataobject.Distionary; +import cn.jyjz.xiaoyao.admin.dataobject.Distionarytype; +import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; +import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; @@ -15,6 +20,12 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.AbstractMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * TODO * @@ -29,7 +40,7 @@ import lombok.NoArgsConstructor; @Schema(name = "业务数据字典组表", title = "业务数据字典组表") @ApiModel(value="业务数据字典组表", description="业务数据字典组表") @TableName(value = "ocr_dictionary_group") -public class OcrDictionaryGroup { +public class OcrDictionaryGroup implements BaseDto,java.io.Serializable { @ApiModelProperty(value ="主键") @TableId(value = "id",type = IdType.ASSIGN_ID) @JsonSerialize(using = ToStringSerializer.class) @@ -47,4 +58,33 @@ public class OcrDictionaryGroup { @ApiModelProperty(value ="备注") @TableField(value="remark") private String remark; + + + @TableField(exist = false) + private List distionaryList; + + + //保存当前登录用户的数据权限范围的搜索条件 + @TableField(exist = false) + @JsonIgnore + private SearchQuery searchQueryrolesShowleave; + + + @TableField(exist = false) + @JsonIgnore + private final Map query = Stream.of( + new AbstractMap.SimpleEntry<>("listdept","deptid"), + new AbstractMap.SimpleEntry<>("ID","id"), + new AbstractMap.SimpleEntry<>("CODENO","codeno"), + new AbstractMap.SimpleEntry<>("DISTIONARYTYPEID","distionarytypeid") + ) + .collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.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/OcrDictionaryGroupService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryGroupService.java new file mode 100644 index 00000000..3726e2c9 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryGroupService.java @@ -0,0 +1,21 @@ +package cn.jyjz.xiaoyao.ocr.service; +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.List; + +/** + * 业务向 数据字典 操作接口 + * + * @author hugh(shuli.yao) 1397940314@qq.com + * @version 1.0 + * @date 2024/3/16 12:48 + */ +public interface OcrDictionaryGroupService extends BaseService { + + + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java index 6563b7f5..34136d33 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java @@ -36,4 +36,8 @@ public interface OcrDictionaryService extends BaseService { * @return */ String queryLabelByValue(String field, String value, String tenantId); + + + + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryGroupServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryGroupServiceImpl.java new file mode 100644 index 00000000..f3dff9a8 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryGroupServiceImpl.java @@ -0,0 +1,35 @@ +package cn.jyjz.xiaoyao.ocr.service.impl; + +import cn.jyjz.xiaoyao.admin.cache.CacheAdminConstants; +import cn.jyjz.xiaoyao.admin.dataobject.Distionarytype; +import cn.jyjz.xiaoyao.admin.service.DistionaryService; +import cn.jyjz.xiaoyao.admin.service.DistionarytypeService; +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; +import cn.jyjz.xiaoyao.common.redis.cache.ICacheManager; +import cn.jyjz.xiaoyao.ocr.dataDao.OcrDictionaryGroupDao; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; +import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryGroupService; +import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 业务向 数据字典 操作接口实现类 + * + * @author hugh(shuli.yao) 1397940314@qq.com + * @version 1.0 + * @date 2024/3/16 12:48 + */ +@Service +@Slf4j +public class OcrDictionaryGroupServiceImpl extends BaseServiceImpl implements OcrDictionaryGroupService { + + +}