feat(portal): 添加官网菜单相关功能,注释权限控制

- 新增 HwWebMenu 模型类,增加 webMenuType 字段
- 添加 HwWebMenu 相关的 API 接口和实现类
- 实现 HwWebMenu 的列表查询、详情获取、新增、修改和删除功能
-优化 HwWebMenu 列表查询,支持树形结构展示
master
zch 6 months ago
parent d433d0660d
commit 93781bca14

@ -31,7 +31,7 @@ public class HwAboutUsInfoController extends BaseController
/** /**
* *
*/ */
@RequiresPermissions("portal:aboutUsInfo:list") //@RequiresPermissions("portalaboutUsInfo:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HwAboutUsInfo hwAboutUsInfo) 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) @Log(title = "关于我们信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwAboutUsInfo hwAboutUsInfo) 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}") @GetMapping(value = "/{aboutUsInfoId}")
public AjaxResult getInfo(@PathVariable("aboutUsInfoId") Long 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) @Log(title = "关于我们信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwAboutUsInfo hwAboutUsInfo) 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) @Log(title = "关于我们信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwAboutUsInfo hwAboutUsInfo) 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) @Log(title = "关于我们信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{aboutUsInfoIds}") @DeleteMapping("/{aboutUsInfoIds}")
public AjaxResult remove(@PathVariable Long[] aboutUsInfoIds) public AjaxResult remove(@PathVariable Long[] aboutUsInfoIds)

@ -31,7 +31,7 @@ public class HwAboutUsInfoDetailController extends BaseController
/** /**
* *
*/ */
@RequiresPermissions("portal:aboutUsInfoDetail:list") //@RequiresPermissions("portalaboutUsInfoDetail:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HwAboutUsInfoDetail hwAboutUsInfoDetail) 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) @Log(title = "关于我们信息明细", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwAboutUsInfoDetail hwAboutUsInfoDetail) 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}") @GetMapping(value = "/{usInfoDetailId}")
public AjaxResult getInfo(@PathVariable("usInfoDetailId") Long 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) @Log(title = "关于我们信息明细", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwAboutUsInfoDetail hwAboutUsInfoDetail) 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) @Log(title = "关于我们信息明细", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwAboutUsInfoDetail hwAboutUsInfoDetail) 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) @Log(title = "关于我们信息明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{usInfoDetailIds}") @DeleteMapping("/{usInfoDetailIds}")
public AjaxResult remove(@PathVariable Long[] usInfoDetailIds) public AjaxResult remove(@PathVariable Long[] usInfoDetailIds)

@ -31,7 +31,7 @@ public class HwContactUsInfoController extends BaseController
/** /**
* *
*/ */
@RequiresPermissions("portal:contactUsInfo:list") //@RequiresPermissions("portalcontactUsInfo:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HwContactUsInfo hwContactUsInfo) 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) @Log(title = "联系我们信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwContactUsInfo hwContactUsInfo) 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}") @GetMapping(value = "/{contactUsInfoId}")
public AjaxResult getInfo(@PathVariable("contactUsInfoId") Long 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) @Log(title = "联系我们信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwContactUsInfo hwContactUsInfo) 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) @Log(title = "联系我们信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwContactUsInfo hwContactUsInfo) 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) @Log(title = "联系我们信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{contactUsInfoIds}") @DeleteMapping("/{contactUsInfoIds}")
public AjaxResult remove(@PathVariable Long[] contactUsInfoIds) public AjaxResult remove(@PathVariable Long[] contactUsInfoIds)

