diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java new file mode 100644 index 0000000..fef2554 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.purchasebill.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "采购单") +@RestController +@RequestMapping("/apiadmin/purchasebill") +public class PurchaseBillRest { + + @Autowired + private PurchaseBillService purchaseBillService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return purchaseBillService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchaseBillDto dto){ + return purchaseBillService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + return purchaseBillService.delAll(sids); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return purchaseBillService.fetchDetailsVoBySid(sid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java new file mode 100644 index 0000000..01cc64f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java @@ -0,0 +1,172 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_wms(门户建设)
+ * File: SysMenuFeignFallback.java
+ * Class: com.yxt.user.biz.sysmenu.SysMenuRest
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "菜单表") +@RestController +@RequestMapping("apiadmin/sysmenu") +public class SysMenuRest { + + @Autowired + SysMenuService sysMenuService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + + return sysMenuService.listPageVo(pq); + } + + /* @Override + public ResultBean> listAll(@RequestBody SysMenuQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuService.listAllVo(query); + return rb.success().setData(list); + }*/ + + /** + * 菜单列表：根据资源归类 + * + * @param query + * @return + */ + @ApiOperation("菜单列表：根据资源归类") + @PostMapping("/listAllVoForSource") + public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query){ + return sysMenuService.listAllVoForSource(query); + } + + /** + * 菜单列表：根据资源归类 设置功能的url用 + * @return + */ + @ApiOperation("菜单列表：根据资源归类 设置功能的url用") + @PostMapping("/getMenusForFunction") + public ResultBean>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) { + return sysMenuService.getMenusForFunction(sysMenuFunctionQuery); + } + private void makeMenuListForChildren(SysMenuTreeVo s, List> l){ + List children = s.getChildren(); + int size = children.size(); + for (int i=0;i m=new HashMap<>(); + m.put("name",s.getName()); + m.put("url",s.getMenuUrl()); + m.put("sid",s.getSid()); + l.add(m); + } + + } + @ApiOperation("根据用户sid查询所有数据列表 ") + @PostMapping("/sourceMenuTreeByUserSid") + public ResultBean>> sourceMenuTreeByUserSid(@RequestBody SysMenuQuery query){ + return sysMenuService.sourceMenuTreeByUserSid(query); + } + @ApiOperation("根据资源sid查询所有数据列表 ") + @PostMapping("/sourcemenutree") + public ResultBean>> sourcemenutree(@RequestBody SysMenuQuery query) { + + return sysMenuService.sourcemenutree(query); + } + + @ApiOperation("根据角色sid条件查询所有数据列表") + @PostMapping("/listAllByRoleSid") + public ResultBean> listAllByRoleSid(@RequestBody SysMenuQuery query) { + return sysMenuService.listAllByRoleSid(query); + } + + + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + return sysMenuService.listVo(); + } + + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@Valid @RequestBody SysMenuDto dto) { + return sysMenuService.saveMenu(dto); + } + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid){ + return sysMenuService.updateBySid(dto, sid); + } + + /** + * 修改是否可用的状态 + * + * @param sid 菜单sid或资源sid + * @param isEnable 是否可用的状态：1可用，0不可用 + * @return + */ + @ApiOperation("修改是否可用的状态 ") + @PostMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable) { + return sysMenuService.updateIsEnable(sid,isEnable); + } + + /* @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysMenuService.delByIds(ids); + return rb.success(); + }*/ + /** + * 根据当前行sid删除菜单 + * + * @param sid 菜单sid + * @return + */ + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySids/{sid}") + public ResultBean delBySids(@PathVariable("sid") String sid) { + return sysMenuService.delBySids(sid); + } + + /* @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysMenuVo vo = sysMenuService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysMenu sysMenu = sysMenuService.fetchBySid(sid); + SysMenuVo vo = new SysMenuVo(); + BeanUtil.copyProperties(sysMenu, vo); + return rb.success().setData(vo); + }*/ +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java new file mode 100644 index 0000000..5c3450d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java @@ -0,0 +1,115 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysrole.SysRoleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleRest
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "菜单与角色关联表") +@RestController +@RequestMapping("apiadmin/sysmenurole") +public class SysMenuRoleRest { + @Autowired + private SysMenuRoleService sysMenuRoleService; + @Autowired + private SysRoleService sysRoleService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return sysMenuRoleService.listPageVo(pq); + } + + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysMenuRoleQuery query){ + return sysMenuRoleService.listAllVo(query); + } + + @ApiOperation("根据角色查询授权的菜单列表(PC)") + @PostMapping("/selMenuByRole") + public ResultBean> selMenuByRole(@RequestBody SysMenuRoleDataQuery query) { + return sysMenuRoleService.selMenuByRole(query); + } + + @ApiOperation("根据角色查询授权的菜单列表(APP)") + @PostMapping("/selMenuByRoleApp") + public ResultBean> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query) { + return sysMenuRoleService.selMenuByRoleApp(query); + } + + @ApiOperation("修改角色菜单的数据权限（PC）") + @PostMapping("/updateDataByRoleMenu") + public ResultBean updateDataByRoleMenu(@RequestBody List dtos) { + return sysMenuRoleService.updateDataByRoleMenu(dtos); + } + + @ApiOperation("修改角色菜单的数据权限（移动端）") + @PostMapping("/updateDataByRoleMenuApp") + public ResultBean updateDataByRoleMenuApp(@RequestBody List dtos) { + return sysMenuRoleService.updateDataByRoleMenuApp(dtos); + } + + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(){ + return sysMenuRoleService.listVo(); + } + + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysMenuRoleDto dto){ + return sysMenuRoleService.saveOrUpdateDto(dto); + } + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysMenuRoleDto dto,@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + return sysMenuRoleService.updateBySid(dto,sid); + } + + + @ApiOperation("修改角色的菜单配置") + @PostMapping("/updateRoleAndMenu") + public ResultBean updateRoleAndMenu(@RequestBody SysMenuRoleDto dto) { + + return sysMenuRoleService.updateRoleAndMenu(dto); + } + + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ + return sysMenuRoleService.del(ids); + } + + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ + return sysMenuRoleService.fetchByIdVo(id); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java new file mode 100644 index 0000000..866403a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java @@ -0,0 +1,267 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.base.config.RedisUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysorganization.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationFeignFallback.java
+ * Class: SysOrganizationRest
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "组织机构表") +@RestController +@RequestMapping("apiadmin/sysorganization") +public class SysOrganizationRest { + + @Autowired + private SysOrganizationService sysOrganizationService; + + @Autowired + private RedisUtil redisUtil; + + @PostMapping("/saveSysOrg") + public ResultBean saveOrg(@RequestBody SysOrganizationDto dto){ + return sysOrganizationService.saveOrg(dto); + } + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return sysOrganizationService.listPageVo(pq); + } + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysOrganizationQuery query) { + return sysOrganizationService.listAllVo(query); + } + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list() { + return sysOrganizationService.listVo(); + } + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysOrganizationDto dto) { + return sysOrganizationService.saveOrUpdateDto(dto); + } + + @ApiOperation("一级组织机构列表") + @GetMapping("/selectFirstOrgList") + public ResultBean> selectFirstOrgList(){ + return sysOrganizationService.selectFirstOrgList(); + } + + @ApiOperation("根据父级sid查询子集列表") + @GetMapping("/selectChildrenListBySid/{sid}") + public ResultBean> selectChildrenListBySid(@PathVariable("sid") String sid) { + return sysOrganizationService.selectChildrenListBySid(sid); + } + + + @Transactional(rollbackFor = Exception.class) + public ResultBean update(SysOrganizationDto dto, String sid){ + return sysOrganizationService.updateBySid(dto, sid); + } + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ + return sysOrganizationService.del(ids); + } + + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid){ + + return sysOrganizationService.deIds(sid); + } + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ + return sysOrganizationService.fetchByIdVo(id); + } + + @ApiOperation("获取一条记录 根据sid") + @ResponseBody + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + + return sysOrganizationService.fetchBySidVo(sid); + } + + @ApiOperation("手机获取组织架构") + @ResponseBody + @GetMapping("/selectAppOrganization") + public ResultBean> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid) { + return sysOrganizationService.selectAppOrganization(sid); + } + + + @ApiOperation("组织架构") + @ResponseBody + @GetMapping("/selectListOrg") + ResultBean> selectListOrg(){ + return sysOrganizationService.treeList(); + } + + + @ApiOperation("获取到分公司") + @ResponseBody + @GetMapping("/getListOrg") + ResultBean> getListOrg(){ + return sysOrganizationService.getListOrg(); + } + + @ApiOperation("获取同品牌下分公司") + @ResponseBody + @GetMapping("/getListOrgByBrand/{orgSid}") + ResultBean> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid){ + return null;//sysOrganizationService.getListOrgByBrand(orgSid); + } + + @ApiOperation("获取指定品牌下分公司(已筛选本分公司)") + @ResponseBody + @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}") + ResultBean> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){ + return null;//sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid); + } + + @ApiOperation("获取指定品牌下分公司(未筛选本分公司)") + @ResponseBody + @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}") + ResultBean> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){ + return null;//sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid); + } + + @ApiOperation("获取指定分公司下部门信息") + @ResponseBody + @GetMapping("/getListDeptByOrgSid/{orgSid}") + ResultBean> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid){ + return sysOrganizationService.getListDeptByOrgSid(orgSid); + } + + + @ApiOperation("根据业务员sid获取到分公司") + @ResponseBody + @GetMapping("/getUseOrgByUserSid") + ResultBean getUseOrgByUserSid(@RequestParam("userSid") String userSid){ + ResultBean rb = ResultBean.fireFail(); + SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid); + return rb.success().setData(vo); + } + + + @ApiOperation("根据部门sid查询组织信息") + @ResponseBody + @GetMapping("/selectBySid") + ResultBean selectBySid(@RequestParam("sid") String sid){ + return sysOrganizationService.selectBySid(sid); + } + + + @ApiOperation("根据组织架构sid查询组织下所有分公司") + @ResponseBody + @GetMapping("/selectUseOrgSidBySid") + ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid){ + return sysOrganizationService.selectUseOrgSidBySid(sid); + } + + /** + * 查询公司所有的部门 + * + * @return + */ + @ApiOperation("所在部门下拉") + @ResponseBody + @GetMapping("/selectListOne") + ResultBean> selectListOne(){ + return sysOrganizationService.selectListOne(); + } + + @PostMapping("/getQrCode/{sid}") + @ResponseBody + @ApiOperation("查看二维码") + public ResultBean getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid) { + return sysOrganizationService.getQrCode(sid); + } + + + @GetMapping("/getOrgSid/{sid}") + @ResponseBody + @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司") + ResultBean getOrgSid(@PathVariable(value = "sid") String sid){ + return sysOrganizationService.getOrgSid(sid); + } + + @GetMapping("/selectOrgList") + @ResponseBody + @ApiOperation("当前分公司销售部门及部门人员") + ResultBean> selectOrgList(@SpringQueryMap SysOrganizationListQuery query){ + return sysOrganizationService.selectOrgList(query); + } + + + @GetMapping("/selectOrgLists") + @ResponseBody + @ApiOperation("当前分公司下所有部门") + ResultBean> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query){ + return sysOrganizationService.selectOrgLists(query); + } + + + @GetMapping("/selectByPSid") + @ResponseBody + @ApiOperation("查询分公司下的销售支持部") + ResultBean selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name){ + return sysOrganizationService.selectByPSid(sid,name); + } + + @GetMapping("/selectOrgSidList") + @ResponseBody + @ApiOperation("所有分公司sid") + ResultBean> selectOrgSidList() { + return sysOrganizationService.selectOrgSidList(); + } + + + @GetMapping("/selectOrgByPSid") + @ResponseBody + @ApiOperation("查询事业部下所有分公司") + ResultBean> selectOrgByPSid(@RequestParam("psid") String psid){ + return sysOrganizationService.selectOrgByPSid(psid); + } + + + @GetMapping("/selectByOrgSidPath") + @ResponseBody + @ApiOperation("组织层级分页查询") + ResultBean selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath){ + return sysOrganizationService.selectByOrgSidPath(orgSidPath); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java new file mode 100644 index 0000000..7fa2043 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java @@ -0,0 +1,118 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.syspost.SysPostRest
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "岗位") +@RestController +@RequestMapping("apiadmin/syspost") +public class SysPostRest { + + @Autowired + private SysPostService sysPostService; + + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return sysPostService.listPageVo(pq); + } + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysPostQuery query){ + return sysPostService.listAllVo(query); + } + + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list() { + return sysPostService.listVo(); + } + + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysPostDto dto){ + return sysPostService.saveOrUpdateDto(dto); + } + + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid){ + return sysPostService.updateBySid(dto, sid); + } + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ + return sysPostService.del(ids); + } + + + @ApiOperation("删除记录") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids){ + return sysPostService.delBySids(sids); + } + + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ + return sysPostService.fetchByIdVo(id); + } + + + @ApiOperation("获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid){ + return sysPostService.fetchBySidVo(sid); + } + + + @ApiOperation("根据部门sid获取岗位列表") + @GetMapping("/fetchByOrgSid/{orgSid}") + public ResultBean> fetchByOrgSid(@PathVariable("orgSid") String orgSid){ + return sysPostService.fetchByOrgSid(orgSid); + } + + @ApiOperation("根据部门sid获取岗位编号") + @GetMapping("/fetchByOrgSidPostCode/{orgSid}") + public ResultBean fetchByOrgSidPostCode(){ + return sysPostService.fetchByOrgSidPostCode(); + } + + /** + * 查询岗位列表 + * + * @return + */ + @ApiOperation("查询岗位列表") + @GetMapping("/selectList") + public ResultBean> selectList() { + return sysPostService.selectList(); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java new file mode 100644 index 0000000..3096653 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java @@ -0,0 +1,29 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeDto; +import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2024/5/15 16:00 + */ +@Api(tags = "角色授权表") +@RestController +@RequestMapping("apiadmin/sysrikeauthorize") +public class SysRoleAuthorizeRest { + @Autowired + SysRoleAuthorizeService sysRoleAuthorizeService; + @ApiOperation("修改角色的菜单配置") + @PostMapping("/updateRoleAndMenu") + public ResultBean updateRoleAndMenu(@RequestBody SysRoleAuthorizeDto dto){ + return sysRoleAuthorizeService.updateRoleAndMenu(dto); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java new file mode 100644 index 0000000..b018c8f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java @@ -0,0 +1,117 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysrole.SysRoleDto; +import com.yxt.wms.biz.func.sysrole.SysRoleQuery; +import com.yxt.wms.biz.func.sysrole.SysRoleService; +import com.yxt.wms.biz.func.sysrole.SysRoleVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleRest
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "角色") +@RestController +@RequestMapping("apiadmin/sysrole") +public class SysRoleRest { + + @Autowired + private SysRoleService sysRoleService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return sysRoleService.listPageVo(pq); + } + + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysRoleQuery query){ + return sysRoleService.listAllVo(query); + } + + + @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色") + @PostMapping("/listAllByUserSid/{userSid}") + public ResultBean> listAllByUserSid(@PathVariable("userSid") String userSid){ + return sysRoleService.listAllByUserSid(userSid); + } + + + @ApiOperation("根据用户sid查询用户的角色列表") + @PostMapping("/fetchByUserSid/{userSid}") + public ResultBean> fetchByUserSid(@PathVariable("userSid") String userSid){ + return sysRoleService.fetchByUserSid(userSid); + } + + + public ResultBean> list(){ + return sysRoleService.listVo(); + } + + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysRoleDto dto){ + return sysRoleService.saveOrUpdateDto(dto); + } + + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysRoleDto dto,@PathVariable("sid") String sid){ + return sysRoleService.updateBySid(dto,sid); + } + + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ + return sysRoleService.del(ids); + } + + @ApiOperation("删除记录根据sids") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids){ + return sysRoleService.delBySid(sids); + } + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ + return sysRoleService.fetchByIdVo(id); + } + + @ApiOperation("获取一条记录根据sid") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + return sysRoleService.fetchBySidVo(sid); + } + + @PostMapping("/setIsEnable/{sid}/{isEnable}") + @ResponseBody + @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用") + public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){ + return sysRoleService.updateIsEnable(sid, isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java new file mode 100644 index 0000000..6e850cd --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java @@ -0,0 +1,22 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.sysstafforg.SysStaffOrgService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/apiadmin/sysstafforg") +public class SysStaffOrgRest { + + @Autowired + private SysStaffOrgService sysStaffOrgService; + + @GetMapping("/getOrgSidByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath){ + return sysStaffOrgService.getOrgSidByPath(orgPath); + }; +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java new file mode 100644 index 0000000..fbf16d2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java @@ -0,0 +1,96 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.sysuser.SysUserService; +import com.yxt.oms.feign.portal.sysuser.SysUserDto; +import com.yxt.oms.feign.portal.sysuser.SysUserQuery; +import com.yxt.oms.feign.portal.sysuser.SysUserVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; + +/** + * @author wangpengfei + * @date 2024/5/6 10:29 + */ +@Api(tags = "用户信息") +@RestController +@RequestMapping("/apiadmin/sysuser") +public class SysUserRest { + @Autowired + SysUserService sysUserService; + + + @PostMapping("/login") + @ResponseBody + @ApiOperation(value = "3、登录") + @ApiOperationSupport(order = 30) + public ResultBean login(@RequestBody SysUserQuery userQuery){ + return sysUserService.login(userQuery); + } + @PostMapping("/register") + @ResponseBody + @ApiOperation(value = "3、注册") + @ApiOperationSupport(order = 30) + public ResultBean register(@RequestBody SysUserDto dto){ + return sysUserService.register(dto); + } + @PostMapping("/loginDetails") + @ResponseBody + @ApiOperation(value = "获取登录人") + @ApiOperationSupport(order = 30) + public ResultBean loginDetails(HttpServletRequest httpServletRequest){ + return sysUserService.loginDetails(httpServletRequest); + } + @PostMapping("/sendMessageCode") + @ResponseBody + @ApiOperation(value = "3、获取注册码") + public ResultBean sendMessageCode(@RequestParam("mobile") String mobile){ + return sysUserService.sendMessageCode(mobile); + } + @PostMapping("/sendMessageLogin") + @ResponseBody + @ApiOperation(value = "3、获取登录码") + public ResultBean sendMessageLogin(@RequestParam("mobile") String mobile){ + return sysUserService.sendMessageLogin(mobile); + } + @PostMapping("/sendMessageUpdate") + @ResponseBody + @ApiOperation(value = "3、获取修改码") + public ResultBean sendMessageUpdate(@RequestParam("mobile") String mobile){ + return sysUserService.sendMessageUpdate(mobile); + } + + @PostMapping("/listPage") + @ResponseBody + public ResultBean listPage(@RequestBody PagerQuery pq){ + return sysUserService.listPage(pq); + } + + @PostMapping("/bindOrganization") + @ResponseBody + @ApiOperation(value = "绑定组织") + @ApiOperationSupport(order = 30) + public ResultBean bindOrganization(@RequestBody SysUserDto dto){ + return sysUserService.bindOrganization(dto); + } + @PostMapping("/selOrganization") + @ResponseBody + @ApiOperation(value = "选择所登录的组织") + @ApiOperationSupport(order = 30) + public ResultBean selOrganization(@RequestBody SysUserDto dto){ + return sysUserService.selOrganization(dto); + } + @PostMapping("/setIsEnable/{sid}/{isEnable}") + @ResponseBody + @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用") + public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){ + return sysUserService.setIsEnable(sid,isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java new file mode 100644 index 0000000..bc8cf1d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java @@ -0,0 +1,91 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysuserrole.SysUserRoleDto; +import com.yxt.oms.biz.func.sysuserrole.SysUserRoleQuery; +import com.yxt.oms.biz.func.sysuserrole.SysUserRoleService; +import com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(tags = "用户与角色关联表") +@RestController +@RequestMapping("apiadmin/sysuserrole") +public class SysUserRoleRest { + + @Autowired + private SysUserRoleService sysUserRoleService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return sysUserRoleService.listPageVo(pq); + } + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysUserRoleQuery query){ + return sysUserRoleService.listAllVo(query); + } + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(){ + return sysUserRoleService.listVo(); + } + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysUserRoleDto dto){ + return sysUserRoleService.saveOrUpdateDto(dto); + } + + @ApiOperation("修改保存") + @PostMapping("/update") + public ResultBean update(@RequestBody SysUserRoleDto dto){ + return sysUserRoleService.saveOrUpdate(dto); + } + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ + return sysUserRoleService.del(ids); + } + + @ApiOperation("根据用户sid和角色sid删除记录") + @GetMapping("/delByUserSidAndRoleSid/{userSid}/{roleSid}") + public ResultBean delByUserSidAndRoleSid(@PathVariable("userSid")String userSid, + @PathVariable("roleSid")String roleSid) { + return sysUserRoleService.delByUserSidAndRoleSid(userSid,roleSid); + } + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ + return sysUserRoleService.fetchByIdVo(id); + } + + @ApiOperation("根据用户sid查询用户角色sid列表") + @GetMapping("/getUserRoleSidByUserSid/{userSid}") + public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid) { + return sysUserRoleService.getUserRoleSidByUserSid(userSid); + } + + @ApiOperation("根据角色sid查询用户id列表") + @GetMapping("/getUserIdListByRoleSid") + public ResultBean> getUserIdListByRoleSid(@RequestParam("roleList") List roleList) { + return sysUserRoleService.getUserIdListByRoleSid(roleList); + } + + @ApiOperation("查询用户的角色") + @GetMapping("/selectByUserSid") + ResultBean> selectByUserSid(@RequestParam("userSid") String userSid) { + return sysUserRoleService.selectByUserSids(userSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBill.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBill.java new file mode 100644 index 0000000..99c37c4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBill.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBill.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBill
+ * Description: 采购单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:45
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单", description = "采购单") +@TableName("purchase_bill") +public class PurchaseBill extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("来源单sid（工单sid）") + private String sourceBillSid; // 来源单sid（工单sid） + @ApiModelProperty("来源单编号/外部编号") + private String sourceBillNo; // 来源单编号/外部编号 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("采购类型Key") + private String purchaseTypeKey; // 采购类型Key + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; // 采购类型Value（厂家采购、外采、其他） + @ApiModelProperty("采购原因key") + private String purchaseReasonKey; // 采购原因key + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆） + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; // 付款方式value（预付款/月结/单笔付款） + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商联系电话") + private String supplierPhone; // 供应商联系电话 + @ApiModelProperty("采购员sid（单选）") + private String purchaserSid; // 采购员sid（单选） + @ApiModelProperty("采购员姓名") + private String purchaserName; // 采购员姓名 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计到货日期") + private Date deliveryDate; // 预计到货日期 + @ApiModelProperty("仓库sid") + private String wareHouseSid; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建部门sid") + private String deptSid; + @ApiModelProperty("创建部门") + private String deptName; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java new file mode 100644 index 0000000..2f77043 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java @@ -0,0 +1,103 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountDetailsVo; +import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDetailsVo; +import com.yxt.oms.biz.func.purchasebillextend.PurchaseBillExtendDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "采购单 视图数据详情", description = "采购单 视图数据详情") +public class PurchaseBillDetailsVo implements Vo { + + private String sid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("来源单sid（工单sid）") + private String sourceBillSid; // 来源单sid（工单sid） + @ApiModelProperty("来源单编号/外部编号") + private String sourceBillNo; // 来源单编号/外部编号 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("采购类型Key") + private String purchaseTypeKey; // 采购类型Key + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; // 采购类型Value（厂家采购、外采、其他） + @ApiModelProperty("采购原因key") + private String purchaseReasonKey; // 采购原因key + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆） + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; // 付款方式value（预付款/月结/单笔付款） + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商联系电话") + private String supplierPhone; // 供应商联系电话 + @ApiModelProperty("采购员sid（单选）") + private String purchaserSid; // 采购员sid（单选） + @ApiModelProperty("采购员姓名") + private String purchaserName; // 采购员姓名 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计到货日期") + private Date deliveryDate; // 预计到货日期 + @ApiModelProperty("仓库sid") + private String wareHouseSid; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建部门sid") + private String deptSid; + @ApiModelProperty("创建部门") + private String deptName; + + @ApiModelProperty("采购单费用/预付款") + private PurchaseBillAmountDetailsVo purchaseBillAmount; + @ApiModelProperty("采购单扩展") + private PurchaseBillExtendDetailsVo purchaseBillExtend; + @ApiModelProperty("采购单商品明细") + private List purchaseBillDetailList; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java new file mode 100644 index 0000000..540ca15 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountDto; +import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto; +import com.yxt.oms.biz.func.purchasebillextend.PurchaseBillExtendDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "采购单 数据传输对象", description = "采购单 数据传输对象") +public class PurchaseBillDto implements Dto { + + private String sid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("来源单sid（工单sid）") + private String sourceBillSid; // 来源单sid（工单sid） + @ApiModelProperty("来源单编号/外部编号") + private String sourceBillNo; // 来源单编号/外部编号 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("采购类型Key") + private String purchaseTypeKey; // 采购类型Key + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; // 采购类型Value（厂家采购、外采、其他） + @ApiModelProperty("采购原因key") + private String purchaseReasonKey; // 采购原因key + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆） + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; // 付款方式value（预付款/月结/单笔付款） + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商联系电话") + private String supplierPhone; // 供应商联系电话 + @ApiModelProperty("采购员sid（单选）") + private String purchaserSid; // 采购员sid（单选） + @ApiModelProperty("采购员姓名") + private String purchaserName; // 采购员姓名 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计到货日期") + private Date deliveryDate; // 预计到货日期 + @ApiModelProperty("仓库sid") + private String wareHouseSid; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建部门sid") + private String deptSid; + @ApiModelProperty("创建部门") + private String deptName; + @ApiModelProperty("组织全路径") + private String orgPath; + + @ApiModelProperty("采购单费用/预付款") + private PurchaseBillAmountDto purchaseBillAmount; + @ApiModelProperty("采购单扩展") + private PurchaseBillExtendDto purchaseBillExtend; + @ApiModelProperty("采购单商品明细") + private List purchaseBillDetailList; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.java new file mode 100644 index 0000000..a4831db --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillMapper.java
+ * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillMapper
+ * Description: 采购单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchaseBillMapper extends BaseMapper { + + String selectNum(String billNo); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml new file mode 100644 index 0000000..57c54aa --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java new file mode 100644 index 0000000..349b9a8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillQuery.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery
+ * Description: 采购单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:45
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单 查询条件", description = "采购单 查询条件") +public class PurchaseBillQuery implements Query { + + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("收货状态key") + private String receiveStateKey; + @ApiModelProperty("物流单号") + private String logisticsNum; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; + + private String orgLevelKey; + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java new file mode 100644 index 0000000..06b87db --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java @@ -0,0 +1,122 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + +import cn.hutool.core.date.DateUtil; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.oms.feign.portal.privilege.PrivilegeQuery; +import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserFeign; +import com.yxt.oms.feign.purchase.purchasebill.PurchaseBillFeign; +import com.yxt.oms.utils.Rule; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; + +@Service +public class PurchaseBillService extends MybatisBaseService { + + @Autowired + private PurchaseBillFeign purchaseBillFeign; + @Resource + private SysUserFeign sysUserFeign; + @Resource + private SysOrganizationFeign sysOrganizationFeign; + @Resource + private SysStaffOrgFeign sysStaffOrgFeign; + + public ResultBean> listPageVo(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PurchaseBillQuery query = pq.getParams(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); + PagerVo p = purchaseBillFeign.listPage(pq).getData(); + return rb.success().setData(p); + } + + public ResultBean saveOrUpdateDto(PurchaseBillDto dto) { + String orgPath = dto.getOrgPath(); + if (StringUtils.isBlank(dto.getSid())) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + dto.setDeptSid(deptSid); + dto.setDeptName(deptName); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + dto.setUseOrgSid(createOrgSid); + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "CGD" + organizationResultBean.getData().getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); + } + } + } + return purchaseBillFeign.save(dto); + } + + public ResultBean fetchDetailsVoBySid(String sid) { + return purchaseBillFeign.fetchDetailsBySid(sid); + } + + public ResultBean delAll(String[] sids) { + return purchaseBillFeign.delBySids(sids); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java new file mode 100644 index 0000000..3e1990b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java @@ -0,0 +1,90 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillVo.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
+ * Description: 采购单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象") +public class PurchaseBillVo implements Vo { + + private String sid; // sid + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("业务日期") + private Date createTime; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("收货状态value") + private Integer receiveStateValue; + @ApiModelProperty("商品总额") + private String amountTotal; + @ApiModelProperty("采购运费") + private BigDecimal freight; + @ApiModelProperty("其它费用") + private BigDecimal otherAmount; + @ApiModelProperty("预付金额") + private BigDecimal prepayment; + @ApiModelProperty("物流单号") + private String logisticsNum; + @ApiModelProperty("生产进度") + private String productProgress; + @ApiModelProperty("总采购数量") + private String countTotal; + @ApiModelProperty("发货状态value") + private Integer deliveryStateValue; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人姓名") + private String createByName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillDetailsVo.java new file mode 100644 index 0000000..e73e2e7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillDetailsVo.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillVo.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
+ * Description: 采购单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象") +public class PurchaseChoiceBillDetailsVo implements Vo { + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("单据日期") + private Date createTime; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("采购金额合计") + private BigDecimal amountCount; + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillQuery.java new file mode 100644 index 0000000..14f4d6c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillQuery.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillQuery.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery
+ * Description: 采购单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:45
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单原单 查询条件", description = "采购单 查询条件") +public class PurchaseChoiceBillQuery implements Query { + + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; + @ApiModelProperty("办结开始日期") + private String finishStartTime; + @ApiModelProperty("办结结束日期") + private String finishEndTime; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + + private String createOrgSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillVo.java new file mode 100644 index 0000000..332893b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillVo.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillVo.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
+ * Description: 采购单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象") +public class PurchaseChoiceBillVo implements Vo { + + private String sid; // sid + + /*仅页面展示*/ + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; + + @ApiModelProperty("单据编号") + private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("单据日期") + private Date createTime; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("采购金额合计") + private BigDecimal amountCount; + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; + @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）") + private BigDecimal payableAmount; + + @ApiModelProperty("采购单商品明细") + private List pmsPurchaseBillDetailList; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java new file mode 100644 index 0000000..ff80eba --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillamount; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(value = "采购单-费用/预付款", description = "采购单-费用/预付款") +@TableName("purchase_bill_amount") +public class PurchaseBillAmount extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; // 误差调整金额 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; // 应付金额 + @ApiModelProperty("采购运费") + private BigDecimal freight; // 采购运费 + @ApiModelProperty("运费分摊方式Key") + private String freightShareTypeKey; // 运费分摊方式Key + @ApiModelProperty("运费分摊方式Value") + private String freightShareTypeValue; // 运费分摊方式Value + @ApiModelProperty("其它费用") + private BigDecimal otherAmount; // 其它费用 + @ApiModelProperty("其他费用分摊方式Key") + private String otherShareTypeKey; // 其他费用分摊方式Key + @ApiModelProperty("其他费用分摊方式Value") + private String otherShareTypeValue; // 其他费用分摊方式Value + @ApiModelProperty("结算账户") + private String settleAccount; // 结算账户 + @ApiModelProperty("预付金额") + private BigDecimal prepayment; // 预付金额 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTerm; // 付款期限 + @ApiModelProperty("收款开户行") + private String bankName; // 收款开户行 + @ApiModelProperty("收款账户") + private String bankAccountName; // 收款账户 + @ApiModelProperty("收款银行账号") + private String bankAccount; // 收款银行账号 + @ApiModelProperty("币种") + private String currency; // 币种 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java new file mode 100644 index 0000000..c877cc1 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillamount; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: caigou(采购)
+ * File: PurchaseBillAmountVo.java
+ * Class: com.yxt.purchase.api.purchasebillamount.PurchaseBillAmountVo
+ * Description: 采购单-费用/预付款 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-03 14:44:55
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-费用/预付款 视图数据详情", description = "采购单-费用/预付款 视图数据详情") +public class PurchaseBillAmountDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; // 误差调整金额 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; // 应付金额 + @ApiModelProperty("采购运费") + private BigDecimal freight; // 采购运费 + @ApiModelProperty("运费分摊方式Key") + private String freightShareTypeKey; // 运费分摊方式Key + @ApiModelProperty("运费分摊方式Value") + private String freightShareTypeValue; // 运费分摊方式Value + @ApiModelProperty("其它费用") + private BigDecimal otherAmount; // 其它费用 + @ApiModelProperty("其他费用分摊方式Key") + private String otherShareTypeKey; // 其他费用分摊方式Key + @ApiModelProperty("其他费用分摊方式Value") + private String otherShareTypeValue; // 其他费用分摊方式Value + @ApiModelProperty("结算账户") + private String settleAccount; // 结算账户 + @ApiModelProperty("预付金额") + private BigDecimal prepayment; // 预付金额 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTermStart; // 付款期限 + private Date paymentTermEnd; // 付款期限 + @ApiModelProperty("收款开户行") + private String bankName; // 收款开户行 + @ApiModelProperty("收款账户") + private String bankAccountName; // 收款账户 + @ApiModelProperty("收款银行账号") + private String bankAccount; // 收款银行账号 + @ApiModelProperty("币种") + private String currency; // 币种 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java new file mode 100644 index 0000000..32c57c6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillamount; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: caigou(采购)
+ * File: PurchaseBillAmountDto.java
+ * Class: com.yxt.purchase.api.purchasebillamount.PurchaseBillAmountDto
+ * Description: 采购单-费用/预付款 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-03 14:44:55
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-费用/预付款 数据传输对象", description = "采购单-费用/预付款 数据传输对象") +public class PurchaseBillAmountDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; // 误差调整金额 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; // 应付金额 + @ApiModelProperty("采购运费") + private BigDecimal freight; // 采购运费 + @ApiModelProperty("运费分摊方式Key") + private String freightShareTypeKey; // 运费分摊方式Key + @ApiModelProperty("运费分摊方式Value") + private String freightShareTypeValue; // 运费分摊方式Value + @ApiModelProperty("其它费用") + private BigDecimal otherAmount; // 其它费用 + @ApiModelProperty("其他费用分摊方式Key") + private String otherShareTypeKey; // 其他费用分摊方式Key + @ApiModelProperty("其他费用分摊方式Value") + private String otherShareTypeValue; // 其他费用分摊方式Value + @ApiModelProperty("结算账户") + private String settleAccount; // 结算账户 + @ApiModelProperty("预付金额") + private BigDecimal prepayment; // 预付金额 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTermStart; // 付款期限 + private Date paymentTermEnd; // 付款期限 + @ApiModelProperty("收款开户行") + private String bankName; // 收款开户行 + @ApiModelProperty("收款账户") + private String bankAccountName; // 收款账户 + @ApiModelProperty("收款银行账号") + private String bankAccount; // 收款银行账号 + @ApiModelProperty("币种") + private String currency; // 币种 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountMapper.java new file mode 100644 index 0000000..04f06de --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountMapper.java @@ -0,0 +1,41 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillamount; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface PurchaseBillAmountMapper extends BaseMapper { + + @Delete("delete from purchase_bill_amount where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from purchase_bill_amount where billSid = #{billSid}") + PurchaseBillAmountDetailsVo selByMainSid(String billSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountMapper.xml new file mode 100644 index 0000000..160b403 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountService.java new file mode 100644 index 0000000..db9ed6e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountService.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillamount; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +@Service +public class PurchaseBillAmountService{ + + public void insertByDto(PurchaseBillAmountDto dto){ + PurchaseBillAmount entity = new PurchaseBillAmount(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public PurchaseBillAmountDetailsVo selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetail.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetail.java new file mode 100644 index 0000000..b945406 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetail.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetail.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetail
+ * Description: 采购单据明细.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细", description = "采购单据明细") +@TableName("purchase_bill_detail") +public class PurchaseBillDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码") + private String goodsSkuCode; // 商品编码 + @ApiModelProperty("商品条码") + private String goodsSN; // 商品条码 + @ApiModelProperty("货号") + private String goodsNum; // 货号 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("单价") + private BigDecimal cost; // 单价 + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("折扣率") + private BigDecimal discountRate; // 折扣率 + @ApiModelProperty("折后单价") + private BigDecimal discountPrice; // 折后单价 + @ApiModelProperty("分摊金额") + private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("分配比例") + private BigDecimal shareRate; // 分配比例 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + @ApiModelProperty("采购周期") + private Integer cycle; // 采购周期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预期到货日期") + private Date deliveryDate; // 预期到货日期 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java new file mode 100644 index 0000000..d224c31 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * Description: 采购单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 视图数据详情", description = "采购单据明细 视图数据详情") +public class PurchaseBillDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码") + private String goodsSkuCode; // 商品编码 + @ApiModelProperty("商品条码") + private String goodsSN; // 商品条码 + @ApiModelProperty("货号") + private String goodsNum; // 货号 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("单价") + private BigDecimal cost; // 单价 + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("折扣率") + private BigDecimal discountRate; // 折扣率 + @ApiModelProperty("折后单价") + private BigDecimal discountPrice; // 折后单价 + @ApiModelProperty("分摊金额") + private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("分配比例") + private BigDecimal shareRate; // 分配比例 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + @ApiModelProperty("采购周期") + private Integer cycle; // 采购周期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预期到货日期") + private Date deliveryDate; // 预期到货日期 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java new file mode 100644 index 0000000..44e2641 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailDto.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailDto
+ * Description: 采购单据明细 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 数据传输对象", description = "采购单据明细 数据传输对象") +public class PurchaseBillDetailDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码") + private String goodsSkuCode; // 商品编码 + @ApiModelProperty("商品条码") + private String goodsSN; // 商品条码 + @ApiModelProperty("货号") + private String goodsNum; // 货号 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("单价") + private BigDecimal cost; // 单价 + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("折扣率") + private BigDecimal discountRate; // 折扣率 + @ApiModelProperty("折后单价") + private BigDecimal discountPrice; // 折后单价 + @ApiModelProperty("分摊金额") + private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("分配比例") + private BigDecimal shareRate; // 分配比例 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + @ApiModelProperty("采购周期") + private Integer cycle; // 采购周期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预期到货日期") + private Date deliveryDate; // 预期到货日期 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailMapper.java new file mode 100644 index 0000000..81d5e6d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailMapper.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailMapper.java
+ * Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailMapper
+ * Description: 采购单据明细.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchaseBillDetailMapper extends BaseMapper { + + @Delete("delete from purchase_bill_detail where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from purchase_bill_detail where billSid = #{billSid}") + List selByMainSid(String billSid); + + IPage purDetailReForm(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage purSumReForm(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailMapper.xml new file mode 100644 index 0000000..efc501a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailQuery.java new file mode 100644 index 0000000..e4d0507 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailQuery.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailQuery.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailQuery
+ * Description: 采购单据明细 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 查询条件", description = "采购单据明细 查询条件") +public class PurchaseBillDetailQuery implements Query { + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; // 商品编码（图号） + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("采购前库存数量") + private BigDecimal currentCount; // 采购前库存数量 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("库区/货位sid") + private String warehouseAreaSid; // 库区/货位sid + @ApiModelProperty("库区名称") + private String warehouseAreaName; // 库区名称 + @ApiModelProperty("货架sid") + private String warehouseRackSid; // 货架sid + @ApiModelProperty("货架名称") + private String warehouseRackName; // 货架名称 + @ApiModelProperty("单位成本（进货价）") + private BigDecimal cost; // 单位成本（进货价） + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailReportQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailReportQuery.java new file mode 100644 index 0000000..273c3bb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailReportQuery.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * Description: 采购单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象") +public class PurchaseBillDetailReportQuery implements Query { + + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("商品名称") + private String goodsSpuName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailReportVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailReportVo.java new file mode 100644 index 0000000..8837d91 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailReportVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * Description: 采购单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象") +public class PurchaseBillDetailReportVo implements Vo { + + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("单位成本（进货价）") + private BigDecimal cost; + @ApiModelProperty("总体单位成本（进货价）") + private BigDecimal costCount; + @ApiModelProperty("税额") + private BigDecimal taxAmount; + @ApiModelProperty("税额合计") + private BigDecimal taxAmountCount; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("退货数量") + private BigDecimal retreatCount; + @ApiModelProperty("采购金额") + private BigDecimal amount; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("单位") + private String unit; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailService.java new file mode 100644 index 0000000..78c72d3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailService.java @@ -0,0 +1,113 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailService.java
+ * Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailService
+ * Description: 采购单据明细 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PurchaseBillDetailService extends MybatisBaseService { + + public void insertByDto(PurchaseBillDetailDto dto) { + PurchaseBillDetail entity = new PurchaseBillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } + + public PagerVo purDetailReForm(PagerQuery pq) { + PurchaseBillDetailReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("pdd.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) { + qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec()); + } + if (StringUtils.isNotBlank(query.getGoodsSpuName())) { + qw.like("pdd.goodsSpuName", query.getGoodsSpuName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.purDetailReForm(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo purSumReForm(PagerQuery pq) { + PurchaseBillDetailReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("pdd.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) { + qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec()); + } + if (StringUtils.isNotBlank(query.getGoodsSpuName())) { + qw.like("pdd.goodsSpuName", query.getGoodsSpuName()); + } + qw.eq("pdd.isDelete",0); + qw.groupBy("pdd.goodsSkuCode"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.purSumReForm(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailSumVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailSumVo.java new file mode 100644 index 0000000..ae15733 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailSumVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * Description: 采购单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象") +public class PurchaseBillDetailSumVo implements Vo { + + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("采购金额") + private BigDecimal amount; + @ApiModelProperty("退货数量") + private BigDecimal retreatCount; + @ApiModelProperty("退货金额") + private BigDecimal backAmount; + @ApiModelProperty("门店") + private String useOrgName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailVo.java new file mode 100644 index 0000000..4a51e07 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailVo.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebilldetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * Description: 采购单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象") +public class PurchaseBillDetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; // 商品编码（图号） + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("采购前库存数量") + private BigDecimal currentCount; // 采购前库存数量 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("库区/货位sid") + private String warehouseAreaSid; // 库区/货位sid + @ApiModelProperty("库区名称") + private String warehouseAreaName; // 库区名称 + @ApiModelProperty("货架sid") + private String warehouseRackSid; // 货架sid + @ApiModelProperty("货架名称") + private String warehouseRackName; // 货架名称 + @ApiModelProperty("单位成本（进货价）") + private BigDecimal cost; // 单位成本（进货价） + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtend.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtend.java new file mode 100644 index 0000000..7958c3e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtend.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillextend; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtend.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtend
+ * Description: 采购单扩展.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单扩展", description = "采购单扩展") +@TableName("purchase_bill_extend") +public class PurchaseBillExtend extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("物流单号") + private String logisticsNum; // 物流单号 + @ApiModelProperty("生产进度") + private String productProgress; // 生产进度 + @ApiModelProperty("收货状态key") + private String receiveStateKey; // 收货状态 + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; // 发货状态 + @ApiModelProperty("发货状态value") + private String deliveryStateValue; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendDetailsVo.java new file mode 100644 index 0000000..600d4eb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendDetailsVo.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillextend; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendVo.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo
+ * Description: 采购单扩展 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单扩展 视图数据详情", description = "采购单扩展 视图数据详情") +public class PurchaseBillExtendDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("物流单号") + private String logisticsNum; // 物流单号 + @ApiModelProperty("生产进度") + private String productProgress; // 生产进度 + @ApiModelProperty("收货状态key") + private String receiveStateKey; // 收货状态 + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; // 发货状态 + @ApiModelProperty("发货状态value") + private String deliveryStateValue; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendDto.java new file mode 100644 index 0000000..db298f1 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendDto.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillextend; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendDto.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendDto
+ * Description: 采购单扩展 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单扩展 数据传输对象", description = "采购单扩展 数据传输对象") +public class PurchaseBillExtendDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("物流单号") + private String logisticsNum; // 物流单号 + @ApiModelProperty("生产进度") + private String productProgress; // 生产进度 + @ApiModelProperty("收货状态key") + private String receiveStateKey; // 收货状态 + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; // 发货状态 + @ApiModelProperty("发货状态value") + private String deliveryStateValue; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendMapper.java new file mode 100644 index 0000000..ac06673 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendMapper.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillextend; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendMapper.java
+ * Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendMapper
+ * Description: 采购单扩展.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchaseBillExtendMapper extends BaseMapper { + + @Delete("delete from purchase_bill_extend where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from purchase_bill_extend where billSid = #{billSid}") + PurchaseBillExtendDetailsVo selByMainSid(String billSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendMapper.xml new file mode 100644 index 0000000..3a78cb4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendQuery.java new file mode 100644 index 0000000..a86b60c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendQuery.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillextend; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendQuery.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendQuery
+ * Description: 采购单扩展 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单扩展 查询条件", description = "采购单扩展 查询条件") +public class PurchaseBillExtendQuery implements Query { + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("采购单sid") + private String purchaseBillSid; // 采购单sid + @ApiModelProperty("加价方式（统一加价率、区间加价率、仓库加价率）") + private String markupType; // 加价方式（统一加价率、区间加价率、仓库加价率） + @ApiModelProperty("进价不同时的价格策略（加权平均、分别计价）") + private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价） + @ApiModelProperty("临时加价率") + private Integer tempMarkupRate; // 临时加价率 + @ApiModelProperty("发货人姓名") + private String shipperName; // 发货人姓名 + @ApiModelProperty("发货人手机") + private String shipperMob; // 发货人手机 + @ApiModelProperty("发货省市区sid") + private String deliveryAreaSid; // 发货省市区sid + @ApiModelProperty("发货详细地址") + private String deliveryAddress; // 发货详细地址 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("到货日期") + private Date arrivalDateStart; // 到货日期 + private Date arrivalDateEnd; // 到货日期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTermStart; // 付款期限 + private Date paymentTermEnd; // 付款期限 + @ApiModelProperty("仓库sid") + private String wareHouseSid; // 仓库sid + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendService.java new file mode 100644 index 0000000..9fd4421 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendService.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillextend; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendService.java
+ * Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendService
+ * Description: 采购单扩展 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PurchaseBillExtendService extends MybatisBaseService { + + public void insertByDto(PurchaseBillExtendDto dto){ + PurchaseBillExtend entity = new PurchaseBillExtend(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public PurchaseBillExtendDetailsVo selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendVo.java new file mode 100644 index 0000000..3e7057a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendVo.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillextend; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendVo.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo
+ * Description: 采购单扩展 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单扩展 视图数据对象", description = "采购单扩展 视图数据对象") +public class PurchaseBillExtendVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("采购单sid") + private String purchaseBillSid; // 采购单sid + @ApiModelProperty("加价方式（统一加价率、区间加价率、仓库加价率）") + private String markupType; // 加价方式（统一加价率、区间加价率、仓库加价率） + @ApiModelProperty("进价不同时的价格策略（加权平均、分别计价）") + private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价） + @ApiModelProperty("临时加价率") + private Integer tempMarkupRate; // 临时加价率 + @ApiModelProperty("发货人姓名") + private String shipperName; // 发货人姓名 + @ApiModelProperty("发货人手机") + private String shipperMob; // 发货人手机 + @ApiModelProperty("发货省市区sid") + private String deliveryAreaSid; // 发货省市区sid + @ApiModelProperty("发货详细地址") + private String deliveryAddress; // 发货详细地址 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("到货日期") + private Date arrivalDateStart; // 到货日期 + private Date arrivalDateEnd; // 到货日期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTermStart; // 付款期限 + private Date paymentTermEnd; // 付款期限 + @ApiModelProperty("仓库sid") + private String wareHouseSid; // 仓库sid + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillMapper.java deleted file mode 100644 index c826795..0000000 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.oms.biz.func.purchasereceiptbill; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface PurchaseReceiptBillMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); -} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillMapper.xml deleted file mode 100644 index c8951f3..0000000 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillService.java index 238d0cf..c151ce6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillService.java @@ -14,6 +14,7 @@ import com.yxt.oms.utils.OrgPathQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -23,18 +24,19 @@ import java.util.List; * @date 2024/2/26 13:40 */ @Service -public class PurchaseReceiptBillService extends MybatisBaseService { +public class PurchaseReceiptBillService { @Autowired private FileUploadComponent fileUploadComponent; - @Autowired + @Resource PurchaseReceiptBillFeign purchaseReceiptBillFeign; - @Autowired + @Resource WarehouseAnsBillFeign warehouseAnsBillFeignl; public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); return purchaseReceiptBillFeign.listPage(pq); } + public ResultBean> listAll(OrgPathQuery query) { ResultBean rb = ResultBean.fireFail(); diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java new file mode 100644 index 0000000..f8edc46 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java @@ -0,0 +1,64 @@ +package com.yxt.oms.biz.func.sysmenu; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenu.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenu
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单表", description = "菜单表") +@TableName("sys_menu") +@Data +public class SysMenu extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源sid") + private String sourceSid; + + @ApiModelProperty("是否显示,默认为1显示，0为不显示") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("上级sid") + private String pSid; + + @ApiModelProperty("前端页面路径重定向") + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty("前端页面别名") + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java new file mode 100644 index 0000000..48104d3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java @@ -0,0 +1,72 @@ +package com.yxt.oms.biz.func.sysmenu; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuDto.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuDto
+ * Description: 菜单表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单表 数据传输对象", description = "菜单表 数据传输对象") +@Data +public class SysMenuDto implements Dto { + + + private static final long serialVersionUID = -8143707488992909267L; + @ApiModelProperty(value = "菜单名称", required = true) + @NotBlank(message = "菜单名称不能为空") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty(value = "资源sid", required = true) + @NotBlank(message = "资源不能为空") + private String sourceSid; + + @ApiModelProperty(value = "是否显示,默认为1显示，0为不显示", required = true) + @NotBlank(message = "是否显示不能为空") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty(value = "上级sid", example = "0", required = true) + @NotBlank(message = "上级菜单不能为空") + private String pSid; + + @ApiModelProperty(value = "前端页面路径重定向", required = false) + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty(value = "前端页面别名", required = false) + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; + + @ApiModelProperty(value = "备注") + private String remarks; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuFunctionQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuFunctionQuery.java new file mode 100644 index 0000000..57beae1 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuFunctionQuery.java @@ -0,0 +1,30 @@ +package com.yxt.oms.biz.func.sysmenu; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuQuery
+ * Description: 菜单表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单表 查询条件 功能菜单设置查询用", description = "菜单表 查询条件 功能菜单设置查询用") +@Data +public class SysMenuFunctionQuery implements Query { + + + @ApiModelProperty("资源sid") + private String sourceSid; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java new file mode 100644 index 0000000..c29076e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java @@ -0,0 +1,82 @@ +package com.yxt.oms.biz.func.sysmenu; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysmenu.SysMenuMapper
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysMenuMapper extends BaseMapper { + + //@Update("update sys_menu set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_menu") + List selectListVo(); + + List listAllParentByRoleSid(String roleSid, String sid, @Param("sourceSid") String sourceSid); + + @Select("SELECT menu.*,sourceMenu.`sourceSid` FROM sys_menu menu " + + "LEFT JOIN sys_source_menu sourceMenu ON menu.sid=sourceMenu.menuSid where menu.sid=#{sid}") + SysMenu fetchBySid(@Param("sid") String sid); + + List getChildrensForMenuTree(@Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 将该资源下的所有菜单设置是否可用 + * + * @param sid 资源sid + * @param isEnable 是否可用：1可用，0不可用 + * @return + */ + int updateBySourceSid(@Param("sid") String sid, @Param("isEnable") Integer isEnable); + + /** + * 根据上级sid查询菜单的子集菜单 + * + * @param sid 菜单sid + * @return + */ + List selectChildernList(String sid); + + /** + * 查询该资源下是否有可用的菜单 + * + * @param isEnable + * @return + */ + int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid); + + List selectByMenuUrl(String menuUrl); + + /** + * 查询该资源下一级菜单列表 + * + * @param sourceSid 资源sid + * @return + */ + List fetchRootMenuBySourceSid(@Param("sourceSid") String sourceSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.xml new file mode 100644 index 0000000..d2de1b0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + update sys_menu + set isEnable = #{isEnable} + where sourceSid = #{sid} + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuQuery.java new file mode 100644 index 0000000..d3a21e1 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuQuery.java @@ -0,0 +1,68 @@ +package com.yxt.oms.biz.func.sysmenu; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuQuery
+ * Description: 菜单表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单表 查询条件", description = "菜单表 查询条件") +@Data +public class SysMenuQuery implements Query { + + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("是否显示,默认为1显示，0为不显示") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("上级sid") + private String pSid; + + @ApiModelProperty("前端页面路径重定向") + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty("前端页面别名") + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; + private String orgSid;//部门 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java new file mode 100644 index 0000000..5f2a184 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java @@ -0,0 +1,407 @@ +package com.yxt.oms.biz.func.sysmenu; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo; +import com.yxt.wms.feign.portal.sysmenu.SysMenuFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuService.java
+ * Class: com.yxt.user.biz.sysmenu.SysMenuService
+ * Description: 菜单表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysMenuService extends MybatisBaseService { + @Autowired + SysMenuFeign sysMenuFeign; + + + + public PagerVo listPage(PagerQuery pq) { + SysMenuQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + @Override + public SysMenu fetchBySid(String sid) { + return baseMapper.fetchBySid(sid); + } + + public List listAll(SysMenuQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysMenuQuery query) { + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("name", query.getName()); + } + if (StringUtils.isNotBlank(query.getMenuUrl())) { + qw.eq("menuUrl", query.getMenuUrl()); + } + if (StringUtils.isNotBlank(query.getPageUrl())) { + qw.eq("pageUrl", query.getPageUrl()); + } + if (StringUtils.isNotBlank(query.getIconUrl())) { + qw.eq("iconUrl", query.getIconUrl()); + } + if (query.getSourceSid() != null) { + qw.eq("sourceSid", query.getSourceSid()); + } + if (StringUtils.isNotBlank(query.getIsShow())) { + qw.eq("isShow", query.getIsShow()); + } + + if (query.getSortNo() != null) { + qw.eq("sortNo", query.getSortNo()); + } + + if (StringUtils.isNotBlank(query.getPSid())) { + qw.eq("pSid", query.getPSid()); + } + + if (query.getPageUrlRedirect() != null) { + qw.eq("pageUrlRedirect", query.getPageUrlRedirect()); + } + + if (StringUtils.isNotBlank(query.getPageName())) { + qw.eq("pageName", query.getPageName()); + } + + if (StringUtils.isNotBlank(query.getPageAliasName())) { + qw.eq("pageAliasName", query.getPageAliasName()); + } + + if (StringUtils.isNotBlank(query.getMenuType())) { + qw.eq("menuType", query.getMenuType()); + } + return qw; + } + + public ResultBean> listPageVo(PagerQuery pq) { + return sysMenuFeign.listPage(pq); + } + + /* public List listAllVo(SysMenuQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("menu.pSid", "0"); + List sysMenuVos = baseMapper.selectListAllVo(qw); + for(SysMenuVo s:sysMenuVos){ + getChildrens(s); + } + return sysMenuVos; + }*/ + public ResultBean> listAllVoForSource(SysMenuQuery query) { + + return sysMenuFeign.listAllVoForSource(query); + } + public ResultBean>> getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) { + return sysMenuFeign.getMenusForFunction(sysMenuFunctionQuery); + } + public ResultBean>> sourceMenuTreeByUserSid(SysMenuQuery query) { + return sysMenuFeign.sourceMenuTreeByUserSid(query); + } + + public ResultBean>> sourcemenutree(SysMenuQuery query) { + return sysMenuFeign.sourcemenutree(query); + } + + public void getChildList(List list) { + list.forEach(str -> { + String sid = str.getSid(); + List listChildren = baseMapper.selectChildernList(sid); + str.setChildren(listChildren); + getChildList(listChildren); + }); + } + + /*暂时废弃*/ + /*private List getChildrensForMenuTree(List sysMenuVoList) { + List list = new ArrayList<>(); + for (SysMenuTreeVo s : sysMenuVoList) { + SysMenu sysMenu = sysMenuService.fetchBySid(s.getMenuRootSid()); + SysMenuTreeVo sysMenuTreeVo = new SysMenuTreeVo(); + BeanUtil.copyProperties(sysMenu, sysMenuTreeVo); + list.add(sysMenuTreeVo); + } + for (SysMenuTreeVo s : list) { + getChildrensForMenuTree(s, s.getSid()); + } + return list; + } + private void getChildrensForMenuTree(SysMenuTreeVo s,String sid){ + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(sid)) { + qw.eq("menu.pSid", sid); + } + List sysMenuVos = baseMapper.getChildrensForMenuTree(qw); + if(!sysMenuVos.isEmpty()){ + for(SysMenuTreeVo smv:sysMenuVos){ + getChildrensForMenuTree(smv,smv.getSid()); + } + } + s.setChildren(sysMenuVos); + } + private void getChildrens(SysMenuVo s){ + String sid = s.getSid(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(sid)) { + qw.eq("menu.pSid", sid); + } + List sysMenuVos = baseMapper.selectListAllVo(qw); + if(!sysMenuVos.isEmpty()){ + for(SysMenuVo smv:sysMenuVos){ + getChildrens(smv); + } + } + s.setChildren(sysMenuVos); + }*/ + public ResultBean> listVo() { + return sysMenuFeign.list(); + } + + /* public void saveOrUpdateDto(SysMenuDto dto) { + SysMenu entity = new SysMenu(); + dto.fillEntity(entity); + SysSourceMenu sysSourceMenu = new SysSourceMenu(); + sysSourceMenu.setMenuSid(entity.getSid()); + sysSourceMenu.setSourceSid(dto.getSourceSid()); + setRootSid(entity, sysSourceMenu); + sysSourceMenuService.save(sysSourceMenu); + this.saveOrUpdate(entity); + }*/ + +// private void setRootSid(SysMenu entity, SysSourceMenu sysSourceMenu) { +// String pSid = entity.getPSid(); +// if ("0".equals(pSid)) { +// sysSourceMenu.setMenuRootSid(entity.getSid()); +// } else { +// SysMenu sysMenu = sysMenuService.fetchBySid(pSid); +// String pSid1 = sysMenu.getPSid(); +// if ("0".equals(pSid1)) { +// sysSourceMenu.setMenuRootSid(sysMenu.getSid()); +// } +// setRootSid(sysMenu, sysSourceMenu); +// } +// } + + public SysMenuVo fetchByIdVo(String id) { + SysMenu entity = this.fetchById(id); + SysMenuVo vo = new SysMenuVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean> listAllByRoleSid(SysMenuQuery query) { + + return sysMenuFeign.listAllByRoleSid(query); + } + + private void getChildrensByRoleSid(SysMenuVo s, String roleSid, String sourceSid) { + String sid = s.getSid(); + List sysMenuVos = baseMapper.listAllParentByRoleSid(roleSid, sid, sourceSid); + if (!sysMenuVos.isEmpty()) { + for (SysMenuVo smv : sysMenuVos) { + getChildrensByRoleSid(smv, roleSid, sourceSid); + } + } + s.setChildren(sysMenuVos); + } + + /*public List listAllVoBySourceSId(SysMenuQuery query) { + SysSource sysSource = sysSourceService.fetchBySid(query.getSourceSid()); + List sysSourceVos = new ArrayList<>();//sysSourceService.listAllVoBySourceSId(query.getSourceSid()); + SysMenuTreeVo smtv=new SysMenuTreeVo(); + smtv.setName(sysSource.getSourceName()); + smtv.setSid(sysSource.getSid()); + smtv.setSourceSid(sysSource.getSid()); + sysSourceVos.add(smtv); + for(SysMenuTreeVo s:sysSourceVos){ + List sysMenuVoList=sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid()); + if(!sysMenuVoList.isEmpty()){ + sysMenuVoList = getChildrensForMenuTree(sysMenuVoList); + } + s.setChildren(sysMenuVoList); + } + return sysSourceVos; + }*/ + + /** + * 资源菜单树形列表 + * + * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单） + */ + public List> getSourceMenuTree(List list_menu, Map map_selectMenus) { + + //获取当前资源的菜单列表 + List> list_menus_map = new ArrayList>(); + + + //获取资源第一级菜单列表 + List list_firstLevel_menu = list_menu.stream().filter(s -> s.getPSid().equals("0")).collect(Collectors.toList()); + + //遍历资源的第一级菜单 + for (int i = 0; i < list_firstLevel_menu.size(); i++) { + Map map_firstLevel_menu = getMenuTreeFromStream(list_firstLevel_menu.get(i).getSid(), list_menu, map_selectMenus); + //把该菜单挂在当前菜单列表中 + if (null != map_firstLevel_menu) + list_menus_map.add(map_firstLevel_menu); + } + return list_menus_map; + + } + + /** + * 递归把list转换成菜单树形列表 + * + * @param psid + * @param list_menu + * @return + */ + private Map getMenuTreeFromStream(String psid, List list_menu, Map map_selectMenus) { + //获取当前菜单 + List list_current_menu = list_menu.stream().filter(s -> s.getSid().equals(psid)).collect(Collectors.toList()); + if (null == list_current_menu || 0 == list_current_menu.size()) + return null; + + Map map_menu = getMenuMap(list_current_menu.get(0), map_selectMenus); + + //2.获取菜单的子菜单列表 + //存储最终子菜单列表结果 + List> list_child = new ArrayList>(); + + //获取子菜单列表 + List list_child_menu = list_menu.stream().filter(s -> s.getPSid().equals(psid)).collect(Collectors.toList()); + for (int i = 0; i < list_child_menu.size(); i++) { + //获取该菜单子菜单列表 + Map map_child_menu = getMenuTreeFromStream(list_child_menu.get(i).getSid(), list_menu, map_selectMenus); + //把该菜单挂在当前菜单列表中 + if (null != map_child_menu) + list_child.add(map_child_menu); + } + //把该菜单列表放到父菜单的childMenus中 + map_menu.put("children", list_child); + + return map_menu; + + } + + /** + * 构造菜单的结果map + * + * @return + */ + private Map getMenuMap(SysMenuRoleVo menuVo, Map map_selectMenus) { + Map map_menu = new HashMap(); + + if (null != map_selectMenus) { + //角色授权时，菜单列表 + map_menu.put("sid", menuVo.getSid()); + map_menu.put("menuName", menuVo.getMenuName() + (StringUtils.isNotBlank(menuVo.getRemarks()) ? "(" + menuVo.getRemarks() + ")" : "")); + map_menu.put("menuUrl", menuVo.getMenuUrl()); + map_menu.put("pageUrl", menuVo.getPageUrl()); + map_menu.put("iconUrl", menuVo.getIconUrl()); + map_menu.put("isShow", menuVo.getIsShow()); + if (menuVo.getAlwaysShow() == 0) { + map_menu.put("alwaysShow", false); + } else if (menuVo.getAlwaysShow() == 1) { + map_menu.put("alwaysShow", true); + } + + //如果角色已有的菜单，则设置选中，并移除map中的项；否则设置不选中 + if (map_selectMenus.containsKey(menuVo.getSid())) { + map_menu.put("isCheck", 1); + map_selectMenus.remove(menuVo.getSid()); + } else { + map_menu.put("isCheck", 0); + } + } else { + //左侧菜单列表 + Map map_meta = new HashMap(); + map_meta.put("title", menuVo.getMenuName()); + map_meta.put("icon", menuVo.getIconUrl()); + map_menu.put("meta", map_meta); + + map_menu.put("redirect", menuVo.getPageUrlRedirect()); + //路径 + map_menu.put("path", menuVo.getPageUrl() != null && !menuVo.getPageUrl().equals("") ? menuVo.getPageUrl() : "/" + menuVo.getPageName()); + map_menu.put("name", menuVo.getPageAliasName() != null && !menuVo.getPageAliasName().equals("") ? menuVo.getPageAliasName() : menuVo.getPageUrl()); + //组件名 + map_menu.put("component", menuVo.getPageName()); + if (menuVo.getAlwaysShow() == 0) { + map_menu.put("alwaysShow", false); + } else if (menuVo.getAlwaysShow() == 1) { + map_menu.put("alwaysShow", true); + } + } + return map_menu; + } + + /** + * 将该资源下的所有菜单设置为是否可用 + * + * @param sid 资源sid + * @param isEnable 是否可用：1可用，0不可用 + * @return + */ + public int updateBySourceSid(String sid, Integer isEnable) { + return baseMapper.updateBySourceSid(sid, isEnable); + } + + public ResultBean saveMenu(SysMenuDto dto) { + return sysMenuFeign.save(dto); + } + public ResultBean updateBySid( SysMenuDto dto, String sid) { + return sysMenuFeign.update(dto,sid); + } + public ResultBean updateIsEnable( String sid, Integer isEnable) { + return sysMenuFeign.updateIsEnable(sid,isEnable); + } + public ResultBean delBySids( String sid) { + return sysMenuFeign.delBySids(sid); + } + + public List selectByMenuUrl(String menuUrl) { + return baseMapper.selectByMenuUrl(menuUrl); + } + + /** + * 根据资源sid查询该资源下的一级菜单列表（yxt_mtl 2024-01-31） + * + * @param sid 资源sid + * @return + */ + public List fetchRootMenuBySourceSid(String sid) { + return baseMapper.fetchRootMenuBySourceSid(sid); + } + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java new file mode 100644 index 0000000..af4737e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java @@ -0,0 +1,59 @@ +package com.yxt.oms.biz.func.sysmenu; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo
+ * Description: 菜单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象") +@Data +public class SysMenuTreeVo implements Vo { + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("排序号") + private Integer sortNo; + @ApiModelProperty("上级sid") + private String pSid; + @ApiModelProperty("上级菜单名称") + private String pName; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("资源名称") + private String sourceName; + @ApiModelProperty("菜单根路径sid") + private String menuRootSid; + @ApiModelProperty("pageUrl") + private String pageUrl; + @ApiModelProperty("menuUrl") + private String menuUrl; + @ApiModelProperty("menuUrl") + private String pageName; + @ApiModelProperty("iconUrl") + private String iconUrl; + @ApiModelProperty("菜单列表用，是否是资源层级1是，0不是") + private String isSource = "0"; + @ApiModelProperty("是否可用") + private String isEnable; + @ApiModelProperty(value = "备注") + private String remarks; + @ApiModelProperty("子菜单") + private List children; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java new file mode 100644 index 0000000..9207374 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java @@ -0,0 +1,74 @@ +package com.yxt.oms.biz.func.sysmenu; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo
+ * Description: 菜单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象") +@Data +public class SysMenuVo implements Vo { + + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源sid") + private String sourceSid; + + @ApiModelProperty("是否显示,默认为1显示，0为不显示") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("上级sid") + private String pSid; + @ApiModelProperty("上级名称") + private String pName; + @ApiModelProperty("sid") + private String sid; + + @ApiModelProperty("前端页面路径重定向") + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty("前端页面别名") + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; + @ApiModelProperty("子菜单") + private List children; + @ApiModelProperty("是否选中，1：未选中,0：选中") + private String checked; + @ApiModelProperty("资源名称") + private String sourceName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/MenuRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/MenuRoleVo.java new file mode 100644 index 0000000..5130cf2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/MenuRoleVo.java @@ -0,0 +1,19 @@ +package com.yxt.oms.biz.func.sysmenurole; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 菜单和角色临时存储 + * @author: dimengzhe + * @date: 2023/6/1 + **/ +@Data +public class MenuRoleVo { + + + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; + @ApiModelProperty("菜单sid") + private String menuSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRole.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRole.java new file mode 100644 index 0000000..ca7f0ff --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRole.java @@ -0,0 +1,37 @@ +package com.yxt.oms.biz.func.sysmenurole; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRole.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRole
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表", description = "菜单与角色关联表") +@TableName("sys_menu_role") +@Data +public class SysMenuRole extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataDto.java new file mode 100644 index 0000000..844c0ad --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataDto.java @@ -0,0 +1,30 @@ +package com.yxt.oms.biz.func.sysmenurole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto
+ * Description: 菜单与角色关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象") +@Data +public class SysMenuRoleDataDto implements Dto { + + @ApiModelProperty("菜单与角色关联表sid") + private String sid; + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataQuery.java new file mode 100644 index 0000000..030d809 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataQuery.java @@ -0,0 +1,30 @@ +package com.yxt.oms.biz.func.sysmenurole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery
+ * Description: 菜单与角色关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件") +@Data +public class SysMenuRoleDataQuery implements Query { + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("菜单名称") + private String menuName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataVo.java new file mode 100644 index 0000000..a1651bd --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataVo.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.sysmenurole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo
+ * Description: 菜单与角色关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象") +@Data +public class SysMenuRoleDataVo implements Vo { + + @ApiModelProperty("菜单与角色关联表sid") + private String sid; + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDto.java new file mode 100644 index 0000000..7cc7354 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDto.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.sysmenurole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto
+ * Description: 菜单与角色关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象") +@Data +public class SysMenuRoleDto implements Dto { + + + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("角色sid") + private String roleSid; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java new file mode 100644 index 0000000..3754ea1 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java @@ -0,0 +1,56 @@ +package com.yxt.oms.biz.func.sysmenurole; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleMapper
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysMenuRoleMapper extends BaseMapper { + + //@Update("update sys_menu_role set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_menu_role") + List selectListVo(); + + @Delete("delete from sys_menu_role where roleSid=#{roleSid}") + void delByRoleSid(@Param("roleSid") String roleSid); + + List list(@Param(Constants.WRAPPER) QueryWrapper qw); + + List selectByRoleSid(String roleSid); + + List selMenuByRole(@Param(Constants.WRAPPER) QueryWrapper qw); + + List selMenuByRoleApp(@Param(Constants.WRAPPER) QueryWrapper qw); + + @Update("update sys_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}") + void updateDataByRoleMenu(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId); + + @Update("update sys_mobile_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}") + void updateDataByRoleMenuApp(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId); + + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.xml new file mode 100644 index 0000000..824f26c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleQuery.java new file mode 100644 index 0000000..7c437b3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleQuery.java @@ -0,0 +1,40 @@ +package com.yxt.oms.biz.func.sysmenurole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery
+ * Description: 菜单与角色关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件") +@Data +public class SysMenuRoleQuery implements Query { + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("多个角色sid计集合") + private List roleSids; + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("是否是系统管理员") + private String isAdmin; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java new file mode 100644 index 0000000..e361db2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java @@ -0,0 +1,210 @@ +package com.yxt.oms.biz.func.sysmenurole; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysmenu.SysMenuService; +import com.yxt.wms.feign.portal.sysmenurole.SysMenuRoleFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleService.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleService
+ * Description: 菜单与角色关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysMenuRoleService extends MybatisBaseService { + + @Autowired + SysMenuRoleFeign sysMenuRoleFeign; + @Autowired + SysMenuService sysMenuService; + + public PagerVo listPage(PagerQuery pq) { + SysMenuRoleQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(SysMenuRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysMenuRoleQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getMenuSid())) { + qw.eq("menuSid", query.getMenuSid()); + } + + if (StringUtils.isNotBlank(query.getRoleSid())) { + qw.eq("roleSid", query.getRoleSid()); + } + return qw; + } + + public ResultBean> listPageVo(PagerQuery pq) { + return sysMenuRoleFeign.listPage(pq); + } + + public ResultBean> listAllVo(SysMenuRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return sysMenuRoleFeign.listAll(query); + } + + public ResultBean> listVo() { + return sysMenuRoleFeign.list(); + } + + public ResultBean saveOrUpdateDto(SysMenuRoleDto dto) { + return sysMenuRoleFeign.save(dto); + } + public ResultBean updateBySid(SysMenuRoleDto dto,String sid) { + return sysMenuRoleFeign.update(dto,sid); + } + public ResultBean updateRoleAndMenu(SysMenuRoleDto dto) { + return sysMenuRoleFeign.updateRoleAndMenu(dto); + } + public ResultBean del(String sid) { + return sysMenuRoleFeign.del(sid); + } + + public ResultBean fetchByIdVo(String id) { + return sysMenuRoleFeign.fetch(id); + } + + public void delByRoleSid(String roleSid) { + baseMapper.delByRoleSid(roleSid); + } + + // 不分页列表 + public List list(SysMenuRoleQuery query) { + // mybits所用的查询条件封装类 + QueryWrapper qw = buildQueryWrapper(query); + return baseMapper.list(qw); + } + + /** + * 解析和组装查询条件，封装在qw中 + * + * @param query + * @return + */ + private QueryWrapper buildQueryWrapper(SysMenuRoleQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getSourceSid())) { + qw.eq("m.sourceSid", query.getSourceSid()); + } + /*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) { + qw.in("rm.roleSid", query.getRoleSid()); + }*/ + if (StringUtils.isNotBlank(query.getIsAdmin())) { + if (!query.getIsAdmin().equals("1")){ + qw.eq("m.isEnable", 1); + } + } + + if (query.getRoleSids() != null && query.getRoleSids().size() > 0) { + qw.in("rm.roleSid", query.getRoleSids()); + } + qw.eq("m.isShow", 1); + qw.orderByAsc("m.sortNo"); + } + + return qw; + + } + + /** + * 资源菜单树形列表 + * + * @param query:roleSids,sourceSid + * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单） + */ + public List> getSourceMenuTreeOfRoles(SysMenuRoleQuery query, Map map_rolemenus) { + + //获取当前资源的菜单列表 + List> list_menus_map = new ArrayList>(); + if (null == query) + return list_menus_map; + + //角色s的某个资源的所有菜单列表 + List list_menu = list(query); + list_menus_map = sysMenuService.getSourceMenuTree(list_menu, map_rolemenus); + + return list_menus_map; + + } + + public List selectByRoleSid(String roleSid) { + return baseMapper.selectByRoleSid(roleSid); + } + + public ResultBean> selMenuByRole(SysMenuRoleDataQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("smr.roleSid",query.getRoleSid()); + if (StringUtils.isNotBlank(query.getMenuName())){ + qw.like("sm.name",query.getMenuName()); + } + List sysMenuRoleDataVos = baseMapper.selMenuByRole(qw); + return rb.success().setData(sysMenuRoleDataVos); + } + + public ResultBean> selMenuByRoleApp(SysMenuRoleDataQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("smmr.roleSid",query.getRoleSid()); + if (StringUtils.isNotBlank(query.getMenuName())){ + qw.like("smm.name",query.getMenuName()); + } + List sysMenuRoleDataVos = baseMapper.selMenuByRoleApp(qw); + return rb.success().setData(sysMenuRoleDataVos); + } + + public ResultBean updateDataByRoleMenu(List dtos) { + ResultBean rb = ResultBean.fireFail(); + for (SysMenuRoleDataDto dto : dtos) { + if (StringUtils.isNotBlank(dto.getDataRuleId())){ + baseMapper.updateDataByRoleMenu(dto.getSid(),dto.getDataRuleId()); + } + } + return rb.success(); + } + + public ResultBean updateDataByRoleMenuApp(List dtos) { + ResultBean rb = ResultBean.fireFail(); + for (SysMenuRoleDataDto dto : dtos) { + if (StringUtils.isNotBlank(dto.getDataRuleId())){ + baseMapper.updateDataByRoleMenuApp(dto.getSid(),dto.getDataRuleId()); + } + } + return rb.success(); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleVo.java new file mode 100644 index 0000000..4196178 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleVo.java @@ -0,0 +1,56 @@ +package com.yxt.oms.biz.func.sysmenurole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo
+ * Description: 菜单与角色关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象") +@Data +public class SysMenuRoleVo implements Vo { + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("菜单父级sid") + private String pSid; + @ApiModelProperty("menusid") + private String sid; + @ApiModelProperty("menuUrl") + private String menuUrl; + @ApiModelProperty("menuName") + private String menuName; + @ApiModelProperty("pageUrl") + private String pageUrl; + @ApiModelProperty("iconUrl") + private String iconUrl; + @ApiModelProperty("isShow") + private String isShow; + @ApiModelProperty("alwaysShow") + private Integer alwaysShow; + @ApiModelProperty("pageUrlRedirect") + private String pageUrlRedirect; + @ApiModelProperty("pageAliasName") + private String pageAliasName; + @ApiModelProperty("pageName") + private String pageName; + @ApiModelProperty("remarks") + private String remarks; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/AppContactSysOrganizationVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/AppContactSysOrganizationVo.java new file mode 100644 index 0000000..e319312 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/AppContactSysOrganizationVo.java @@ -0,0 +1,40 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/24 + */ +@ApiModel(value = "App通讯录组织架构") +@Data +public class AppContactSysOrganizationVo implements Vo { + + @ApiModelProperty("部门/组织sid") + private String sid; + + @ApiModelProperty("部门/组织名称|员工姓名") + private String name; + + @ApiModelProperty("员工数量") + private int staffNum; + + @ApiModelProperty("跳转类型：1、部门2、员工列表") + private Integer type; + + @ApiModelProperty("员工电话") + private String mobile; + + @ApiModelProperty("员工头像") + private String headImage; + + @ApiModelProperty("员工所在部门名称（路径）") + private String orgNamePath; + + @ApiModelProperty("员工职位") + private String position; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/QrCodeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/QrCodeVo.java new file mode 100644 index 0000000..f5138aa --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/QrCodeVo.java @@ -0,0 +1,23 @@ +package com.yxt.oms.biz.func.sysorganization; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2020/11/3 16:19 + * @description + */ +@Data +public class QrCodeVo { + @ApiModelProperty("部门名称") + private String departmentName; + @ApiModelProperty("单位名称") + private String organizationName; + @ApiModelProperty("部门地址") + private String address; + @ApiModelProperty("二维码图片地址") + private String qrFilePath; + @ApiModelProperty(value = "部门sid") + private String sid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgListVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgListVo.java new file mode 100644 index 0000000..8c746c0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgListVo.java @@ -0,0 +1,29 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/2/14 11:45 + * @Description 员工所在部门下拉列表 + */ +@Data +public class SysOrgListVo implements Vo { + private static final long serialVersionUID = -3558876605554852892L; + + @ApiModelProperty(value = "组织名称") + private String name; + @ApiModelProperty(value = "部门编码") + private String orgCode; + @ApiModelProperty(value = "sid") + private String sid; + @ApiModelProperty(value = "上级sid") + private String psid; + @ApiModelProperty(value = "orgSidPath") + private String orgSidPath; + private List children; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgStaffVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgStaffVo.java new file mode 100644 index 0000000..20156e5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgStaffVo.java @@ -0,0 +1,17 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/26 11:48 + * @Description + */ +@Data +public class SysOrgStaffVo implements Vo { + private static final long serialVersionUID = -4311553944345419092L; + + private String staffName; + private String staffSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgVo.java new file mode 100644 index 0000000..855eae2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgVo.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/10/12 20:55 + * @description + */ +@Data +public class SysOrgVo implements Vo { + private static final long serialVersionUID = 2983637708030419942L; + @ApiModelProperty(value = "组织名称") + private String name; + @ApiModelProperty(value = "sid") + private String sid; + @ApiModelProperty(value = "psid") + private String psid; + @ApiModelProperty(value = "id") + private String id; + @ApiModelProperty(value = "orgSidPath") + private String orgSidPath; + @ApiModelProperty(value = "部门编码") + private String orgCode; + + private List children; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganization.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganization.java new file mode 100644 index 0000000..601a77d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganization.java @@ -0,0 +1,87 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganization.java
+ * Class: SysOrganization
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "组织机构表", description = "组织机构表") +@TableName("sys_organization") +@Data +public class SysOrganization extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + +// @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") +// private String orgShortName; + + @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)") + private String regionDivision; + + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + + @ApiModelProperty("组织简称") + private String orgAbbre; + + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + + @ApiModelProperty("管理层级key") + private String orgLevelKey; + + @ApiModelProperty("管理层级value") + private String orgLevelValue; + + @ApiModelProperty("其他编码") + private String otherCode; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationDto.java new file mode 100644 index 0000000..eb7dd5f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationDto.java @@ -0,0 +1,91 @@ +package com.yxt.oms.biz.func.sysorganization; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationDto.java
+ * Class: SysOrganizationDto
+ * Description: 组织机构表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "组织机构表 数据传输对象", description = "组织机构表 数据传输对象") +@Data +public class SysOrganizationDto implements Dto { + + + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + + @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") + private String orgShortName; + + @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)") + private String regionDivision; + + @ApiModelProperty("主管人员sid") + private String zgStaffSid; + + @ApiModelProperty("分管人员sid") + private String fgStaffSid; + + @ApiModelProperty("组织简称") + private String orgAbbre; + + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + + @ApiModelProperty("管理层级key") + private String orgLevelKey; + + @ApiModelProperty("管理层级value") + private String orgLevelValue; + + @ApiModelProperty("其他编码") + private String otherCode; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListQuery.java new file mode 100644 index 0000000..eaeecfe --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListQuery.java @@ -0,0 +1,16 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/26 11:49 + * @Description + */ +@Data +public class SysOrganizationListQuery implements Query { + private static final long serialVersionUID = 8657016527420117948L; + + private String userSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListVo.java new file mode 100644 index 0000000..7fa7d84 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListVo.java @@ -0,0 +1,23 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/26 11:42 + * @Description + */ +@Data +public class SysOrganizationListVo implements Vo { + private static final long serialVersionUID = -3709239161608411765L; + + private String orgDeptSid; + private String orgDeptName; + + private List staffinfoVoList; + + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListsVo.java new file mode 100644 index 0000000..4bcbbf0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListsVo.java @@ -0,0 +1,17 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/30 11:28 + * @Description + */ +@Data +public class SysOrganizationListsVo implements Vo { + private static final long serialVersionUID = -7021974833444298712L; + + private String orgDeptSid; + private String orgDeptName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java new file mode 100644 index 0000000..541e7b3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java @@ -0,0 +1,121 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationMapper.java
+ * Class: SysOrganizationMapper
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysOrganizationMapper extends BaseMapper { + + //@Update("update sys_organization set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + List selectFirstOrgList(); + + List selectChildrenListByPsid(@Param("psid") String psid); + + @Select("SELECT * FROM sys_organization") + List selectListVo(); + + @Select("SELECT name FROM sys_organization WHERE sid=#{sid}") + String selectOrgnameBySid(@Param("sid") String sid); + + String selectOrgSidPath(@Param("sid") String sid); + + List selectAppOrganization(); + + List selectAppOrganizationByPsid(@Param("psid") String psid); + + List treeList(String psid); + + SysOrganization selectOrgCode(); + + List getListOrg(); + + SysOrganization selectOrgCodeByPsid(); + + /** + * 根据上级sid查询组织的部门 + * + * @param psid 上级sid + * @return + */ + List selectTreeList(String psid); + + /** + * 根据部门编码查询部门信息 + * + * @param substring 部门编码 + * @return + */ + SysOrganization selectByOrgCode(String substring); + + List selectChildernList(String sid); + +// /** +// * 根据业务员sid获取到分公司 +// * +// * @param staffSid 业务员sid +// * @return +// */ +// SysStaffOrgVo getUseOrgByUserSid(@Param("staffSid") String staffSid); + + /** + * 根据sid判断是否是分公司并获取公司名称 + * + * @param sid + * @return + */ + SysOrganizationVo getUseOrgBySid(@Param("sid")String sid); + + int updateQrCodePath(@Param("sid") String sid, @Param("path") String path); + + QrCodeVo getQrCodeVo(@Param("sid") String sid); + + @Select("select * from sys_organization WHERE staffSid=#{sid}") + SysOrganizationVo getUseOrgByStaffSid(String sid); + + List> selectUseOrgSidBySid(String psid); + + SysOrgVo getListOrgByBrand(String sid); + + List selectOrgList(String orgSid); + List selectOrgLists(String orgSid); + + List selectByOrgDeptSid(String orgDeptSid); + + SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name); + + List selectOrgSidList(); + + @Select("select * from sys_organization where orgSidPath = #{orgSidPath}") + SysOrganizationVo selectByOrgSidPath(String orgSidPath); + + List getListDeptByOrgSid(String orgSid); + + List selectOrgByPSid(String psid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.xml new file mode 100644 index 0000000..0c98edb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.xml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE sys_organization + SET qrText = #{path} + WHERE sid = #{sid} + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationQuery.java new file mode 100644 index 0000000..9d95ffc --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationQuery.java @@ -0,0 +1,58 @@ +package com.yxt.oms.biz.func.sysorganization; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationQuery.java
+ * Class: SysOrganizationQuery
+ * Description: 组织机构表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "组织机构表 查询条件", description = "组织机构表 查询条件") +@Data +public class SysOrganizationQuery implements Query { + + + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java new file mode 100644 index 0000000..f80e11c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java @@ -0,0 +1,238 @@ +package com.yxt.oms.biz.func.sysorganization; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.RedisUtil; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Service +public class SysOrganizationService extends MybatisBaseService { + + @Autowired + private FileUploadComponent fileUploadComponent; + @Resource + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private RedisUtil redisUtil; + + public ResultBean saveOrg(SysOrganizationDto dto){ + return sysOrganizationFeign.saveOrg(dto); + } + + public PagerVo listPage(PagerQuery pq) { + SysOrganizationQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(SysOrganizationQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysOrganizationQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("name", query.getName()); + } + + if (StringUtils.isNotBlank(query.getPsid())) { + qw.eq("psid", query.getPsid()); + } + + if (StringUtils.isNotBlank(query.getLinkPhone())) { + qw.eq("linkPhone", query.getLinkPhone()); + } + + if (StringUtils.isNotBlank(query.getOrgSidPath())) { + qw.eq("orgSidPath", query.getOrgSidPath()); + } + + if (query.getSort() != null) { + qw.eq("sort", query.getSort()); + } + + if (StringUtils.isNotBlank(query.getAddrs())) { + qw.eq("addrs", query.getAddrs()); + } + + if (StringUtils.isNotBlank(query.getJwd())) { + qw.eq("jwd", query.getJwd()); + } + + if (StringUtils.isNotBlank(query.getQrText())) { + qw.eq("qrText", query.getQrText()); + } + + if (query.getLimitOrgMember() != null) { + qw.eq("limitOrgMember", query.getLimitOrgMember()); + } + + if (StringUtils.isNotBlank(query.getOrgCode())) { + qw.eq("orgCode", query.getOrgCode()); + } + return qw; + } + + public ResultBean> listPageVo(PagerQuery pq) { + return sysOrganizationFeign.listPage(pq); + } + + public ResultBean> listAllVo(SysOrganizationQuery query) { + + return sysOrganizationFeign.listAll(query); + } + + public ResultBean> listVo() { + return sysOrganizationFeign.list(); + } + + + public ResultBean> selectFirstOrgList() { + return sysOrganizationFeign.selectFirstOrgList(); + } + + public ResultBean> selectChildrenListBySid(String sid) { + return sysOrganizationFeign.selectChildrenListBySid(sid); + } + public ResultBean updateBySid(SysOrganizationDto dto, String sid) { + return sysOrganizationFeign.update(dto, sid); + } + public ResultBean del(String sid) { + return sysOrganizationFeign.del(sid); + } + public ResultBean deIds(String sid) { + return sysOrganizationFeign.delBySid(sid); + } + + + public ResultBean saveOrUpdateDto(SysOrganizationDto dto) { + return sysOrganizationFeign.save(dto); + } + + public ResultBean fetchByIdVo(String id) { + return sysOrganizationFeign.fetch(id); + } + public ResultBean fetchBySidVo(String id) { + return sysOrganizationFeign.fetchBySid(id); + } + + + + public ResultBean> selectAppOrganization(String sid) { + return sysOrganizationFeign.selectAppOrganization(sid); + } + + + + + + /** + * @param + * @description: 获取组织架构即使用组织下拉框 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/12 21:47 + */ + public ResultBean> treeList() { + return sysOrganizationFeign.selectListOrg(); + } + + + + public ResultBean> getListOrg() { + return sysOrganizationFeign.getListOrg(); + } + + + /** + * 查询所有部门列表 + * + * @return + */ + public ResultBean> selectListOne() { + + return sysOrganizationFeign.selectListOne(); + + } + + /** + * 根据业务员sid获取到分公司 + * + * @param userSid 业务员sid + * @return + */ + public SysOrganizationVo getUseOrgByUserSid(String userSid) { + + return new SysOrganizationVo(); + } + public ResultBean selectBySid(String userSid) { + return sysOrganizationFeign.selectBySid(userSid); + } + + + public ResultBean getQrCode(String sid) { + return sysOrganizationFeign.getQrCode(sid); + } + + + + public ResultBean>> selectUseOrgSidBySid(String sid) { + return sysOrganizationFeign.selectUseOrgSidBySid(sid); + } + + public ResultBean getOrgSid(String sid) { + return sysOrganizationFeign.getOrgSid(sid); + } + + public ResultBean> selectOrgList(SysOrganizationListQuery query) { + return sysOrganizationFeign.selectOrgList(query); + } + + public ResultBean> selectOrgLists(SysOrganizationListQuery query) { + return sysOrganizationFeign.selectOrgLists(query); + + } + + public ResultBean selectByPSid(String sid, String name) { + + return sysOrganizationFeign.selectByPSid(sid, name); + } + + public ResultBean> selectOrgSidList() { + return sysOrganizationFeign.selectOrgSidList(); + } + + public ResultBean selectByOrgSidPath(String orgSidPath) { + return sysOrganizationFeign.selectByOrgSidPath(orgSidPath); + } + + public ResultBean> getListDeptByOrgSid(String orgSid) { + return sysOrganizationFeign.getListDeptByOrgSid(orgSid); + } + + public ResultBean> selectOrgByPSid(String psid) { + + return sysOrganizationFeign.selectOrgByPSid(psid); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationVo.java new file mode 100644 index 0000000..7e997e7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationVo.java @@ -0,0 +1,86 @@ +package com.yxt.oms.biz.func.sysorganization; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationVo.java
+ * Class: SysOrganizationVo
+ * Description: 组织机构表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象") +@Data +public class SysOrganizationVo implements Vo { + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("子集") + private List children = new ArrayList<>(); + @ApiModelProperty("主管人员名称") + private String zgNames; + @ApiModelProperty("分管人员名称") + private String fgNames; + @ApiModelProperty("主管人员sid") + private String zgStaffSid; + @ApiModelProperty("分管人员sid") + private String fgStaffSid; + @ApiModelProperty("组织简称") + private String orgAbbre; + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + @ApiModelProperty("管理层级key") + private String orgLevelKey; + @ApiModelProperty("管理层级value") + private String orgLevelValue; + @ApiModelProperty("其他编码") + private String otherCode; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPost.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPost.java new file mode 100644 index 0000000..1780b27 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPost.java @@ -0,0 +1,46 @@ +package com.yxt.oms.biz.func.syspost; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPost.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPost
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "岗位", description = "岗位") +@TableName("sys_post") +@Data +public class SysPost extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("岗位名称") + private String name; + + @ApiModelProperty("职级key") + private String postLevelKey; + + @ApiModelProperty("职级") + private String postLevel; + + @ApiModelProperty("岗位编码") + private String postCode; + +// @ApiModelProperty("所属部门sid") +// private String orgSid; + + @ApiModelProperty(value = "父级sid") + private String parentSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostDto.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostDto.java new file mode 100644 index 0000000..c97796c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostDto.java @@ -0,0 +1,44 @@ +package com.yxt.oms.biz.func.syspost; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostDto.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostDto
+ * Description: 岗位 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "岗位 数据传输对象", description = "岗位 数据传输对象") +@Data +public class SysPostDto implements Dto { + + private static final long serialVersionUID = 863876947510030464L; + @ApiModelProperty("岗位名称") + private String name; + + @ApiModelProperty("职级key") + private String postLevelKey; + + @ApiModelProperty("职级") + private String postLevel; + + @ApiModelProperty("岗位编码") + private String postCode; + +// @ApiModelProperty("所属部门sid") +// private String orgSid; + + @ApiModelProperty(value = "父级sid", example = "0") + private String parentSid; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostListVo.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostListVo.java new file mode 100644 index 0000000..123926c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostListVo.java @@ -0,0 +1,22 @@ +package com.yxt.oms.biz.func.syspost; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/2/14 13:49 + * @Description 部门下的岗位信息 + */ +@Data +public class SysPostListVo implements Vo { + private static final long serialVersionUID = -8060032905868283959L; + + @ApiModelProperty("岗位名称") + private String name; + @ApiModelProperty("岗位编码") + private String postCode; + @ApiModelProperty("岗位sid") + private String sid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java new file mode 100644 index 0000000..044421f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java @@ -0,0 +1,65 @@ +package com.yxt.oms.biz.func.syspost; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostMapper.java
+ * Class: com.yxt.anrui.portal.biz.syspost.SysPostMapper
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysPostMapper extends BaseMapper { + + //@Update("update sys_post set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_post") + List selectListVo(); + + @Select("select * from sys_post where sid=#{sid} ") + SysPost fetchBySid(@Param("sid") String sid); + + @Select("select * from sys_post where orgSid=#{orgSid} ") + List fetchByOrgSid(@Param("orgSid") String orgSid); + + @Select("select postCode,`name` from sys_post") + List fetchByOrgSidPostCode(); + + /** + * 查询所有岗位列表 + * + * @return + */ + List selectListOne(); + + /** + * 根据岗位编码查询岗位信息 + * + * @param substring 岗位编码 + * @return + */ + SysPost selectByPostCode(String substring); + + @Select("select * from sys_post where staffSid = #{sid}") + SysPost getPostByStaffSid(String sid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.xml new file mode 100644 index 0000000..91338b8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostQuery.java new file mode 100644 index 0000000..4e6731d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostQuery.java @@ -0,0 +1,41 @@ +package com.yxt.oms.biz.func.syspost; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostQuery.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostQuery
+ * Description: 岗位 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "岗位 查询条件", description = "岗位 查询条件") +@Data +public class SysPostQuery implements Query { + + + @ApiModelProperty("岗位名称") + private String name; + + @ApiModelProperty("职级key") + private String postLevelKey; + + @ApiModelProperty("职级") + private String postLevel; + + @ApiModelProperty("岗位编码") + private String postCode; + + @ApiModelProperty("所属部门sid") + private String orgSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java new file mode 100644 index 0000000..e6bf628 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java @@ -0,0 +1,130 @@ +package com.yxt.oms.biz.func.syspost; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.feign.portal.syspost.SysPostFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostService.java
+ * Class: com.yxt.user.biz.syspost.SysPostService
+ * Description: 岗位 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysPostService extends MybatisBaseService { + + + @Autowired + SysPostFeign sysPostFeign; + + public PagerVo listPage(PagerQuery pq) { + SysPostQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(SysPostQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysPostQuery query) { + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getName())) { + qw.like("post.name", query.getName()); + } + + if (StringUtils.isNotBlank(query.getOrgSid())) { + qw.eq("post.orgSid", query.getOrgSid()); + } + return qw; + } + + public ResultBean> listPageVo(PagerQuery pq) { + return sysPostFeign.listPage(pq); + } + + public ResultBean> listAllVo(SysPostQuery query) { + return sysPostFeign.listAll(query); + } + + public ResultBean> listVo() { + return sysPostFeign.list(); + } + + public ResultBean saveOrUpdateDto(SysPostDto dto) { + return sysPostFeign.save(dto); + } + public ResultBean updateBySid(SysPostDto dto,String sid) { + return sysPostFeign.update(dto,sid); + } + public ResultBean del(String sid) { + return sysPostFeign.del(sid); + } + public ResultBean delBySids(String sid) { + return sysPostFeign.delBySids(sid); + } + + public ResultBean fetchByIdVo(String id) { + return sysPostFeign.fetch(id); + } + + public ResultBean fetchBySidVo(String sid) { + return sysPostFeign.fetchBySid(sid); + } + + public ResultBean> fetchByOrgSid(String orgSid) { + return sysPostFeign.fetchByOrgSid(orgSid); + } + + public ResultBean fetchByOrgSidPostCode() { + return sysPostFeign.fetchByOrgSidPostCode(); + } + + /** + * 查询所有岗位列表 + * + * @return + */ + public ResultBean> selectList() { + + return sysPostFeign.selectList(); + } + + /** + * 根据岗位编码查询岗位信息 + * + * @param substring 岗位编码 + * @return + */ + public SysPost selectByPostCode(String substring) { + return baseMapper.selectByPostCode(substring); + } + + public SysPost getPostByStaffSid(String sid) { + return baseMapper.getPostByStaffSid(sid); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostVo.java b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostVo.java new file mode 100644 index 0000000..9f4b1ac --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostVo.java @@ -0,0 +1,52 @@ +package com.yxt.oms.biz.func.syspost; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostVo.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostVo
+ * Description: 岗位 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "岗位 视图数据对象", description = "岗位 视图数据对象") +@Data +public class SysPostVo implements Vo { + + + @ApiModelProperty("岗位名称") + private String name; + + @ApiModelProperty("职级key") + private String postLevelKey; + + @ApiModelProperty("职级") + private String postLevel; + + @ApiModelProperty("岗位编码") + private String postCode; + + @ApiModelProperty("所属部门sid") + private String orgSid; + + @ApiModelProperty("所属部门名称") + private String orgName; + + @ApiModelProperty("岗位sid") + private String sid; + + @ApiModelProperty(value = "上级岗位名称") + private String parentName; + @ApiModelProperty(value = "上级岗位sid") + private String parentSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java new file mode 100644 index 0000000..d9e8b05 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java @@ -0,0 +1,49 @@ +package com.yxt.oms.biz.func.sysrole; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRole.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRole
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色", description = "角色") +@TableName("sys_role") +@Data +public class SysRole extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("角色名称") + private String name; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("编码") + private String code; + + @ApiModelProperty("1、系统管理员、2、普通角色") + private Integer type; + + @ApiModelProperty("岗位sid") + private String postSid; + + @ApiModelProperty(value = "角色组织层级key") + private String roleType; + @ApiModelProperty(value = "角色组织层级value") + private String roleTypeValue; + private String orgSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java new file mode 100644 index 0000000..8379916 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java @@ -0,0 +1,52 @@ +package com.yxt.oms.biz.func.sysrole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleDto
+ * Description: 角色 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色 数据传输对象", description = "角色 数据传输对象") +@Data +public class SysRoleDto implements Dto { + + + @ApiModelProperty("角色名称") + private String name; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("编码") + private String code; + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("1、系统管理员、2、普通角色") + private Integer type; + + @ApiModelProperty("岗位sid") + private String postSid; + + @ApiModelProperty("岗位名称") + private String postName; + + @ApiModelProperty(value = "角色组织层级key") + private String roleType; + @ApiModelProperty(value = "角色组织层级value") + private String roleTypeValue; + private String orgSid; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java new file mode 100644 index 0000000..8b045f7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java @@ -0,0 +1,68 @@ +package com.yxt.oms.biz.func.sysrole; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleMapper
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysRoleMapper extends BaseMapper { + + //@Update("update sys_role set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_role") + List selectListVo(); + + List fetchByUserSid(String userSid); + + List listAllByUserSid(String userSid); + + SysRole fetchByName(String name); + + int deleteBatchSids(List list); + + int deleteBySid(String valueOf); + + SysRoleVo fetchBySid(String sid); + + int updateIsEnable(@Param("sid") String sid, @Param("isEnable") String isEnable); + + String getLevelType(String roleSid); + + String selectRoleSid(String userRoleSid); + + String selectByUserSid(String sid); + + List selectByUser(String userSid); + +// List selectRoleList(String menuSid); +// +// List selectMobileRoleList(String menuSid); + + List selectByRole(@Param("list") List roleSidList, @Param("menuSid") String menuSid,@Param("userSid") String userSid); + + List selectByMobileRole(@Param("list") List roleSidList, @Param("menuSid") String menuSid,@Param("userSid") String userSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.xml new file mode 100644 index 0000000..c9b483b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + DELETE + FROM sys_role WHERE sid IN + + #{sid} + + + + DELETE + FROM sys_role + WHERE sid = #{sid} + + + + UPDATE sys_role + SET isEnable = #{isEnable} + WHERE sid = #{sid} + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java new file mode 100644 index 0000000..4e1e277 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java @@ -0,0 +1,38 @@ +package com.yxt.oms.biz.func.sysrole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleQuery
+ * Description: 角色 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色 查询条件", description = "角色 查询条件") +@Data +public class SysRoleQuery implements Query { + + + @ApiModelProperty("角色名称") + private String name; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("编码") + private String code; + + @ApiModelProperty("1、系统管理员、2、普通角色") + private Integer type; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java new file mode 100644 index 0000000..1be0118 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java @@ -0,0 +1,131 @@ +package com.yxt.oms.biz.func.sysrole; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysuserrole.SysUserRoleService; +import com.yxt.wms.feign.portal.sysrole.SysRoleFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleService.java
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleService
+ * Description: 角色 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysRoleService extends MybatisBaseService { + @Autowired + private SysUserRoleService sysUserRoleService; + @Autowired + SysRoleFeign sysRoleFeign; + + + public ResultBean> listPage(PagerQuery pq) { + return sysRoleFeign.listPage(pq); + } + + public ResultBean> listAll(SysRoleQuery query) { + return sysRoleFeign.listAll(query); + } + + private QueryWrapper createQueryWrapper(SysRoleQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getName())) { + qw.like("sr.name", query.getName()); + } + + if (query.getSort() != null) { + qw.eq("sr.sort", query.getSort()); + } + + if (StringUtils.isNotBlank(query.getCode())) { + qw.eq("sr.code", query.getCode()); + } + + if (query.getType() != null) { + qw.eq("sr.type", query.getType()); + } + return qw; + } + + public ResultBean> listPageVo(PagerQuery pq) { + return sysRoleFeign.listPage(pq); + } + + public ResultBean> listAllVo(SysRoleQuery query) { + return sysRoleFeign.listAll(query); + } + + public ResultBean> listVo() { + return sysRoleFeign.list(); + } + + public ResultBean saveOrUpdateDto(SysRoleDto dto) { + return sysRoleFeign.save(dto); + } + public ResultBean updateBySid(SysRoleDto dto,String sid) { + return sysRoleFeign.update(dto,sid); + } + public ResultBean fetchByIdVo(String id) { + return sysRoleFeign.fetch(id); + } + + public ResultBean> fetchByUserSid(String userSid) { + return sysRoleFeign.fetchByUserSid(userSid); + } + + public ResultBean> listAllByUserSid(String userSid) { + return sysRoleFeign.listAllByUserSid(userSid); + } + + /** + * 描述 : <描述函数实现的功能>.
+ *

+ * + * @param sids + * @return + */ + public ResultBean delBySid(String sids) { + return sysRoleFeign.delBySids(sids); + } + /** + * 描述 : <描述函数实现的功能>.
+ *

+ * + * @param sids + * @return + */ + public ResultBean del(String sids) { + return sysRoleFeign.del(sids); + } + + public ResultBean fetchBySidVo(String sid) { + return sysRoleFeign.fetchBySid(sid); + } + public ResultBean updateIsEnable(String sid, String isEnable) { + return sysRoleFeign.setIsEnable(sid,isEnable); + } + + + + + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java new file mode 100644 index 0000000..ce48d89 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java @@ -0,0 +1,47 @@ +package com.yxt.oms.biz.func.sysrole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleVo
+ * Description: 角色 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色 视图数据对象", description = "角色 视图数据对象") +@Data +public class SysRoleVo implements Vo { + @ApiModelProperty("角色名称") + private String name; + @ApiModelProperty("排序") + private Integer sort; + @ApiModelProperty("编码") + private String code; + @ApiModelProperty("1、系统管理员、2、普通角色") + private Integer type; + @ApiModelProperty("角色sid") + private String sid; + @ApiModelProperty("说明") + private String remarks; + @ApiModelProperty("是否选中，1：未选中,0：选中") + private String checked; + @ApiModelProperty("是否可用") + private String isEnable; + @ApiModelProperty("岗位sid") + private String postSid; + @ApiModelProperty("岗位名称") + private String postName; + @ApiModelProperty(value = "组织层级") + private String roleTypeValue; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysMenuRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysMenuRoleVo.java new file mode 100644 index 0000000..678211b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysMenuRoleVo.java @@ -0,0 +1,55 @@ +package com.yxt.oms.biz.func.sysroleauthorize; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo
+ * Description: 菜单与角色关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ + +@Data +public class SysMenuRoleVo implements Vo { + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("菜单父级sid") + private String pSid; + @ApiModelProperty("menusid") + private String sid; + @ApiModelProperty("menuUrl") + private String menuUrl; + @ApiModelProperty("menuName") + private String menuName; + @ApiModelProperty("pageUrl") + private String pageUrl; + @ApiModelProperty("iconUrl") + private String iconUrl; + @ApiModelProperty("isShow") + private String isShow; + @ApiModelProperty("alwaysShow") + private Integer alwaysShow; + @ApiModelProperty("pageUrlRedirect") + private String pageUrlRedirect; + @ApiModelProperty("pageAliasName") + private String pageAliasName; + @ApiModelProperty("pageName") + private String pageName; + @ApiModelProperty("remarks") + private String remarks; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorize.java b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorize.java new file mode 100644 index 0000000..f21634a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorize.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.sysroleauthorize; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSource.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSource
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色授权表", description = "角色授权表") +@TableName("sys_role_authorize") +@Data +public class SysRoleAuthorize extends BaseEntity { + private static final long serialVersionUID = 1L; + private String roleSid;//角色sid + private String sourceSid;//资源sid + private String menuSid;//菜单sid + private String dataRuleId;//菜单的数据权限id + private String funcSid;//功能sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeDto.java new file mode 100644 index 0000000..d7f25e8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeDto.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.sysroleauthorize; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceDto.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceDto
+ * Description: 资源表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源表 数据传输对象", description = "资源表 数据传输对象") +@Data +public class SysRoleAuthorizeDto implements Dto { + + + private String roleSid;//角色sid + private String sourceSid;//资源sid + private String menuSid;//菜单sid + private String dataRuleId;//菜单的数据权限id + private String funcSid;//功能sid + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.java new file mode 100644 index 0000000..f0baac9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.java @@ -0,0 +1,34 @@ +package com.yxt.oms.biz.func.sysroleauthorize; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceMapper.java
+ * Class: com.yxt.anrui.portal.biz.syssource.SysSourceMapper
+ * Description: 角色授权表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysRoleAuthorizeMapper extends BaseMapper { + + + + List list(@Param(Constants.WRAPPER) QueryWrapper qw); + List selectByRoleSid(String roleSid); + @Delete("delete from sys_menu_role where roleSid=#{roleSid}") + void delByRoleSid(@Param("roleSid") String roleSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.xml new file mode 100644 index 0000000..9e240ad --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeQuery.java new file mode 100644 index 0000000..49c3f08 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeQuery.java @@ -0,0 +1,41 @@ +package com.yxt.oms.biz.func.sysroleauthorize; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceQuery.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceQuery
+ * Description: 资源表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源表 查询条件", description = "资源表 查询条件") +@Data +public class SysRoleAuthorizeQuery implements Query { + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("多个角色sid计集合") + private List roleSids; + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("是否是系统管理员") + private String isAdmin; + + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java new file mode 100644 index 0000000..e04373a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeService.java @@ -0,0 +1,34 @@ +package com.yxt.oms.biz.func.sysroleauthorize; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.feign.portal.sysroleauthorize.SysRoleAuthorizeFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceService.java
+ * Class: com.yxt.anrui.portal.biz.syssource.SysSourceService
+ * Description: 资源表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysRoleAuthorizeService extends MybatisBaseService { + @Autowired + SysRoleAuthorizeFeign sysRoleAuthorizeFeign; + + + + public ResultBean updateRoleAndMenu(SysRoleAuthorizeDto dto) { + + return sysRoleAuthorizeFeign.updateRoleAndMenu(dto); + } + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeVo.java new file mode 100644 index 0000000..5b2369f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeVo.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.sysroleauthorize; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceVo.java
+ * Class: com.yxt.user.biz.syssource.SysSourceVo
+ * Description: 资源表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源表 视图数据对象", description = "资源表 视图数据对象") +@Data +public class SysRoleAuthorizeVo implements Vo { + + + private String roleSid;//角色sid + private String sourceSid;//资源sid + private String menuSid;//菜单sid + private String dataRuleId;//菜单的数据权限id + private String funcSid;//功能sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java new file mode 100644 index 0000000..f5c1119 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.sysstafforg; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorize; +import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeMapper; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SysStaffOrgService extends MybatisBaseService { + + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + + public ResultBean getOrgSidByPath(String orgPath) { + return sysStaffOrgFeign.getOrgSidByPath(orgPath); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java new file mode 100644 index 0000000..0f14116 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java @@ -0,0 +1,63 @@ +package com.yxt.oms.biz.func.sysuser; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.feign.portal.sysuser.SysUserDto; +import com.yxt.oms.feign.portal.sysuser.SysUserFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserQuery; +import com.yxt.oms.feign.portal.sysuser.SysUserVo; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.servlet.http.HttpServletRequest; + +/** + * @author wangpengfei + * @date 2024/5/6 10:29 + */ +@Service +public class SysUserService { + @Autowired + SysUserFeign sysUserFeign; + + + + + public ResultBean login(@RequestBody SysUserQuery userQuery){ + return sysUserFeign.login(userQuery); + } + + public ResultBean register(@RequestBody SysUserDto dto){ + return sysUserFeign.register(dto); + } + + public ResultBean loginDetails(HttpServletRequest httpServletRequest){ + return sysUserFeign.loginDetails(httpServletRequest); + } + + public ResultBean sendMessageCode(String mobile){ + return sysUserFeign.sendMessageCode(mobile); + } + + public ResultBean sendMessageLogin(String mobile){ + return sysUserFeign.sendMessageLogin(mobile); + } + public ResultBean sendMessageUpdate(String mobile){ + return sysUserFeign.sendMessageUpdate(mobile); + } + public ResultBean listPage(PagerQuery pq){ + return sysUserFeign.listPage(pq); + } + public ResultBean bindOrganization(SysUserDto dto){ + return sysUserFeign.bindOrganization(dto); + } + public ResultBean selOrganization(SysUserDto dto){ + return sysUserFeign.selOrganization(dto); + } + public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){ + return sysUserFeign.setIsEnable(sid, isEnable); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRole.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRole.java new file mode 100644 index 0000000..a486c1c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRole.java @@ -0,0 +1,34 @@ +package com.yxt.oms.biz.func.sysuserrole; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRole.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRole
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户与角色关联表", description = "用户与角色关联表") +@TableName("sys_user_role") +@Data +public class SysUserRole extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java new file mode 100644 index 0000000..bce8e54 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleDto.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.sysuserrole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto
+ * Description: 用户与角色关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户与角色关联表 数据传输对象", description = "用户与角色关联表 数据传输对象") +@Data +public class SysUserRoleDto implements Dto { + + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java new file mode 100644 index 0000000..afc968e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java @@ -0,0 +1,58 @@ +package com.yxt.oms.biz.func.sysuserrole; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleMapper
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysUserRoleMapper extends BaseMapper { + + //@Update("update sys_user_role set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_user_role") + List selectListVo(); + + void deleteByUserSid(String userSid); + + @Delete("delete from sys_user_role where userSid=#{userSid} and roleSid=#{roleSid} ") + void delByUserSidAndRoleSid(@Param("userSid") String userSid,@Param("roleSid") String roleSid); + + List selectByUserSid(@Param("userSid")String userSid); + + @Select("SELECT roleSid FROM sys_user_role WHERE userSid=#{userSid}") + List getUserRoleSidByUserSid(@Param("userSid")String userSid); + + List getUserIdListByRoleSid(@Param("roleList") List roleList); + List getUserSidListByRoleSid(@Param("roleList") List roleList); + + int deleteByRoleSid(String sids); + + List selectRoleSid(String userSid); + + List selectByUserSids(String userSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.xml new file mode 100644 index 0000000..463534b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + delete from sys_user_role where userSid=#{params} + + + + + + delete from sys_user_role where roleSid = #{sids} + + + + + + \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleQuery.java new file mode 100644 index 0000000..091c0cc --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleQuery.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.sysuserrole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery
+ * Description: 用户与角色关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户与角色关联表 查询条件", description = "用户与角色关联表 查询条件") +@Data +public class SysUserRoleQuery implements Query { + + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java new file mode 100644 index 0000000..5a96ca5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java @@ -0,0 +1,135 @@ +package com.yxt.oms.biz.func.sysuserrole; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.feign.portal.sysuserrole.SysUserRoleFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleService.java
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService
+ * Description: 用户与角色关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysUserRoleService extends MybatisBaseService { + + @Autowired + SysUserRoleFeign sysUserRoleFeign; + + + public PagerVo listPage(PagerQuery pq) { + SysUserRoleQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List listAll(SysUserRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SysUserRoleQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getUserSid())) { + qw.eq("userSid", query.getUserSid()); + } + + if (StringUtils.isNotBlank(query.getRoleSid())) { + qw.eq("roleSid", query.getRoleSid()); + } + return qw; + } + + public ResultBean> listPageVo(PagerQuery pq) { + return sysUserRoleFeign.listPage(pq); + } + + public ResultBean> listAllVo(SysUserRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return sysUserRoleFeign.listAll(query); + } + + public ResultBean> listVo() { + return sysUserRoleFeign.list(); + } + + public ResultBean saveOrUpdateDto(SysUserRoleDto dto){ + return sysUserRoleFeign.save(dto); + } + + public ResultBean fetchByIdVo(String id){ + + return sysUserRoleFeign.fetch(id); + } + + public void deleteByUserSid(String userSid) { + baseMapper.deleteByUserSid(userSid); + } + public ResultBean saveOrUpdate(SysUserRoleDto dto) { + return sysUserRoleFeign.update(dto); + } + + public ResultBean del(String userSid) { + return sysUserRoleFeign.del(userSid); + } + + public ResultBean delByUserSidAndRoleSid(String userSid, String roleSid) { + return sysUserRoleFeign.delByUserSidAndRoleSid(userSid,roleSid); + } + + public List selectByUserSid(String userSid) { + return baseMapper.selectByUserSid(userSid); + } + /*public void updateUserRole(SysUserRoleDto dto) { + //sysUserRoleService.deleteByUserSid(dto.getUserSid()); + SysUserRole entity = new SysUserRole(); + dto.fillEntity(entity); + this.saveOrUpdate (entity); + }*/ + + public ResultBean> getUserRoleSidByUserSid(String userSid) { + return sysUserRoleFeign.getUserRoleSidByUserSid(userSid); + } + + public ResultBean> getUserIdListByRoleSid(List roleList) { + return sysUserRoleFeign.getUserIdListByRoleSid(roleList); + } + public ResultBean> getUserSidListByRoleSid(List roleList) { + return new ResultBean>().success().setData(baseMapper.getUserSidListByRoleSid(roleList)); + } + + public int deleteByRoleSid(String sids) { + return baseMapper.deleteByRoleSid(sids); + } + + public List selectRoleSid(String userSid) { + return baseMapper.selectRoleSid(userSid); + } + + public ResultBean> selectByUserSids(String userSid) { + + return sysUserRoleFeign.selectByUserSid(userSid); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java new file mode 100644 index 0000000..497ed22 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.sysuserrole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo
+ * Description: 用户与角色关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户与角色关联表 视图数据对象", description = "用户与角色关联表 视图数据对象") +@Data +public class SysUserRoleVo implements Vo { + + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java new file mode 100644 index 0000000..12fbed5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java @@ -0,0 +1,68 @@ +package com.yxt.oms.feign.portal.dictcommon; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.dictcommon.DictCommonDto; +import com.yxt.wms.biz.func.dictcommon.DictCommonQuery; +import com.yxt.wms.biz.func.dictcommon.DictCommonVo; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/7/5 21:59 + * @description + */ +@FeignClient( + contextId = "ss-common-portal-DictCommon", + name = "ss-common-portal", + path = "apiadmin/dictcommons", + fallback = DictCommonFeignFallback.class) +public interface DictCommonFeign { + + @PostMapping(value = "/save") + @ResponseBody + @ApiOperation(value = "数据字典数据项保存") + ResultBean save(@Valid @RequestBody DictCommonDto dictCommonDto); + + @PostMapping("/pageList") + @ResponseBody + @ApiOperation(value = "数据字典数据项分页列表") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery); + + @PostMapping("/update/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典修改后保存") + ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid); + + @ResponseBody + @DeleteMapping("/delete/{sid}") + @ApiOperation(value = "删除") + ResultBean delete(@ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid); + + @ResponseBody + @GetMapping("/selectBykey/{key}/{type}") + @ApiOperation(value = "数据字典信息修改时的初始化信息") + public ResultBean selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type); + + @GetMapping("/typeValues") + @ResponseBody + @ApiOperation("下拉框的获取") + ResultBean> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid); + + @GetMapping("/getFirstDictKeyByType") + @ResponseBody + @ApiOperation("根据数据字典的key获取第一个值（默认值）") + ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid); + + @GetMapping("/getTypeValueList") + @ResponseBody + @ApiOperation("根据分类编码和数据分组查询数据字典") + ResultBean> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum); +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeignFallback.java new file mode 100644 index 0000000..1dea4fa --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeignFallback.java @@ -0,0 +1,60 @@ +package com.yxt.oms.feign.portal.dictcommon; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.dictcommon.DictCommonDto; +import com.yxt.wms.biz.func.dictcommon.DictCommonQuery; +import com.yxt.wms.biz.func.dictcommon.DictCommonVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/7/5 22:00 + * @description + */ +@Component +public class DictCommonFeignFallback implements DictCommonFeign { + + @Override + public ResultBean save(DictCommonDto dictCommonDto) { + return null; + } + + @Override + public ResultBean> pageList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean update(DictCommonDto dictCommonDto, String sid) { + return null; + } + + @Override + public ResultBean delete(String sid) { + return null; + } + + @Override + public ResultBean selectBykey(String key, String type) { + return null; + } + + @Override + public ResultBean> getTypeValues(String type, String psid) { + return null; + } + + @Override + public ResultBean getFirstDictKeyByType(String dictType, String psid) { + return null; + } + + @Override + public ResultBean> getTypeValueList(String type, String groupNum) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/dicttype/DictTypeFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/dicttype/DictTypeFeign.java new file mode 100644 index 0000000..62672c9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/dicttype/DictTypeFeign.java @@ -0,0 +1,49 @@ +package com.yxt.oms.feign.portal.dicttype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.dicttype.DictTypeDto; +import com.yxt.wms.biz.func.dicttype.DictTypeQuery; +import com.yxt.wms.biz.func.dicttype.DictTypeVo; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * @author dimengzhe + * @date 2021/6/23 15:21 + * @description 数据字典类型对外接口 + */ +@FeignClient( + contextId = "ss-common-portal-DictType", + name = "ss-common-portal", + path = "apiadmin/dicttypes", + fallback = DictTypeFeignFallback.class) +public interface DictTypeFeign { + + @PostMapping(value = "/save") + @ResponseBody + @ApiOperation(value = "数据字典类型保存") + ResultBean save(@Valid @RequestBody DictTypeDto dictTypeDto); + + @PostMapping("/pageList") + @ResponseBody + @ApiOperation(value = "数据字典类型分页列表") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery); + + @PostMapping("/update/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典类型更新") + ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid); + + @DeleteMapping("/delete/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典类型删除") + ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/dicttype/DictTypeFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/dicttype/DictTypeFeignFallback.java new file mode 100644 index 0000000..6e8d651 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/dicttype/DictTypeFeignFallback.java @@ -0,0 +1,37 @@ +package com.yxt.oms.feign.portal.dicttype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.dicttype.DictTypeDto; +import com.yxt.wms.biz.func.dicttype.DictTypeQuery; +import com.yxt.wms.biz.func.dicttype.DictTypeVo; + +/** + * @author dimengzhe + * @date 2021/7/5 22:32 + * @description + */ + +public class DictTypeFeignFallback implements DictTypeFeign{ + + @Override + public ResultBean save(DictTypeDto dictTypeDto) { + return null; + } + + @Override + public ResultBean> pageList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean update(DictTypeDto dictTypeDto, String sid) { + return null; + } + + @Override + public ResultBean delete(String sid) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/privilege/PrivilegeQuery.java b/oms/src/main/java/com/yxt/oms/feign/portal/privilege/PrivilegeQuery.java new file mode 100644 index 0000000..03f741b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/privilege/PrivilegeQuery.java @@ -0,0 +1,22 @@ +package com.yxt.oms.feign.portal.privilege; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 权限角色层级 + * @author: dimengzhe + * @date: 2023/5/23 + **/ +@Data +public class PrivilegeQuery { + + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/region/RegionFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/region/RegionFeign.java new file mode 100644 index 0000000..986d291 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/region/RegionFeign.java @@ -0,0 +1,55 @@ +package com.yxt.oms.feign.portal.region; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.region.RegionChildTwoVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/7/2 14:18 + * @description + */ +@FeignClient( + contextId = "ss-common-portal-Region", + name = "ss-common-portal", + path = "/apiadmin/regions") +public interface RegionFeign { + + /** + * 区域获取省 + * + * @return 所有省的集合 + */ + @ApiOperation("获取省") + @ResponseBody + @GetMapping("/getProvince") + public ResultBean> getProvince(); + + /** + * 根据省查询该省下所有的市 + * + * @param sid 省sid + * @return 某省下所有的市 + */ + @ApiOperation("根据省sid获取该省的所有市") + @ResponseBody + @GetMapping("/getCity") + public ResultBean> getCity(@RequestParam("sid") String sid); + + /** + * 根据市查询该市下的所有县区 + * + * @param sid 市sid + * @return 某市下的所有县区 + */ + @ApiOperation("根据市sid获取该市的所有县区") + @ResponseBody + @GetMapping("/getCounty") + public ResultBean> getCounty(@RequestParam("sid") String sid); +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java new file mode 100644 index 0000000..4e686bd --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java @@ -0,0 +1,123 @@ +package com.yxt.oms.feign.portal.sysmenu; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuFeign.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuFeign
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "菜单表") +@FeignClient( + contextId = "ss-common-portal-SysMenu", + name = "ss-common-portal", + path = "/apiadmin/sysmenu", + fallback = SysMenuFeignFallback.class) +public interface SysMenuFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + +/* @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysMenuQuery query);*/ + + /** + * 菜单列表：根据资源归类 + * + * @param query + * @return + */ + @ApiOperation("菜单列表：根据资源归类") + @PostMapping("/listAllVoForSource") + public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query); + /** + * 菜单列表：根据资源归类 设置功能的url用 + * @return + */ + @ApiOperation("菜单列表：根据资源归类 设置功能的url用") + @PostMapping("/getMenusForFunction") + public ResultBean>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery); + @ApiOperation("根据用户sid查询所有数据列表 ") + @PostMapping("/sourceMenuTreeByUserSid") + public ResultBean>> sourceMenuTreeByUserSid(@RequestBody SysMenuQuery query); + @ApiOperation("根据资源sid查询所有数据列表 ") + @PostMapping("/sourcemenutree") + public ResultBean>> sourcemenutree(@RequestBody SysMenuQuery query); + + @ApiOperation("根据角色sid条件查询所有数据列表") + @PostMapping("/listAllByRoleSid") + public ResultBean> listAllByRoleSid(@RequestBody SysMenuQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@Valid @RequestBody SysMenuDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid); + + /* @ApiOperation("修改保存") + @PostMapping("/updateSort/{sid}") + public ResultBean updateSort(@RequestBody SysMenuDto dto,@PathVariable("sid") String sid); + */ + + /** + * 修改是否可用的状态 + * + * @param sid 菜单sid或资源sid + * @param isEnable 是否可用的状态：1可用，0不可用 + * @return + */ + @ApiOperation("修改是否可用的状态 ") + @PostMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable); + + /* @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids);*/ + + /** + * 根据当前行sid删除菜单 + * + * @param sid 菜单sid + * @return + */ + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySids/{sid}") + public ResultBean delBySids(@PathVariable("sid") String sid); + + /* @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("获取一条记录 根据sid") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid);*/ +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java new file mode 100644 index 0000000..7050f8c --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java @@ -0,0 +1,82 @@ +package com.yxt.oms.feign.portal.sysmenu; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuFeignFallback
+ * Description: 菜单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysMenuFeignFallback implements SysMenuFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAllVoForSource(SysMenuQuery query) { + return null; + } + + @Override + public ResultBean>> getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) { + return null; + } + + @Override + public ResultBean>> sourceMenuTreeByUserSid(SysMenuQuery query) { + return null; + } + + @Override + public ResultBean>> sourcemenutree(SysMenuQuery query) { + return null; + } + + @Override + public ResultBean> listAllByRoleSid(SysMenuQuery query) { + return null; + } + + @Override + public ResultBean> list() { + return null; + } + + @Override + public ResultBean save(SysMenuDto dto) { + return null; + } + + @Override + public ResultBean update(SysMenuDto dto, String sid) { + return null; + } + + @Override + public ResultBean updateIsEnable(String sid, Integer isEnable) { + return null; + } + + @Override + public ResultBean delBySids(String sid) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeign.java new file mode 100644 index 0000000..bfb58ab --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeign.java @@ -0,0 +1,83 @@ +package com.yxt.oms.feign.portal.sysmenurole; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeign
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "菜单与角色关联表") +@FeignClient( + contextId = "ss-common-portal-SysMenuRole", + name = "ss-common-portal", + path = "/apiadmin/sysmenurole", + fallback = SysMenuRoleFeignFallback.class) +public interface SysMenuRoleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysMenuRoleQuery query); + + @ApiOperation("根据角色查询授权的菜单列表(PC)") + @PostMapping("/selMenuByRole") + public ResultBean> selMenuByRole(@RequestBody SysMenuRoleDataQuery query); + + @ApiOperation("根据角色查询授权的菜单列表(APP)") + @PostMapping("/selMenuByRoleApp") + public ResultBean> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query); + + @ApiOperation("修改角色菜单的数据权限（PC）") + @PostMapping("/updateDataByRoleMenu") + public ResultBean updateDataByRoleMenu(@RequestBody List dtos); + + @ApiOperation("修改角色菜单的数据权限（移动端）") + @PostMapping("/updateDataByRoleMenuApp") + public ResultBean updateDataByRoleMenuApp(@RequestBody List dtos); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysMenuRoleDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysMenuRoleDto dto,@PathVariable("sid") String sid); + @ApiOperation("修改角色的菜单配置") + @PostMapping("/updateRoleAndMenu") + public ResultBean updateRoleAndMenu(@RequestBody SysMenuRoleDto dto); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeignFallback.java new file mode 100644 index 0000000..92e48e3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenurole/SysMenuRoleFeignFallback.java @@ -0,0 +1,85 @@ +package com.yxt.oms.feign.portal.sysmenurole; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeignFallback
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysMenuRoleFeignFallback implements SysMenuRoleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(SysMenuRoleQuery query) { + return null; + } + + @Override + public ResultBean> selMenuByRole(SysMenuRoleDataQuery query) { + return null; + } + + @Override + public ResultBean> selMenuByRoleApp(SysMenuRoleDataQuery query) { + return null; + } + + @Override + public ResultBean updateDataByRoleMenu(List dtos) { + return null; + } + + @Override + public ResultBean updateDataByRoleMenuApp(List dtos) { + return null; + } + + @Override + public ResultBean> list() { + return null; + } + + @Override + public ResultBean save(SysMenuRoleDto dto) { + return null; + } + + @Override + public ResultBean update(SysMenuRoleDto dto, String sid) { + return null; + } + + @Override + public ResultBean updateRoleAndMenu(SysMenuRoleDto dto) { + return null; + } + + @Override + public ResultBean del(String ids) { + return null; + } + + @Override + public ResultBean fetch(String id) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java new file mode 100644 index 0000000..f4cbd0f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java @@ -0,0 +1,204 @@ +package com.yxt.oms.feign.portal.sysorganization; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysorganization.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationFeign.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "组织机构表") +@FeignClient( + contextId = "ss-common-portal-SysOrganization", + name = "ss-common-portal", + path = "apiadmin/sysorganization", + fallback = SysOrganizationFeignFallback.class) +public interface SysOrganizationFeign { + @PostMapping("/saveSysOrg") + public ResultBean saveOrg(@RequestBody SysOrganizationDto dto); + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysOrganizationQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("一级组织机构列表") + @GetMapping("/selectFirstOrgList") + public ResultBean>selectFirstOrgList(); + + @ApiOperation("根据父级sid查询子集列表") + @GetMapping("/selectChildrenListBySid/{sid}") + public ResultBean> selectChildrenListBySid(@PathVariable("sid") String sid); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysOrganizationDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysOrganizationDto dto, @PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("获取一条记录 根据sid") + @ResponseBody + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + + @ApiOperation("手机获取组织架构") + @ResponseBody + @GetMapping("/selectAppOrganization") + public ResultBean> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid); + + @ApiOperation("组织架构") + @ResponseBody + @GetMapping("/selectListOrg") + ResultBean> selectListOrg(); + + @ApiOperation("获取到分公司") + @ResponseBody + @GetMapping("/getListOrg") + ResultBean> getListOrg(); + + @ApiOperation("获取同品牌下分公司") + @ResponseBody + @GetMapping("/getListOrgByBrand/{orgSid}") + ResultBean> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid); + + @ApiOperation("获取指定品牌下分公司(已筛选本分公司)") + @ResponseBody + @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}") + ResultBean> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid); + + @ApiOperation("获取指定品牌下分公司(未筛选本分公司)") + @ResponseBody + @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}") + ResultBean> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid); + + @ApiOperation("获取指定分公司下部门信息") + @ResponseBody + @GetMapping("/getListDeptByOrgSid/{orgSid}") + ResultBean> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid); + + @ApiOperation("根据业务员sid获取到分公司") + @ResponseBody + @GetMapping("/getUseOrgByUserSid") + ResultBean getUseOrgByUserSid(@RequestParam("userSid") String userSid); + + @ApiOperation("根据部门sid查询组织信息") + @ResponseBody + @GetMapping("/selectBySid") + ResultBean selectBySid(@RequestParam("sid") String sid); + + @ApiOperation("根据组织架构sid查询组织下所有分公司") + @ResponseBody + @GetMapping("/selectUseOrgSidBySid") + ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid); + + /** + * 查询公司所有的部门 + * + * @return + */ + @ApiOperation("所在部门下拉") + @ResponseBody + @GetMapping("/selectListOne") + ResultBean> selectListOne(); + + @PostMapping("/getQrCode/{sid}") + @ResponseBody + @ApiOperation("查看二维码") + public ResultBean getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @GetMapping("/getOrgSid/{sid}") + @ResponseBody + @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司") + ResultBean getOrgSid(@PathVariable(value = "sid") String sid); + + @GetMapping("/selectOrgList") + @ResponseBody + @ApiOperation("当前分公司销售部门及部门人员") + ResultBean> selectOrgList(@SpringQueryMap SysOrganizationListQuery query); + + @GetMapping("/selectOrgList2") + @ResponseBody + @ApiOperation("当前分公司销售部门及部门人员") + ResultBean> selectOrgList2(@SpringQueryMap SysOrganizationListQuery query); + + @GetMapping("/selectOrgLists") + @ResponseBody + @ApiOperation("当前分公司下所有部门") + ResultBean> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query); + + @GetMapping("/selectByPSid") + @ResponseBody + @ApiOperation("查询分公司下的销售支持部") + ResultBean selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name); + + @GetMapping("/selectOrgSidList") + @ResponseBody + @ApiOperation("所有分公司sid") + ResultBean> selectOrgSidList(); + + @GetMapping("/selectOrgByPSid") + @ResponseBody + @ApiOperation("查询事业部下所有分公司") + ResultBean> selectOrgByPSid(@RequestParam("psid") String psid); + + @GetMapping("/selectByOrgSidPath") + @ResponseBody + @ApiOperation("组织层级分页查询") + ResultBean selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath); + + @GetMapping("/selectByOrgCode") + @ResponseBody + @ApiOperation("根据code查询组织信息") + ResultBean selectByOrgCode(@RequestParam("orgCode") String orgCode); + +// @GetMapping("/selectFinance") +// @ResponseBody +// @ApiOperation("查询金融部主管人员") +// ResultBean> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid); + + @GetMapping("/selectByCJOrgPath") + @ResponseBody + @ApiOperation("根据管理层级截取路径") + ResultBean selectByCJOrgPath(@RequestParam("orgPath") String orgPath); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java new file mode 100644 index 0000000..4f45fd6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java @@ -0,0 +1,198 @@ +package com.yxt.oms.feign.portal.sysorganization; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysorganization.*; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeignFallback
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysOrganizationFeignFallback implements SysOrganizationFeign { + + + @Override + public ResultBean saveOrg(SysOrganizationDto dto) { + return null; + } + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(SysOrganizationQuery query) { + return null; + } + + @Override + public ResultBean> list() { + return null; + } + + @Override + public ResultBean> selectFirstOrgList() { + return null; + } + + @Override + public ResultBean> selectChildrenListBySid(String sid) { + return null; + } + + @Override + public ResultBean save(SysOrganizationDto dto) { + return null; + } + + @Override + public ResultBean update(SysOrganizationDto dto, String sid) { + return null; + } + + @Override + public ResultBean del(String ids) { + return null; + } + + @Override + public ResultBean delBySid(String sid) { + return null; + } + + @Override + public ResultBean fetch(String id) { + return null; + } + + @Override + public ResultBean fetchBySid(String sid) { + return null; + } + + @Override + public ResultBean> selectAppOrganization(String sid) { + return null; + } + + @Override + public ResultBean> selectListOrg() { + return null; + } + + @Override + public ResultBean> getListOrg() { + return null; + } + + @Override + public ResultBean> getListOrgByBrand(String orgSid) { + return null; + } + + @Override + public ResultBean> getListOrgByBrandSid(String orgSid, String brandSid) { + return null; + } + + @Override + public ResultBean> getListOrgByBrandSidNo(String orgSid, String brandSid) { + return null; + } + + @Override + public ResultBean> getListDeptByOrgSid(String orgSid) { + return null; + } + + @Override + public ResultBean getUseOrgByUserSid(String userSid) { + return null; + } + + @Override + public ResultBean selectBySid(String sid) { + return null; + } + + @Override + public ResultBean>> selectUseOrgSidBySid(String sid) { + return null; + } + + @Override + public ResultBean> selectListOne() { + return null; + } + + @Override + public ResultBean getQrCode(String sid) { + return null; + } + + @Override + public ResultBean getOrgSid(String sid) { + return null; + } + + @Override + public ResultBean> selectOrgList(SysOrganizationListQuery query) { + return null; + } + + @Override + public ResultBean> selectOrgList2(SysOrganizationListQuery query) { + return null; + } + + @Override + public ResultBean> selectOrgLists(SysOrganizationListQuery query) { + return null; + } + + @Override + public ResultBean selectByPSid(String sid, String name) { + return null; + } + + @Override + public ResultBean> selectOrgSidList() { + return null; + } + + @Override + public ResultBean> selectOrgByPSid(String psid) { + return null; + } + + @Override + public ResultBean selectByOrgSidPath(String orgSidPath) { + return null; + } + + @Override + public ResultBean selectByOrgCode(String orgCode) { + return null; + } + + @Override + public ResultBean selectByCJOrgPath(String orgPath) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeign.java new file mode 100644 index 0000000..40cf0ee --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeign.java @@ -0,0 +1,93 @@ +package com.yxt.oms.feign.portal.syspost; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.syspost.SysPostDto; +import com.yxt.wms.biz.func.syspost.SysPostListVo; +import com.yxt.wms.biz.func.syspost.SysPostQuery; +import com.yxt.wms.biz.func.syspost.SysPostVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostFeign.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostFeign
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "岗位") +@FeignClient( + contextId = "ss-common-portal-SysPost", + name = "ss-common-portal", + path = "apiadmin/syspost", + fallback = SysPostFeignFallback.class) +public interface SysPostFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysPostQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysPostDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("删除记录") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据部门sid获取岗位列表") + @GetMapping("/fetchByOrgSid/{orgSid}") + public ResultBean> fetchByOrgSid(@PathVariable("orgSid") String orgSid); + + @ApiOperation("根据部门sid获取岗位编号") + @GetMapping("/fetchByOrgSidPostCode/{orgSid}") + public ResultBean fetchByOrgSidPostCode(); + + /** + * 查询岗位列表 + * + * @return + */ + @ApiOperation("查询岗位列表") + @GetMapping("/selectList") + public ResultBean> selectList(); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeignFallback.java new file mode 100644 index 0000000..74865f5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/syspost/SysPostFeignFallback.java @@ -0,0 +1,89 @@ +package com.yxt.oms.feign.portal.syspost; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.syspost.SysPostDto; +import com.yxt.wms.biz.func.syspost.SysPostListVo; +import com.yxt.wms.biz.func.syspost.SysPostQuery; +import com.yxt.wms.biz.func.syspost.SysPostVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostFeignFallback
+ * Description: 岗位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysPostFeignFallback implements SysPostFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(SysPostQuery query) { + return null; + } + + @Override + public ResultBean> list() { + return null; + } + + @Override + public ResultBean save(SysPostDto dto) { + return null; + } + + @Override + public ResultBean update(SysPostDto dto, String sid) { + return null; + } + + @Override + public ResultBean del(String ids) { + return null; + } + + @Override + public ResultBean delBySids(String sids) { + return null; + } + + @Override + public ResultBean fetch(String id) { + return null; + } + + @Override + public ResultBean fetchBySid(String sid) { + return null; + } + + @Override + public ResultBean> fetchByOrgSid(String orgSid) { + return null; + } + + @Override + public ResultBean fetchByOrgSidPostCode() { + return null; + } + + @Override + public ResultBean> selectList() { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java new file mode 100644 index 0000000..c2247c5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java @@ -0,0 +1,86 @@ +package com.yxt.oms.feign.portal.sysrole; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysrole.SysRoleDto; +import com.yxt.wms.biz.func.sysrole.SysRoleQuery; +import com.yxt.wms.biz.func.sysrole.SysRoleVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "角色") +@FeignClient( + contextId = "ss-common-portal-SysRole", + name = "ss-common-portal", + path = "/apiadmin/sysrole", + fallback = SysRoleFeignFallback.class) +public interface SysRoleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysRoleQuery query); + @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色") + @PostMapping("/listAllByUserSid/{userSid}") + public ResultBean> listAllByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation("根据用户sid查询用户的角色列表") + @PostMapping("/fetchByUserSid/{userSid}") + public ResultBean> fetchByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysRoleDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysRoleDto dto,@PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("删除记录根据sids") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("获取一条记录根据sid") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + @PostMapping("/setIsEnable/{sid}/{isEnable}") + @ResponseBody + @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用") + public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable); + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java new file mode 100644 index 0000000..f0f6172 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java @@ -0,0 +1,88 @@ +package com.yxt.oms.feign.portal.sysrole; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysrole.SysRoleDto; +import com.yxt.wms.biz.func.sysrole.SysRoleQuery; +import com.yxt.wms.biz.func.sysrole.SysRoleVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysRoleFeignFallback implements SysRoleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(SysRoleQuery query) { + return null; + } + + @Override + public ResultBean> listAllByUserSid(String userSid) { + return null; + } + + @Override + public ResultBean> fetchByUserSid(String userSid) { + return null; + } + + @Override + public ResultBean> list() { + return null; + } + + @Override + public ResultBean save(SysRoleDto dto) { + return null; + } + + @Override + public ResultBean update(SysRoleDto dto, String sid) { + return null; + } + + @Override + public ResultBean del(String ids) { + return null; + } + + @Override + public ResultBean delBySids(String sids) { + return null; + } + + @Override + public ResultBean fetch(String id) { + return null; + } + + @Override + public ResultBean fetchBySid(String sid) { + return null; + } + + @Override + public ResultBean setIsEnable(String sid, String isEnable) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java new file mode 100644 index 0000000..ef963e9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeign.java @@ -0,0 +1,35 @@ +package com.yxt.oms.feign.portal.sysroleauthorize; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFeign.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeign
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "资源表") +@FeignClient( + contextId = "ss-common-portal-SysOrgAuthorize", + name = "ss-common-portal", + path = "apiadmin/sysroleauthorize", + fallback = SysRoleAuthorizeFeignFallback.class) +public interface SysRoleAuthorizeFeign { + + @ApiOperation("修改角色的菜单配置") + @PostMapping("/updateRoleAndMenu") + public ResultBean updateRoleAndMenu(@RequestBody SysRoleAuthorizeDto dto); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java new file mode 100644 index 0000000..2171d23 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysroleauthorize/SysRoleAuthorizeFeignFallback.java @@ -0,0 +1,28 @@ +package com.yxt.oms.feign.portal.sysroleauthorize; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeDto; +import org.springframework.stereotype.Component; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeignFallback
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysRoleAuthorizeFeignFallback implements SysRoleAuthorizeFeign { + + + @Override + public ResultBean updateRoleAndMenu(SysRoleAuthorizeDto dto) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java new file mode 100644 index 0000000..5dfd7ab --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -0,0 +1,25 @@ +package com.yxt.oms.feign.portal.sysstafforg; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @description: 人员与机构 + * @author: dimengzhe + * @date: 2024/3/6 + **/ +@FeignClient( + contextId = "ss-common-portal-SysStaffOrg", + name = "ss-common-portal", + path = "/apiadmin/sysstafforg") +public interface SysStaffOrgFeign { + + @GetMapping("/getOrgSidByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/OrgList.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/OrgList.java new file mode 100644 index 0000000..0e77cc5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/OrgList.java @@ -0,0 +1,21 @@ +package com.yxt.oms.feign.portal.sysuser; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/21 9:26 + * @Description + */ +@Data +public class OrgList implements Vo { + private static final long serialVersionUID = -2867882982421321776L; + + private String orgName; + private String orgPath; + + private String deptName; + + private String deptSid; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysOrganization.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysOrganization.java new file mode 100644 index 0000000..7f7591e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysOrganization.java @@ -0,0 +1,87 @@ +package com.yxt.oms.feign.portal.sysuser; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganization.java
+ * Class: SysOrganization
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "组织机构表", description = "组织机构表") +@TableName("sys_organization") +@Data +public class SysOrganization extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + +// @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") +// private String orgShortName; + + @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)") + private String regionDivision; + + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + + @ApiModelProperty("组织简称") + private String orgAbbre; + + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + + @ApiModelProperty("管理层级key") + private String orgLevelKey; + + @ApiModelProperty("管理层级value") + private String orgLevelValue; + + @ApiModelProperty("其他编码") + private String otherCode; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysStaffOrgVo.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysStaffOrgVo.java new file mode 100644 index 0000000..11132c2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysStaffOrgVo.java @@ -0,0 +1,49 @@ +package com.yxt.oms.feign.portal.sysuser; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgVo.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo
+ * Description: 员工部门关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工部门关联表 视图数据对象", description = "员工部门关联表 视图数据对象") +@Data +public class SysStaffOrgVo implements Vo { + + + @ApiModelProperty("部门sid") + private String orgSid; + + @ApiModelProperty("部门名称") + private String orgName; + + @ApiModelProperty("人员sid") + private String staffSid; + +// @ApiModelProperty("部门路径") +// private String orgSidPath; +// +// @ApiModelProperty("部门名称路径") +// private String orgNamePath; + + @ApiModelProperty("管理类型：1、主管。2、分管。3、员工") + private String manageType; + @ApiModelProperty("员工姓名") + private String staffName; + @ApiModelProperty("员工手机号") + private String mobile; + private String type="2"; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java new file mode 100644 index 0000000..46227d9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java @@ -0,0 +1,48 @@ +package com.yxt.oms.feign.portal.sysuser; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserDto.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserDto
+ * Description: 用户表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象") +@Data +public class SysUserDto implements Dto { + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("用户类型:1员工、2客户、3供应商") + private Integer userType; + @ApiModelProperty(value = "姓名", required = true) + @NotBlank(message = "姓名不能为空") + private String name; + @ApiModelProperty(value = "验证码", required = true) + @NotBlank(message = "验证码不能为空") + private String code; + @ApiModelProperty(value = "部门sid") + private String deptSid; + @ApiModelProperty(value = "岗位sid") + private String postSid; + private String companyName;//公司名 + private String contacts;//联系人 + private String address;//省/市/区 + private String userSid; + private String password; + private String orgSid; + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java new file mode 100644 index 0000000..b6e5b66 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java @@ -0,0 +1,86 @@ +package com.yxt.oms.feign.portal.sysuser; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.feign.portal.privilege.PrivilegeQuery; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; + +/** + * @description: + * @author: wangpengfei + * @date: 2024/4/12 + **/ +@FeignClient( + contextId = "ss-common-portal-SysUser", + name = "ss-common-portal", + path = "/apiadmin/sysuser", + fallback = SysUserFeignFallback.class) +public interface SysUserFeign { + + @PostMapping("/login") + @ResponseBody + @ApiOperation(value = "3、登录") + @ApiOperationSupport(order = 30) + public ResultBean login(@RequestBody SysUserQuery userQuery); + @PostMapping("/register") + @ResponseBody + @ApiOperation(value = "3、注册") + @ApiOperationSupport(order = 30) + public ResultBean register(@RequestBody SysUserDto dto); + @PostMapping("/loginDetails") + @ResponseBody + @ApiOperation(value = "获取登录人") + @ApiOperationSupport(order = 30) + public ResultBean loginDetails(HttpServletRequest httpServletRequest); + + @PostMapping("/sendMessageCode") + @ResponseBody + @ApiOperation(value = "3、获取注册码") + @ApiOperationSupport(order = 30) + public ResultBean sendMessageCode(@RequestParam("mobile") String mobile); + + @PostMapping("/sendMessageLogin") + @ResponseBody + @ApiOperation(value = "3、获取登录码") + @ApiOperationSupport(order = 30) + public ResultBean sendMessageLogin(@RequestParam("mobile") String mobile); + @PostMapping("/sendMessageUpdate") + @ResponseBody + @ApiOperation(value = "3、获取登录码") + @ApiOperationSupport(order = 30) + public ResultBean sendMessageUpdate(@RequestParam("mobile") String mobile); + @ApiOperation("根据条件分页查询数据的列表 ") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @PostMapping("/bindOrganization") + @ResponseBody + @ApiOperation(value = "绑定组织") + @ApiOperationSupport(order = 30) + public ResultBean bindOrganization(@RequestBody SysUserDto dto); + + @PostMapping("/selOrganization") + @ResponseBody + @ApiOperation(value = "选择所登录的组织") + @ApiOperationSupport(order = 30) + public ResultBean selOrganization(@RequestBody SysUserDto dto); + + @PostMapping("/setIsEnable/{sid}/{isEnable}") + @ResponseBody + @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用") + public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable); + @ApiOperation(value = "查询角色权限的层级获取权限id") + @PostMapping(value = "/selectPrivilegeLevel") + ResultBean selectPrivilegeLevel(@RequestBody PrivilegeQuery query); + + @ApiOperation("根据sid获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java new file mode 100644 index 0000000..1011874 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java @@ -0,0 +1,79 @@ +package com.yxt.oms.feign.portal.sysuser; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@Component +public class SysUserFeignFallback implements SysUserFeign { + + + @Override + public ResultBean login(SysUserQuery userQuery) { + return null; + } + + @Override + public ResultBean register(SysUserDto dto) { + return null; + } + + @Override + public ResultBean loginDetails(HttpServletRequest httpServletRequest) { + return null; + } + + @Override + public ResultBean sendMessageCode(String mobile) { + return null; + } + + @Override + public ResultBean sendMessageLogin(String mobile) { + return null; + } + + @Override + public ResultBean sendMessageUpdate(String mobile) { + return null; + } + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean bindOrganization(SysUserDto dto) { + return null; + } + + @Override + public ResultBean selOrganization(SysUserDto dto) { + return null; + } + + @Override + public ResultBean setIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean selectPrivilegeLevel(PrivilegeQuery query) { + return null; + } + + @Override + public ResultBean fetchBySid(String sid) { + return null; + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserQuery.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserQuery.java new file mode 100644 index 0000000..4e7461e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserQuery.java @@ -0,0 +1,58 @@ +package com.yxt.oms.feign.portal.sysuser; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserQuery.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserQuery
+ * Description: 用户表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表 查询条件", description = "用户表 查询条件") +@Data +public class SysUserQuery implements Query { + + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("用户名称") + private String userName; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("部门名称") + private String orgName; + + @ApiModelProperty("密码（加密或签名后）") + private String password; + + @ApiModelProperty("用户登录时随机生成身份验证字符串") + private String token; + @ApiModelProperty("用户登录时随机生成的验证码字符串") + private String verifyCode; + private String uuid; + + @ApiModelProperty("手机登录唯一标识，手机与用户绑定字段") + private String appId; + @ApiModelProperty("手机登录类型：1、密码登录2、验证码登录") + private String type; + @ApiModelProperty(value = "是否是测试",example = "false") + private Boolean isTest; + private String companyName;//公司名 + private String contacts;//联系人 + private String provinces;//省 + private String cities;//市 + private String districts;//区 + private String orgSid;//组织 + private String sourceSid;//资源 +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java new file mode 100644 index 0000000..c68c0bf --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java @@ -0,0 +1,101 @@ +package com.yxt.oms.feign.portal.sysuser; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserVo.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserVo
+ * Description: 用户表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象") +@Data +@NoArgsConstructor +public class SysUserVo implements Vo { + private static final long serialVersionUID = 2415131854581950721L; + @ApiModelProperty("部门sid") + private String departmentSid; + @ApiModelProperty("部门名称") + private String departmentName; + @ApiModelProperty("上级部门名称-本级部门名称 岗位名称") + @JsonProperty("pNameAndDepartmentNameAndPostName") + private String pNameAndDepartmentNameAndPostName; + @ApiModelProperty("岗位名称") + private String postName; + @ApiModelProperty("岗位Sid") + private String postSid; + @ApiModelProperty("单位sid") + private String organizationSid; + @ApiModelProperty("单位名称") + private String organizationName; + @ApiModelProperty("用户姓名") + private String name; + @ApiModelProperty("登录名，登录名不能相同") + private String userName; + + @ApiModelProperty("id") + private Integer id; + @ApiModelProperty("用户sid") + private String sid; + @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员") + private String isAdmin; + @ApiModelProperty("角色名称") + private String roleName; + + @ApiModelProperty("关联的人员sid") + private String staffSid; + + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty(value = "禁用状态") + private String isEnable; + + @ApiModelProperty("用户类型:1员工、2客户、3供应商") + private String userType; + @ApiModelProperty("用户类型:1、2、3") + private String userTypeKey; + @ApiModelProperty("用户头像") + private String headImage; + @ApiModelProperty("组织名称") + private String orgNamePath; + @ApiModelProperty("组织sid") + private String orgSidPath; + @ApiModelProperty(value = "token") + private String token; + @ApiModelProperty(value = "角色sids") + private List roleSids = new ArrayList<>(); + + private List orgList = new ArrayList<>(); + @ApiModelProperty("默认的组织机构sid全路径") + private String defaultOrgPath; + @ApiModelProperty("默认的组织机构名称全路径") + private String defaultOrgPathName; + + private String defaultDeptName; + private String defaultDeptSid; + + @ApiModelProperty("是否需要更换密码") + private Boolean needResetPsd; + @ApiModelProperty("工号") + private String jobNumber; + List sysOrganizations; + List sysOrganizationVos; + private String orgSid; + private String orgName; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeign.java new file mode 100644 index 0000000..49a3771 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeign.java @@ -0,0 +1,81 @@ +package com.yxt.oms.feign.portal.sysuserrole; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysuserrole.SysUserRoleDto; +import com.yxt.wms.biz.func.sysuserrole.SysUserRoleQuery; +import com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "用户与角色关联表") +@FeignClient( + contextId = "ss-common-portal-SysUserRole", + name = "ss-common-portal", + path = "/apiadmin/sysuserrole", + fallback = SysUserRoleFeignFallback.class) +public interface SysUserRoleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysUserRoleQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysUserRoleDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update") + public ResultBean update(@RequestBody SysUserRoleDto dto); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("根据用户sid和角色sid删除记录") + @GetMapping("/delByUserSidAndRoleSid/{userSid}/{roleSid}") + public ResultBean delByUserSidAndRoleSid(@PathVariable("userSid")String userSid, + @PathVariable("roleSid")String roleSid); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("根据用户sid查询用户角色sid列表") + @GetMapping("/getUserRoleSidByUserSid/{userSid}") + public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation("根据角色sid查询用户id列表") + @GetMapping("/getUserIdListByRoleSid") + public ResultBean> getUserIdListByRoleSid(@RequestParam("roleList") List roleList); + + @ApiOperation("查询用户的角色") + @GetMapping("/selectByUserSid") + ResultBean> selectByUserSid(@RequestParam("userSid") String userSid); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java new file mode 100644 index 0000000..1c546ae --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuserrole/SysUserRoleFeignFallback.java @@ -0,0 +1,83 @@ +package com.yxt.oms.feign.portal.sysuserrole; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysuserrole.SysUserRoleDto; +import com.yxt.wms.biz.func.sysuserrole.SysUserRoleQuery; +import com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeignFallback
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysUserRoleFeignFallback implements SysUserRoleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(SysUserRoleQuery query) { + return null; + } + + @Override + public ResultBean> list() { + return null; + } + + @Override + public ResultBean save(SysUserRoleDto dto) { + return null; + } + + @Override + public ResultBean update(SysUserRoleDto dto) { + return null; + } + + @Override + public ResultBean del(String ids) { + return null; + } + + @Override + public ResultBean delByUserSidAndRoleSid(String userSid, String roleSid) { + return null; + } + + @Override + public ResultBean fetch(String id) { + return null; + } + + @Override + public ResultBean> getUserRoleSidByUserSid(String userSid) { + return null; + } + + @Override + public ResultBean> getUserIdListByRoleSid(List roleList) { + return null; + } + + @Override + public ResultBean> selectByUserSid(String userSid) { + return null; + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java new file mode 100644 index 0000000..4233000 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java @@ -0,0 +1,35 @@ +package com.yxt.oms.feign.purchase.purchasebill; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.purchasebill.PurchaseBillDetailsVo; +import com.yxt.oms.biz.func.purchasebill.PurchaseBillDto; +import com.yxt.oms.biz.func.purchasebill.PurchaseBillQuery; +import com.yxt.oms.biz.func.purchasebill.PurchaseBillVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +@FeignClient( + contextId = "ss-common-purchase-PurchaseBill", + name = "ss-common-purchase", + path = "/apiadmin/purchasebill") +public interface PurchaseBillFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchaseBillDto dto); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file