diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java index 3e3f3a6..acd7186 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java @@ -31,7 +31,7 @@ public class HwAboutUsInfoController extends BaseController /** * 查询关于我们信息列表 */ - @RequiresPermissions("portal:aboutUsInfo:list") + //@RequiresPermissions("portalaboutUsInfo:list") @GetMapping("/list") public TableDataInfo list(HwAboutUsInfo hwAboutUsInfo) { @@ -43,7 +43,7 @@ public class HwAboutUsInfoController extends BaseController /** * 导出关于我们信息列表 */ - @RequiresPermissions("portal:aboutUsInfo:export") + //@RequiresPermissions("portalaboutUsInfo:export") @Log(title = "关于我们信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwAboutUsInfo hwAboutUsInfo) @@ -56,7 +56,7 @@ public class HwAboutUsInfoController extends BaseController /** * 获取关于我们信息详细信息 */ - @RequiresPermissions("portal:aboutUsInfo:query") + //@RequiresPermissions("portalaboutUsInfo:query") @GetMapping(value = "/{aboutUsInfoId}") public AjaxResult getInfo(@PathVariable("aboutUsInfoId") Long aboutUsInfoId) { @@ -66,7 +66,7 @@ public class HwAboutUsInfoController extends BaseController /** * 新增关于我们信息 */ - @RequiresPermissions("portal:aboutUsInfo:add") + //@RequiresPermissions("portalaboutUsInfo:add") @Log(title = "关于我们信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwAboutUsInfo hwAboutUsInfo) @@ -77,7 +77,7 @@ public class HwAboutUsInfoController extends BaseController /** * 修改关于我们信息 */ - @RequiresPermissions("portal:aboutUsInfo:edit") + //@RequiresPermissions("portalaboutUsInfo:edit") @Log(title = "关于我们信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwAboutUsInfo hwAboutUsInfo) @@ -88,7 +88,7 @@ public class HwAboutUsInfoController extends BaseController /** * 删除关于我们信息 */ - @RequiresPermissions("portal:aboutUsInfo:remove") + //@RequiresPermissions("portalaboutUsInfo:remove") @Log(title = "关于我们信息", businessType = BusinessType.DELETE) @DeleteMapping("/{aboutUsInfoIds}") public AjaxResult remove(@PathVariable Long[] aboutUsInfoIds) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java index a59c987..df72f5c 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java @@ -31,7 +31,7 @@ public class HwAboutUsInfoDetailController extends BaseController /** * 查询关于我们信息明细列表 */ - @RequiresPermissions("portal:aboutUsInfoDetail:list") + //@RequiresPermissions("portalaboutUsInfoDetail:list") @GetMapping("/list") public TableDataInfo list(HwAboutUsInfoDetail hwAboutUsInfoDetail) { @@ -43,7 +43,7 @@ public class HwAboutUsInfoDetailController extends BaseController /** * 导出关于我们信息明细列表 */ - @RequiresPermissions("portal:aboutUsInfoDetail:export") + //@RequiresPermissions("portalaboutUsInfoDetail:export") @Log(title = "关于我们信息明细", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwAboutUsInfoDetail hwAboutUsInfoDetail) @@ -56,7 +56,7 @@ public class HwAboutUsInfoDetailController extends BaseController /** * 获取关于我们信息明细详细信息 */ - @RequiresPermissions("portal:aboutUsInfoDetail:query") + //@RequiresPermissions("portalaboutUsInfoDetail:query") @GetMapping(value = "/{usInfoDetailId}") public AjaxResult getInfo(@PathVariable("usInfoDetailId") Long usInfoDetailId) { @@ -66,7 +66,7 @@ public class HwAboutUsInfoDetailController extends BaseController /** * 新增关于我们信息明细 */ - @RequiresPermissions("portal:aboutUsInfoDetail:add") + //@RequiresPermissions("portalaboutUsInfoDetail:add") @Log(title = "关于我们信息明细", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwAboutUsInfoDetail hwAboutUsInfoDetail) @@ -77,7 +77,7 @@ public class HwAboutUsInfoDetailController extends BaseController /** * 修改关于我们信息明细 */ - @RequiresPermissions("portal:aboutUsInfoDetail:edit") + //@RequiresPermissions("portalaboutUsInfoDetail:edit") @Log(title = "关于我们信息明细", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwAboutUsInfoDetail hwAboutUsInfoDetail) @@ -88,7 +88,7 @@ public class HwAboutUsInfoDetailController extends BaseController /** * 删除关于我们信息明细 */ - @RequiresPermissions("portal:aboutUsInfoDetail:remove") + //@RequiresPermissions("portalaboutUsInfoDetail:remove") @Log(title = "关于我们信息明细", businessType = BusinessType.DELETE) @DeleteMapping("/{usInfoDetailIds}") public AjaxResult remove(@PathVariable Long[] usInfoDetailIds) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java index 10c39d1..9dd6faf 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java @@ -31,7 +31,7 @@ public class HwContactUsInfoController extends BaseController /** * 查询联系我们信息列表 */ - @RequiresPermissions("portal:contactUsInfo:list") + //@RequiresPermissions("portalcontactUsInfo:list") @GetMapping("/list") public TableDataInfo list(HwContactUsInfo hwContactUsInfo) { @@ -43,7 +43,7 @@ public class HwContactUsInfoController extends BaseController /** * 导出联系我们信息列表 */ - @RequiresPermissions("portal:contactUsInfo:export") + //@RequiresPermissions("portalcontactUsInfo:export") @Log(title = "联系我们信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwContactUsInfo hwContactUsInfo) @@ -56,7 +56,7 @@ public class HwContactUsInfoController extends BaseController /** * 获取联系我们信息详细信息 */ - @RequiresPermissions("portal:contactUsInfo:query") + //@RequiresPermissions("portalcontactUsInfo:query") @GetMapping(value = "/{contactUsInfoId}") public AjaxResult getInfo(@PathVariable("contactUsInfoId") Long contactUsInfoId) { @@ -66,7 +66,7 @@ public class HwContactUsInfoController extends BaseController /** * 新增联系我们信息 */ - @RequiresPermissions("portal:contactUsInfo:add") + //@RequiresPermissions("portalcontactUsInfo:add") @Log(title = "联系我们信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwContactUsInfo hwContactUsInfo) @@ -77,7 +77,7 @@ public class HwContactUsInfoController extends BaseController /** * 修改联系我们信息 */ - @RequiresPermissions("portal:contactUsInfo:edit") + //@RequiresPermissions("portalcontactUsInfo:edit") @Log(title = "联系我们信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwContactUsInfo hwContactUsInfo) @@ -88,7 +88,7 @@ public class HwContactUsInfoController extends BaseController /** * 删除联系我们信息 */ - @RequiresPermissions("portal:contactUsInfo:remove") + //@RequiresPermissions("portalcontactUsInfo:remove") @Log(title = "联系我们信息", businessType = BusinessType.DELETE) @DeleteMapping("/{contactUsInfoIds}") public AjaxResult remove(@PathVariable Long[] contactUsInfoIds) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java index c6961b2..9922a23 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java @@ -36,7 +36,7 @@ public class HwPortalConfigController extends BaseController /** * 查询门户网站配置列表 */ - @RequiresPermissions("portal:portalConfig:list") + //@RequiresPermissions("portalportalConfig:list") @GetMapping("/list") public TableDataInfo list(HwPortalConfig hwPortalConfig) { @@ -48,7 +48,7 @@ public class HwPortalConfigController extends BaseController /** * 导出门户网站配置列表 */ - @RequiresPermissions("portal:portalConfig:export") + //@RequiresPermissions("portalportalConfig:export") @Log(title = "门户网站配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwPortalConfig hwPortalConfig) @@ -61,7 +61,7 @@ public class HwPortalConfigController extends BaseController /** * 获取门户网站配置详细信息 */ - @RequiresPermissions("portal:portalConfig:query") + //@RequiresPermissions("portalportalConfig:query") @GetMapping(value = "/{portalConfigId}") public AjaxResult getInfo(@PathVariable("portalConfigId") Long portalConfigId) { @@ -71,7 +71,7 @@ public class HwPortalConfigController extends BaseController /** * 新增门户网站配置 */ - @RequiresPermissions("portal:portalConfig:add") + //@RequiresPermissions("portalportalConfig:add") @Log(title = "门户网站配置", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwPortalConfig hwPortalConfig) @@ -82,7 +82,7 @@ public class HwPortalConfigController extends BaseController /** * 修改门户网站配置 */ - @RequiresPermissions("portal:portalConfig:edit") + //@RequiresPermissions("portalportalConfig:edit") @Log(title = "门户网站配置", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwPortalConfig hwPortalConfig) @@ -93,7 +93,7 @@ public class HwPortalConfigController extends BaseController /** * 删除门户网站配置 */ - @RequiresPermissions("portal:portalConfig:remove") + //@RequiresPermissions("portalportalConfig:remove") @Log(title = "门户网站配置", businessType = BusinessType.DELETE) @DeleteMapping("/{portalConfigIds}") public AjaxResult remove(@PathVariable Long[] portalConfigIds) @@ -105,7 +105,7 @@ public class HwPortalConfigController extends BaseController /** * 获取门户网站配置树列表 */ - @RequiresPermissions("portal:portalConfig:list") + //@RequiresPermissions("portalportalConfig:list") @GetMapping("/portalConfigTypeTree") public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) { diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java index d181403..ea67452 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java @@ -30,7 +30,7 @@ public class HwPortalConfigTypeController extends BaseController /** * 查询门户网站配置类型列表 */ - @RequiresPermissions("portal:portalConfigType:list") + //@RequiresPermissions("portalportalConfigType:list") @GetMapping("/list") public AjaxResult list(HwPortalConfigType hwPortalConfigType) { @@ -41,7 +41,7 @@ public class HwPortalConfigTypeController extends BaseController /** * 导出门户网站配置类型列表 */ - @RequiresPermissions("portal:portalConfigType:export") + //@RequiresPermissions("portalportalConfigType:export") @Log(title = "门户网站配置类型", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwPortalConfigType hwPortalConfigType) @@ -54,7 +54,7 @@ public class HwPortalConfigTypeController extends BaseController /** * 获取门户网站配置类型详细信息 */ - @RequiresPermissions("portal:portalConfigType:query") + //@RequiresPermissions("portalportalConfigType:query") @GetMapping(value = "/{configTypeId}") public AjaxResult getInfo(@PathVariable("configTypeId") Long configTypeId) { @@ -64,7 +64,7 @@ public class HwPortalConfigTypeController extends BaseController /** * 新增门户网站配置类型 */ - @RequiresPermissions("portal:portalConfigType:add") + //@RequiresPermissions("portalportalConfigType:add") @Log(title = "门户网站配置类型", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwPortalConfigType hwPortalConfigType) @@ -75,7 +75,7 @@ public class HwPortalConfigTypeController extends BaseController /** * 修改门户网站配置类型 */ - @RequiresPermissions("portal:portalConfigType:edit") + //@RequiresPermissions("portalportalConfigType:edit") @Log(title = "门户网站配置类型", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwPortalConfigType hwPortalConfigType) @@ -86,7 +86,7 @@ public class HwPortalConfigTypeController extends BaseController /** * 删除门户网站配置类型 */ - @RequiresPermissions("portal:portalConfigType:remove") + //@RequiresPermissions("portalportalConfigType:remove") @Log(title = "门户网站配置类型", businessType = BusinessType.DELETE) @DeleteMapping("/{configTypeIds}") public AjaxResult remove(@PathVariable Long[] configTypeIds) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java index f544f2c..1279839 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java @@ -36,7 +36,7 @@ public class HwProductCaseInfoController extends BaseController /** * 查询案例内容列表 */ - @RequiresPermissions("portal:productCaseInfo:list") + //@RequiresPermissions("portalproductCaseInfo:list") @GetMapping("/list") public TableDataInfo list(HwProductCaseInfo hwProductCaseInfo) { @@ -48,7 +48,7 @@ public class HwProductCaseInfoController extends BaseController /** * 导出案例内容列表 */ - @RequiresPermissions("portal:productCaseInfo:export") + //@RequiresPermissions("portalproductCaseInfo:export") @Log(title = "案例内容", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwProductCaseInfo hwProductCaseInfo) @@ -61,7 +61,7 @@ public class HwProductCaseInfoController extends BaseController /** * 获取案例内容详细信息 */ - @RequiresPermissions("portal:productCaseInfo:query") + //@RequiresPermissions("portalproductCaseInfo:query") @GetMapping(value = "/{caseInfoId}") public AjaxResult getInfo(@PathVariable("caseInfoId") Long caseInfoId) { @@ -71,7 +71,7 @@ public class HwProductCaseInfoController extends BaseController /** * 新增案例内容 */ - @RequiresPermissions("portal:productCaseInfo:add") + //@RequiresPermissions("portalproductCaseInfo:add") @Log(title = "案例内容", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwProductCaseInfo hwProductCaseInfo) @@ -82,7 +82,7 @@ public class HwProductCaseInfoController extends BaseController /** * 修改案例内容 */ - @RequiresPermissions("portal:productCaseInfo:edit") + //@RequiresPermissions("portalproductCaseInfo:edit") @Log(title = "案例内容", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwProductCaseInfo hwProductCaseInfo) @@ -93,7 +93,7 @@ public class HwProductCaseInfoController extends BaseController /** * 删除案例内容 */ - @RequiresPermissions("portal:productCaseInfo:remove") + //@RequiresPermissions("portalproductCaseInfo:remove") @Log(title = "案例内容", businessType = BusinessType.DELETE) @DeleteMapping("/{caseInfoIds}") public AjaxResult remove(@PathVariable Long[] caseInfoIds) @@ -108,7 +108,7 @@ public class HwProductCaseInfoController extends BaseController /** * 获取门户网站配置树列表 */ - @RequiresPermissions("portal:productCaseInfo:list") + //@RequiresPermissions("portalproductCaseInfo:list") @GetMapping("/portalConfigTypeTree") public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) { diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java index f39f20c..37f40f5 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java @@ -37,7 +37,7 @@ public class HwProductInfoController extends BaseController /** * 查询产品信息配置列表 */ - @RequiresPermissions("portal:productInfo:list") + //@RequiresPermissions("portalproductInfo:list") @GetMapping("/list") public TableDataInfo list(HwProductInfo hwProductInfo) { @@ -49,7 +49,7 @@ public class HwProductInfoController extends BaseController /** * 导出产品信息配置列表 */ - @RequiresPermissions("portal:productInfo:export") + //@RequiresPermissions("portalproductInfo:export") @Log(title = "产品信息配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwProductInfo hwProductInfo) @@ -62,7 +62,7 @@ public class HwProductInfoController extends BaseController /** * 获取产品信息配置详细信息 */ - @RequiresPermissions("portal:productInfo:query") + //@RequiresPermissions("portalproductInfo:query") @GetMapping(value = "/{productInfoId}") public AjaxResult getInfo(@PathVariable("productInfoId") Long productInfoId) { @@ -72,7 +72,7 @@ public class HwProductInfoController extends BaseController /** * 新增产品信息配置 */ - @RequiresPermissions("portal:productInfo:add") + //@RequiresPermissions("portalproductInfo:add") @Log(title = "产品信息配置", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwProductInfo hwProductInfo) @@ -83,7 +83,7 @@ public class HwProductInfoController extends BaseController /** * 修改产品信息配置 */ - @RequiresPermissions("portal:productInfo:edit") + //@RequiresPermissions("portalproductInfo:edit") @Log(title = "产品信息配置", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwProductInfo hwProductInfo) @@ -94,7 +94,7 @@ public class HwProductInfoController extends BaseController /** * 删除产品信息配置 */ - @RequiresPermissions("portal:productInfo:remove") + //@RequiresPermissions("portalproductInfo:remove") @Log(title = "产品信息配置", businessType = BusinessType.DELETE) @DeleteMapping("/{productInfoIds}") public AjaxResult remove(@PathVariable Long[] productInfoIds) @@ -109,7 +109,7 @@ public class HwProductInfoController extends BaseController /** * 获取门户网站配置树列表 */ - @RequiresPermissions("portal:productInfo:list") + //@RequiresPermissions("portalproductInfo:list") @GetMapping("/portalConfigTypeTree") public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) { diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java index 772d3c0..bff150f 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java @@ -30,7 +30,7 @@ public class HwProductInfoDetailController extends BaseController /** * 查询产品信息明细配置列表 */ - @RequiresPermissions("portal:productInfoDetail:list") + //@RequiresPermissions("portalproductInfoDetail:list") @GetMapping("/list") public AjaxResult list(HwProductInfoDetail hwProductInfoDetail) { @@ -41,7 +41,7 @@ public class HwProductInfoDetailController extends BaseController /** * 导出产品信息明细配置列表 */ - @RequiresPermissions("portal:productInfoDetail:export") + //@RequiresPermissions("portalproductInfoDetail:export") @Log(title = "产品信息明细配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwProductInfoDetail hwProductInfoDetail) @@ -54,7 +54,7 @@ public class HwProductInfoDetailController extends BaseController /** * 获取产品信息明细配置详细信息 */ - @RequiresPermissions("portal:productInfoDetail:query") + //@RequiresPermissions("portalproductInfoDetail:query") @GetMapping(value = "/{productInfoDetailId}") public AjaxResult getInfo(@PathVariable("productInfoDetailId") Long productInfoDetailId) { @@ -64,7 +64,7 @@ public class HwProductInfoDetailController extends BaseController /** * 新增产品信息明细配置 */ - @RequiresPermissions("portal:productInfoDetail:add") + //@RequiresPermissions("portalproductInfoDetail:add") @Log(title = "产品信息明细配置", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwProductInfoDetail hwProductInfoDetail) @@ -75,7 +75,7 @@ public class HwProductInfoDetailController extends BaseController /** * 修改产品信息明细配置 */ - @RequiresPermissions("portal:productInfoDetail:edit") + //@RequiresPermissions("portalproductInfoDetail:edit") @Log(title = "产品信息明细配置", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwProductInfoDetail hwProductInfoDetail) @@ -86,7 +86,7 @@ public class HwProductInfoDetailController extends BaseController /** * 删除产品信息明细配置 */ - @RequiresPermissions("portal:productInfoDetail:remove") + //@RequiresPermissions("portalproductInfoDetail:remove") @Log(title = "产品信息明细配置", businessType = BusinessType.DELETE) @DeleteMapping("/{productInfoDetailIds}") public AjaxResult remove(@PathVariable Long[] productInfoDetailIds) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebController.java index d5be4ee..45b8519 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebController.java @@ -38,7 +38,7 @@ public class HwWebController extends BaseController /** * 查询haiwei官网json列表 */ - @RequiresPermissions("portal:hwWeb:list") + //@RequiresPermissions("portalhwWeb:list") @GetMapping("/list") public TableDataInfo list(HwWeb hwWeb) { @@ -50,7 +50,7 @@ public class HwWebController extends BaseController /** * 导出haiwei官网json列表 */ - @RequiresPermissions("portal:hwWeb:export") + //@RequiresPermissions("portalhwWeb:export") @Log(title = "haiwei官网json", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwWeb hwWeb) @@ -63,7 +63,7 @@ public class HwWebController extends BaseController /** * 获取haiwei官网json详细信息 */ - @RequiresPermissions("portal:hwWeb:query") + //@RequiresPermissions("portalhwWeb:query") @GetMapping(value = "/{webId}") public AjaxResult getInfo(@PathVariable("webId") Long webId) { @@ -73,7 +73,7 @@ public class HwWebController extends BaseController /** * 新增haiwei官网json */ - @RequiresPermissions("portal:hwWeb:add") + //@RequiresPermissions("portalhwWeb:add") @Log(title = "haiwei官网json", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwWeb hwWeb) @@ -84,7 +84,7 @@ public class HwWebController extends BaseController /** * 修改haiwei官网json */ - @RequiresPermissions("portal:hwWeb:edit") + //@RequiresPermissions("portalhwWeb:edit") @Log(title = "haiwei官网json", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwWeb hwWeb) @@ -95,7 +95,7 @@ public class HwWebController extends BaseController /** * 删除haiwei官网json */ - @RequiresPermissions("portal:hwWeb:remove") + //@RequiresPermissions("portalhwWeb:remove") @Log(title = "haiwei官网json", businessType = BusinessType.DELETE) @DeleteMapping("/{webIds}") public AjaxResult remove(@PathVariable Long[] webIds) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java index 5c01657..cb57b5d 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebMenuController.java @@ -20,11 +20,10 @@ import com.ruoyi.portal.service.IHwWebMenuService; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; /** * haiwei官网菜单Controller - * + * * @author zch * @date 2025-08-18 */ @@ -38,19 +37,18 @@ public class HwWebMenuController extends BaseController /** * 查询haiwei官网菜单列表 */ - @RequiresPermissions("portal:hwWebMenu:list") + //@RequiresPermissions("portalhwWebMenu:list") @GetMapping("/list") - public TableDataInfo list(HwWebMenu hwWebMenu) + public AjaxResult list(HwWebMenu hwWebMenu) { - startPage(); List list = hwWebMenuService.selectHwWebMenuList(hwWebMenu); - return getDataTable(list); + return success(list); } /** * 导出haiwei官网菜单列表 */ - @RequiresPermissions("portal:hwWebMenu:export") + //@RequiresPermissions("portalhwWebMenu:export") @Log(title = "haiwei官网菜单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, HwWebMenu hwWebMenu) @@ -63,7 +61,7 @@ public class HwWebMenuController extends BaseController /** * 获取haiwei官网菜单详细信息 */ - @RequiresPermissions("portal:hwWebMenu:query") + //@RequiresPermissions("portalhwWebMenu:query") @GetMapping(value = "/{webMenuId}") public AjaxResult getInfo(@PathVariable("webMenuId") Long webMenuId) { @@ -73,7 +71,7 @@ public class HwWebMenuController extends BaseController /** * 新增haiwei官网菜单 */ - @RequiresPermissions("portal:hwWebMenu:add") + //@RequiresPermissions("portalhwWebMenu:add") @Log(title = "haiwei官网菜单", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody HwWebMenu hwWebMenu) @@ -84,7 +82,7 @@ public class HwWebMenuController extends BaseController /** * 修改haiwei官网菜单 */ - @RequiresPermissions("portal:hwWebMenu:edit") + //@RequiresPermissions("portalhwWebMenu:edit") @Log(title = "haiwei官网菜单", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody HwWebMenu hwWebMenu) @@ -95,9 +93,9 @@ public class HwWebMenuController extends BaseController /** * 删除haiwei官网菜单 */ - @RequiresPermissions("portal:hwWebMenu:remove") + //@RequiresPermissions("portalhwWebMenu:remove") @Log(title = "haiwei官网菜单", businessType = BusinessType.DELETE) - @DeleteMapping("/{webMenuIds}") + @DeleteMapping("/{webMenuIds}") public AjaxResult remove(@PathVariable Long[] webMenuIds) { return toAjax(hwWebMenuService.deleteHwWebMenuByWebMenuIds(webMenuIds)); diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java index b89425e..4cfa4d2 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java @@ -32,6 +32,8 @@ public class HwWebMenu extends BaseEntity @Excel(name = "状态") private String status; + private int webMenuType; + /** 菜单名称 */ @Excel(name = "菜单名称") private String webMenuName; @@ -118,6 +120,14 @@ public class HwWebMenu extends BaseEntity this.children = children; } + public int getWebMenuType() { + return webMenuType; + } + + public void setWebMenuType(int webMenuType) { + this.webMenuType = webMenuType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -128,6 +138,7 @@ public class HwWebMenu extends BaseEntity .append("webMenuName", getWebMenuName()) .append("tenantId", getTenantId()) .append("webMenuPic", getWebMenuPic()) + .append("webMenuType", getWebMenuType()) .toString(); } } diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java index c0fbdeb..23521a9 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebMenuServiceImpl.java @@ -1,31 +1,33 @@ package com.ruoyi.portal.service.impl; -import java.util.List; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import java.util.stream.Collectors; + +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.portal.domain.HwProductInfoDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.portal.mapper.HwWebMenuMapper; import com.ruoyi.portal.domain.HwWebMenu; import com.ruoyi.portal.service.IHwWebMenuService; -import com.ruoyi.common.core.utils.StringUtils; /** * haiwei官网菜单Service业务层处理 - * + * * @author zch * @date 2025-08-18 */ @Service -public class HwWebMenuServiceImpl implements IHwWebMenuService +public class HwWebMenuServiceImpl implements IHwWebMenuService { @Autowired private HwWebMenuMapper hwWebMenuMapper; /** * 查询haiwei官网菜单 - * + * * @param webMenuId haiwei官网菜单主键 * @return haiwei官网菜单 */ @@ -37,19 +39,20 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService /** * 查询haiwei官网菜单列表 - * + * * @param hwWebMenu haiwei官网菜单 * @return haiwei官网菜单 */ @Override public List selectHwWebMenuList(HwWebMenu hwWebMenu) { - return hwWebMenuMapper.selectHwWebMenuList(hwWebMenu); + List hwWebMenus = hwWebMenuMapper.selectHwWebMenuList(hwWebMenu); + return buildWebMenuTree(hwWebMenus); } /** * 新增haiwei官网菜单 - * + * * @param hwWebMenu haiwei官网菜单 * @return 结果 */ @@ -61,7 +64,7 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService /** * 修改haiwei官网菜单 - * + * * @param hwWebMenu haiwei官网菜单 * @return 结果 */ @@ -73,7 +76,7 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService /** * 批量删除haiwei官网菜单 - * + * * @param webMenuIds 需要删除的haiwei官网菜单主键 * @return 结果 */ @@ -85,7 +88,7 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService /** * 删除haiwei官网菜单信息 - * + * * @param webMenuId haiwei官网菜单主键 * @return 结果 */ @@ -95,7 +98,7 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService return hwWebMenuMapper.deleteHwWebMenuByWebMenuId(webMenuId); } - /** +/** * 构建前端所需要树结构(根据传入的平铺菜单列表构造树) * * @param menus 菜单列表 diff --git a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMenuMapper.xml b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMenuMapper.xml index d0c9290..3d198f4 100644 --- a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMenuMapper.xml +++ b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMenuMapper.xml @@ -12,10 +12,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select web_menu_id, parent, ancestors, status, web_menu_name, tenant_id, web_menu__pic from hw_web_menu + select web_menu_id, parent, + ancestors, status, web_menu_name, + tenant_id, web_menu__pic , + web_menu_type + from hw_web_menu @@ -45,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" web_menu_name, tenant_id, web_menu__pic, + web_menu_type, #{webMenuId}, @@ -54,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{webMenuName}, #{tenantId}, #{webMenuPic}, + #{webMenuType}, @@ -66,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" web_menu_name = #{webMenuName}, tenant_id = #{tenantId}, web_menu__pic = #{webMenuPic}, + web_menu_type = #{webMenuType}, where web_menu_id = #{webMenuId} diff --git a/ruoyi-ui/src/api/portal/hwWeb.js b/ruoyi-ui/src/api/portal/hwWeb.js new file mode 100644 index 0000000..86c9ada --- /dev/null +++ b/ruoyi-ui/src/api/portal/hwWeb.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询haiwei官网json列表 +export function listHwWeb(query) { + return request({ + url: '/portal/hwWeb/list', + method: 'get', + params: query + }) +} + +// 查询haiwei官网json详细 +export function getHwWeb(webId) { + return request({ + url: '/portal/hwWeb/' + webId, + method: 'get' + }) +} + +// 新增haiwei官网json +export function addHwWeb(data) { + return request({ + url: '/portal/hwWeb', + method: 'post', + data: data + }) +} + +// 修改haiwei官网json +export function updateHwWeb(data) { + return request({ + url: '/portal/hwWeb', + method: 'put', + data: data + }) +} + +// 删除haiwei官网json +export function delHwWeb(webId) { + return request({ + url: '/portal/hwWeb/' + webId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/portal/hwWebMenu.js b/ruoyi-ui/src/api/portal/hwWebMenu.js new file mode 100644 index 0000000..a1e1dde --- /dev/null +++ b/ruoyi-ui/src/api/portal/hwWebMenu.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询haiwei官网菜单列表 +export function listHwWebMenu(query) { + return request({ + url: '/portal/hwWebMenu/list', + method: 'get', + params: query + }) +} + +// 查询haiwei官网菜单详细 +export function getHwWebMenu(webMenuId) { + return request({ + url: '/portal/hwWebMenu/' + webMenuId, + method: 'get' + }) +} + +// 新增haiwei官网菜单 +export function addHwWebMenu(data) { + return request({ + url: '/portal/hwWebMenu', + method: 'post', + data: data + }) +} + +// 修改haiwei官网菜单 +export function updateHwWebMenu(data) { + return request({ + url: '/portal/hwWebMenu', + method: 'put', + data: data + }) +} + +// 删除haiwei官网菜单 +export function delHwWebMenu(webMenuId) { + return request({ + url: '/portal/hwWebMenu/' + webMenuId, + method: 'delete' + }) +}