@ -36,7 +36,7 @@ public class HwPortalConfigController extends BaseController
/** /**
* *
*/ */
@RequiresPermissions("portal:portalConfig:list") //@RequiresPermissions("portalportalConfig:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HwPortalConfig hwPortalConfig) 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) @Log(title = "门户网站配置", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwPortalConfig hwPortalConfig) 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}") @GetMapping(value = "/{portalConfigId}")
public AjaxResult getInfo(@PathVariable("portalConfigId") Long 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) @Log(title = "门户网站配置", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwPortalConfig hwPortalConfig) 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) @Log(title = "门户网站配置", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwPortalConfig hwPortalConfig) 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) @Log(title = "门户网站配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{portalConfigIds}") @DeleteMapping("/{portalConfigIds}")
public AjaxResult remove(@PathVariable Long[] 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") @GetMapping("/portalConfigTypeTree")
public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) { public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) {

@ -30,7 +30,7 @@ public class HwPortalConfigTypeController extends BaseController
/** /**
* *
*/ */
@RequiresPermissions("portal:portalConfigType:list") //@RequiresPermissions("portalportalConfigType:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(HwPortalConfigType hwPortalConfigType) 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) @Log(title = "门户网站配置类型", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwPortalConfigType hwPortalConfigType) 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}") @GetMapping(value = "/{configTypeId}")
public AjaxResult getInfo(@PathVariable("configTypeId") Long 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) @Log(title = "门户网站配置类型", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwPortalConfigType hwPortalConfigType) 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) @Log(title = "门户网站配置类型", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwPortalConfigType hwPortalConfigType) 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) @Log(title = "门户网站配置类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{configTypeIds}") @DeleteMapping("/{configTypeIds}")
public AjaxResult remove(@PathVariable Long[] configTypeIds) public AjaxResult remove(@PathVariable Long[] configTypeIds)

@ -36,7 +36,7 @@ public class HwProductCaseInfoController extends BaseController
/** /**
* *
*/ */
@RequiresPermissions("portal:productCaseInfo:list") //@RequiresPermissions("portalproductCaseInfo:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HwProductCaseInfo hwProductCaseInfo) 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) @Log(title = "案例内容", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwProductCaseInfo hwProductCaseInfo) 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}") @GetMapping(value = "/{caseInfoId}")
public AjaxResult getInfo(@PathVariable("caseInfoId") Long 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) @Log(title = "案例内容", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwProductCaseInfo hwProductCaseInfo) 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) @Log(title = "案例内容", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwProductCaseInfo hwProductCaseInfo) 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) @Log(title = "案例内容", businessType = BusinessType.DELETE)
@DeleteMapping("/{caseInfoIds}") @DeleteMapping("/{caseInfoIds}")
public AjaxResult remove(@PathVariable Long[] 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") @GetMapping("/portalConfigTypeTree")
public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) { public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) {

@ -37,7 +37,7 @@ public class HwProductInfoController extends BaseController
/** /**
* *
*/ */
@RequiresPermissions("portal:productInfo:list") //@RequiresPermissions("portalproductInfo:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HwProductInfo hwProductInfo) 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) @Log(title = "产品信息配置", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwProductInfo hwProductInfo) 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}") @GetMapping(value = "/{productInfoId}")
public AjaxResult getInfo(@PathVariable("productInfoId") Long 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) @Log(title = "产品信息配置", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwProductInfo hwProductInfo) 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) @Log(title = "产品信息配置", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwProductInfo hwProductInfo) 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) @Log(title = "产品信息配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{productInfoIds}") @DeleteMapping("/{productInfoIds}")
public AjaxResult remove(@PathVariable Long[] 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") @GetMapping("/portalConfigTypeTree")
public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) { public AjaxResult portalConfigTypeTree(HwPortalConfigType hwPortalConfigType) {

@ -30,7 +30,7 @@ public class HwProductInfoDetailController extends BaseController
/** /**
* *
*/ */
@RequiresPermissions("portal:productInfoDetail:list") //@RequiresPermissions("portalproductInfoDetail:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(HwProductInfoDetail hwProductInfoDetail) 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) @Log(title = "产品信息明细配置", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwProductInfoDetail hwProductInfoDetail) 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}") @GetMapping(value = "/{productInfoDetailId}")
public AjaxResult getInfo(@PathVariable("productInfoDetailId") Long 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) @Log(title = "产品信息明细配置", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwProductInfoDetail hwProductInfoDetail) 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) @Log(title = "产品信息明细配置", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwProductInfoDetail hwProductInfoDetail) 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) @Log(title = "产品信息明细配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{productInfoDetailIds}") @DeleteMapping("/{productInfoDetailIds}")
public AjaxResult remove(@PathVariable Long[] productInfoDetailIds) public AjaxResult remove(@PathVariable Long[] productInfoDetailIds)

@ -38,7 +38,7 @@ public class HwWebController extends BaseController
/** /**
* haiweijson * haiweijson
*/ */
@RequiresPermissions("portal:hwWeb:list") //@RequiresPermissions("portalhwWeb:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HwWeb hwWeb) public TableDataInfo list(HwWeb hwWeb)
{ {
@ -50,7 +50,7 @@ public class HwWebController extends BaseController
/** /**
* haiweijson * haiweijson
*/ */
@RequiresPermissions("portal:hwWeb:export") //@RequiresPermissions("portalhwWeb:export")
@Log(title = "haiwei官网json", businessType = BusinessType.EXPORT) @Log(title = "haiwei官网json", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwWeb hwWeb) public void export(HttpServletResponse response, HwWeb hwWeb)
@ -63,7 +63,7 @@ public class HwWebController extends BaseController
/** /**
* haiweijson * haiweijson
*/ */
@RequiresPermissions("portal:hwWeb:query") //@RequiresPermissions("portalhwWeb:query")
@GetMapping(value = "/{webId}") @GetMapping(value = "/{webId}")
public AjaxResult getInfo(@PathVariable("webId") Long webId) public AjaxResult getInfo(@PathVariable("webId") Long webId)
{ {
@ -73,7 +73,7 @@ public class HwWebController extends BaseController
/** /**
* haiweijson * haiweijson
*/ */
@RequiresPermissions("portal:hwWeb:add") //@RequiresPermissions("portalhwWeb:add")
@Log(title = "haiwei官网json", businessType = BusinessType.INSERT) @Log(title = "haiwei官网json", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwWeb hwWeb) public AjaxResult add(@RequestBody HwWeb hwWeb)
@ -84,7 +84,7 @@ public class HwWebController extends BaseController
/** /**
* haiweijson * haiweijson
*/ */
@RequiresPermissions("portal:hwWeb:edit") //@RequiresPermissions("portalhwWeb:edit")
@Log(title = "haiwei官网json", businessType = BusinessType.UPDATE) @Log(title = "haiwei官网json", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwWeb hwWeb) public AjaxResult edit(@RequestBody HwWeb hwWeb)
@ -95,7 +95,7 @@ public class HwWebController extends BaseController
/** /**
* haiweijson * haiweijson
*/ */
@RequiresPermissions("portal:hwWeb:remove") //@RequiresPermissions("portalhwWeb:remove")
@Log(title = "haiwei官网json", businessType = BusinessType.DELETE) @Log(title = "haiwei官网json", businessType = BusinessType.DELETE)
@DeleteMapping("/{webIds}") @DeleteMapping("/{webIds}")
public AjaxResult remove(@PathVariable Long[] webIds) public AjaxResult remove(@PathVariable Long[] webIds)

@ -20,11 +20,10 @@ import com.ruoyi.portal.service.IHwWebMenuService;
import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.page.TableDataInfo;
/** /**
* haiweiController * haiweiController
* *
* @author zch * @author zch
* @date 2025-08-18 * @date 2025-08-18
*/ */
@ -38,19 +37,18 @@ public class HwWebMenuController extends BaseController
/** /**
* haiwei * haiwei
*/ */
@RequiresPermissions("portal:hwWebMenu:list") //@RequiresPermissions("portalhwWebMenu:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HwWebMenu hwWebMenu) public AjaxResult list(HwWebMenu hwWebMenu)
{ {
startPage();
List<HwWebMenu> list = hwWebMenuService.selectHwWebMenuList(hwWebMenu); List<HwWebMenu> list = hwWebMenuService.selectHwWebMenuList(hwWebMenu);
return getDataTable(list); return success(list);
} }
/** /**
* haiwei * haiwei
*/ */
@RequiresPermissions("portal:hwWebMenu:export") //@RequiresPermissions("portalhwWebMenu:export")
@Log(title = "haiwei官网菜单", businessType = BusinessType.EXPORT) @Log(title = "haiwei官网菜单", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, HwWebMenu hwWebMenu) public void export(HttpServletResponse response, HwWebMenu hwWebMenu)
@ -63,7 +61,7 @@ public class HwWebMenuController extends BaseController
/** /**
* haiwei * haiwei
*/ */
@RequiresPermissions("portal:hwWebMenu:query") //@RequiresPermissions("portalhwWebMenu:query")
@GetMapping(value = "/{webMenuId}") @GetMapping(value = "/{webMenuId}")
public AjaxResult getInfo(@PathVariable("webMenuId") Long webMenuId) public AjaxResult getInfo(@PathVariable("webMenuId") Long webMenuId)
{ {
@ -73,7 +71,7 @@ public class HwWebMenuController extends BaseController
/** /**
* haiwei * haiwei
*/ */
@RequiresPermissions("portal:hwWebMenu:add") //@RequiresPermissions("portalhwWebMenu:add")
@Log(title = "haiwei官网菜单", businessType = BusinessType.INSERT) @Log(title = "haiwei官网菜单", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody HwWebMenu hwWebMenu) public AjaxResult add(@RequestBody HwWebMenu hwWebMenu)
@ -84,7 +82,7 @@ public class HwWebMenuController extends BaseController
/** /**
* haiwei * haiwei
*/ */
@RequiresPermissions("portal:hwWebMenu:edit") //@RequiresPermissions("portalhwWebMenu:edit")
@Log(title = "haiwei官网菜单", businessType = BusinessType.UPDATE) @Log(title = "haiwei官网菜单", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody HwWebMenu hwWebMenu) public AjaxResult edit(@RequestBody HwWebMenu hwWebMenu)
@ -95,9 +93,9 @@ public class HwWebMenuController extends BaseController
/** /**
* haiwei * haiwei
*/ */
@RequiresPermissions("portal:hwWebMenu:remove") //@RequiresPermissions("portalhwWebMenu:remove")
@Log(title = "haiwei官网菜单", businessType = BusinessType.DELETE) @Log(title = "haiwei官网菜单", businessType = BusinessType.DELETE)
@DeleteMapping("/{webMenuIds}") @DeleteMapping("/{webMenuIds}")
public AjaxResult remove(@PathVariable Long[] webMenuIds) public AjaxResult remove(@PathVariable Long[] webMenuIds)
{ {
return toAjax(hwWebMenuService.deleteHwWebMenuByWebMenuIds(webMenuIds)); return toAjax(hwWebMenuService.deleteHwWebMenuByWebMenuIds(webMenuIds));

@ -32,6 +32,8 @@ public class HwWebMenu extends BaseEntity
@Excel(name = "状态") @Excel(name = "状态")
private String status; private String status;
private int webMenuType;
/** 菜单名称 */ /** 菜单名称 */
@Excel(name = "菜单名称") @Excel(name = "菜单名称")
private String webMenuName; private String webMenuName;
@ -118,6 +120,14 @@ public class HwWebMenu extends BaseEntity
this.children = children; this.children = children;
} }
public int getWebMenuType() {
return webMenuType;
}
public void setWebMenuType(int webMenuType) {
this.webMenuType = webMenuType;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -128,6 +138,7 @@ public class HwWebMenu extends BaseEntity
.append("webMenuName", getWebMenuName()) .append("webMenuName", getWebMenuName())
.append("tenantId", getTenantId()) .append("tenantId", getTenantId())
.append("webMenuPic", getWebMenuPic()) .append("webMenuPic", getWebMenuPic())
.append("webMenuType", getWebMenuType())
.toString(); .toString();
} }
} }

@ -1,31 +1,33 @@
package com.ruoyi.portal.service.impl; package com.ruoyi.portal.service.impl;
import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.portal.mapper.HwWebMenuMapper; import com.ruoyi.portal.mapper.HwWebMenuMapper;
import com.ruoyi.portal.domain.HwWebMenu; import com.ruoyi.portal.domain.HwWebMenu;
import com.ruoyi.portal.service.IHwWebMenuService; import com.ruoyi.portal.service.IHwWebMenuService;
import com.ruoyi.common.core.utils.StringUtils;
/** /**
* haiweiService * haiweiService
* *
* @author zch * @author zch
* @date 2025-08-18 * @date 2025-08-18
*/ */
@Service @Service
public class HwWebMenuServiceImpl implements IHwWebMenuService public class HwWebMenuServiceImpl implements IHwWebMenuService
{ {
@Autowired @Autowired
private HwWebMenuMapper hwWebMenuMapper; private HwWebMenuMapper hwWebMenuMapper;
/** /**
* haiwei * haiwei
* *
* @param webMenuId haiwei * @param webMenuId haiwei
* @return haiwei * @return haiwei
*/ */
@ -37,19 +39,20 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService
/** /**
* haiwei * haiwei
* *
* @param hwWebMenu haiwei * @param hwWebMenu haiwei
* @return haiwei * @return haiwei
*/ */
@Override @Override
public List<HwWebMenu> selectHwWebMenuList(HwWebMenu hwWebMenu) public List<HwWebMenu> selectHwWebMenuList(HwWebMenu hwWebMenu)
{ {
return hwWebMenuMapper.selectHwWebMenuList(hwWebMenu); List<HwWebMenu> hwWebMenus = hwWebMenuMapper.selectHwWebMenuList(hwWebMenu);
return buildWebMenuTree(hwWebMenus);
} }
/** /**
* haiwei * haiwei
* *
* @param hwWebMenu haiwei * @param hwWebMenu haiwei
* @return * @return
*/ */
@ -61,7 +64,7 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService
/** /**
* haiwei * haiwei
* *
* @param hwWebMenu haiwei * @param hwWebMenu haiwei
* @return * @return
*/ */
@ -73,7 +76,7 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService
/** /**
* haiwei * haiwei
* *
* @param webMenuIds haiwei * @param webMenuIds haiwei
* @return * @return
*/ */
@ -85,7 +88,7 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService
/** /**
* haiwei * haiwei
* *
* @param webMenuId haiwei * @param webMenuId haiwei
* @return * @return
*/ */
@ -95,7 +98,7 @@ public class HwWebMenuServiceImpl implements IHwWebMenuService
return hwWebMenuMapper.deleteHwWebMenuByWebMenuId(webMenuId); return hwWebMenuMapper.deleteHwWebMenuByWebMenuId(webMenuId);
} }
/** /**
* *
* *
* @param menus * @param menus

@ -12,10 +12,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="webMenuName" column="web_menu_name" /> <result property="webMenuName" column="web_menu_name" />
<result property="tenantId" column="tenant_id" /> <result property="tenantId" column="tenant_id" />
<result property="webMenuPic" column="web_menu__pic" /> <result property="webMenuPic" column="web_menu__pic" />
<result property="webMenuType" column="web_menu_type" />
</resultMap> </resultMap>
<sql id="selectHwWebMenuVo"> <sql id="selectHwWebMenuVo">
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
</sql> </sql>
<select id="selectHwWebMenuList" parameterType="HwWebMenu" resultMap="HwWebMenuResult"> <select id="selectHwWebMenuList" parameterType="HwWebMenu" resultMap="HwWebMenuResult">
@ -26,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''"> and status = #{status}</if> <if test="status != null and status != ''"> and status = #{status}</if>
<if test="webMenuName != null and webMenuName != ''"> and web_menu_name like concat('%', #{webMenuName}, '%')</if> <if test="webMenuName != null and webMenuName != ''"> and web_menu_name like concat('%', #{webMenuName}, '%')</if>
<if test="tenantId != null "> and tenant_id = #{tenantId}</if> <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
<if test="webMenuType != null "> and web_menu_type = #{webMenuType}</if>
<if test="webMenuPic != null and webMenuPic != ''"> and web_menu__pic = #{webMenuPic}</if> <if test="webMenuPic != null and webMenuPic != ''"> and web_menu__pic = #{webMenuPic}</if>
</where> </where>
</select> </select>
@ -45,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="webMenuName != null">web_menu_name,</if> <if test="webMenuName != null">web_menu_name,</if>
<if test="tenantId != null">tenant_id,</if> <if test="tenantId != null">tenant_id,</if>
<if test="webMenuPic != null">web_menu__pic,</if> <if test="webMenuPic != null">web_menu__pic,</if>
<if test="webMenuType != null">web_menu_type,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="webMenuId != null">#{webMenuId},</if> <if test="webMenuId != null">#{webMenuId},</if>
@ -54,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="webMenuName != null">#{webMenuName},</if> <if test="webMenuName != null">#{webMenuName},</if>
<if test="tenantId != null">#{tenantId},</if> <if test="tenantId != null">#{tenantId},</if>
<if test="webMenuPic != null">#{webMenuPic},</if> <if test="webMenuPic != null">#{webMenuPic},</if>
<if test="webMenuType != null">#{webMenuType},</if>
</trim> </trim>
</insert> </insert>
@ -66,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="webMenuName != null">web_menu_name = #{webMenuName},</if> <if test="webMenuName != null">web_menu_name = #{webMenuName},</if>
<if test="tenantId != null">tenant_id = #{tenantId},</if> <if test="tenantId != null">tenant_id = #{tenantId},</if>
<if test="webMenuPic != null">web_menu__pic = #{webMenuPic},</if> <if test="webMenuPic != null">web_menu__pic = #{webMenuPic},</if>
<if test="webMenuType != null">web_menu_type = #{webMenuType},</if>
</trim> </trim>
where web_menu_id = #{webMenuId} where web_menu_id = #{webMenuId}
</update> </update>

@ -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'
})
}

@ -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'
})
}
Loading…
Cancel
Save