Merge remote-tracking branch 'origin/master'

master
夜笙歌 6 months ago
commit 836394b110

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

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

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

@ -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) {

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

@ -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) {

@ -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) {

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

@ -0,0 +1,106 @@
package com.ruoyi.portal.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.portal.domain.HwWeb;
import com.ruoyi.portal.service.IHwWebService;
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;
/**
* haiweijsonController
*
* @author ruoyi
* @date 2025-08-18
*/
@RestController
@RequestMapping("/hwWeb")
public class HwWebController extends BaseController
{
@Autowired
private IHwWebService hwWebService;
/**
* haiweijson
*/
//@RequiresPermissions("portalhwWeb:list")
@GetMapping("/list")
public TableDataInfo list(HwWeb hwWeb)
{
startPage();
List<HwWeb> list = hwWebService.selectHwWebList(hwWeb);
return getDataTable(list);
}
/**
* haiweijson
*/
//@RequiresPermissions("portalhwWeb:export")
@Log(title = "haiwei官网json", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, HwWeb hwWeb)
{
List<HwWeb> list = hwWebService.selectHwWebList(hwWeb);
ExcelUtil<HwWeb> util = new ExcelUtil<HwWeb>(HwWeb.class);
util.exportExcel(response, list, "haiwei官网json数据");
}
/**
* haiweijson
*/
//@RequiresPermissions("portalhwWeb:query")
@GetMapping(value = "/{webCode}")
public AjaxResult getInfo(@PathVariable("webCode") Long webCode)
{
return success(hwWebService.selectHwWebByWebcode(webCode));
}
/**
* haiweijson
*/
//@RequiresPermissions("portalhwWeb:add")
@Log(title = "haiwei官网json", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody HwWeb hwWeb)
{
return toAjax(hwWebService.insertHwWeb(hwWeb));
}
/**
* haiweijson
*/
//@RequiresPermissions("portalhwWeb:edit")
@Log(title = "haiwei官网json", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody HwWeb hwWeb)
{
int i = hwWebService.updateHwWeb(hwWeb);
return toAjax(i);
}
/**
* haiweijson
*/
//@RequiresPermissions("portalhwWeb:remove")
@Log(title = "haiwei官网json", businessType = BusinessType.DELETE)
@DeleteMapping("/{webIds}")
public AjaxResult remove(@PathVariable Long[] webIds)
{
return toAjax(hwWebService.deleteHwWebByWebIds(webIds));
}
}

@ -0,0 +1,111 @@
package com.ruoyi.portal.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.portal.domain.HwWebMenu;
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;
/**
* haiweiController
*
* @author zch
* @date 2025-08-18
*/
@RestController
@RequestMapping("/hwWebMenu")
public class HwWebMenuController extends BaseController
{
@Autowired
private IHwWebMenuService hwWebMenuService;
/**
* haiwei
*/
//@RequiresPermissions("portalhwWebMenu:list")
@GetMapping("/list")
public AjaxResult list(HwWebMenu hwWebMenu)
{
List<HwWebMenu> list = hwWebMenuService.selectHwWebMenuList(hwWebMenu);
return success(list);
}
/**
* haiwei
*/
//@RequiresPermissions("portalhwWebMenu:export")
@Log(title = "haiwei官网菜单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, HwWebMenu hwWebMenu)
{
List<HwWebMenu> list = hwWebMenuService.selectHwWebMenuList(hwWebMenu);
ExcelUtil<HwWebMenu> util = new ExcelUtil<HwWebMenu>(HwWebMenu.class);
util.exportExcel(response, list, "haiwei官网菜单数据");
}
/**
* haiwei
*/
//@RequiresPermissions("portalhwWebMenu:query")
@GetMapping(value = "/{webMenuId}")
public AjaxResult getInfo(@PathVariable("webMenuId") Long webMenuId)
{
return success(hwWebMenuService.selectHwWebMenuByWebMenuId(webMenuId));
}
/**
* haiwei
*/
//@RequiresPermissions("portalhwWebMenu:add")
@Log(title = "haiwei官网菜单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody HwWebMenu hwWebMenu)
{
return toAjax(hwWebMenuService.insertHwWebMenu(hwWebMenu));
}
/**
* haiwei
*/
//@RequiresPermissions("portalhwWebMenu:edit")
@Log(title = "haiwei官网菜单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody HwWebMenu hwWebMenu)
{
return toAjax(hwWebMenuService.updateHwWebMenu(hwWebMenu));
}
/**
* haiwei
*/
//@RequiresPermissions("portalhwWebMenu:remove")
@Log(title = "haiwei官网菜单", businessType = BusinessType.DELETE)
@DeleteMapping("/{webMenuIds}")
public AjaxResult remove(@PathVariable Long[] webMenuIds)
{
return toAjax(hwWebMenuService.deleteHwWebMenuByWebMenuIds(webMenuIds));
}
/**
*
*/
@GetMapping("/selectMenuTree")
public AjaxResult selectMenuTree(HwWebMenu hwWebMenu){
return success(hwWebMenuService.selectMenuTree(hwWebMenu));
}
}

@ -51,6 +51,14 @@ public class HwPortalConfig extends BaseEntity
private String configTypeName;
private String homeConfigTypePic;
private String homeConfigTypeIcon;
private String homeConfigTypeName;
private String homeConfigTypeClassfication;
private Long parentId;
private String ancestors;
public void setPortalConfigId(Long portalConfigId)
{
this.portalConfigId = portalConfigId;
@ -141,6 +149,55 @@ public class HwPortalConfig extends BaseEntity
this.configTypeName = configTypeName;
}
public String getHomeConfigTypePic() {
return homeConfigTypePic;
}
public void setHomeConfigTypePic(String homeConfigTypePic) {
this.homeConfigTypePic = homeConfigTypePic;
}
public String getHomeConfigTypeIcon() {
return homeConfigTypeIcon;
}
public void setHomeConfigTypeIcon(String homeConfigTypeIcon) {
this.homeConfigTypeIcon = homeConfigTypeIcon;
}
public String getHomeConfigTypeName() {
return homeConfigTypeName;
}
public void setHomeConfigTypeName(String homeConfigTypeName) {
this.homeConfigTypeName = homeConfigTypeName;
}
public String getHomeConfigTypeClassfication() {
return homeConfigTypeClassfication;
}
public void setHomeConfigTypeClassfication(String homeConfigTypeClassfication) {
this.homeConfigTypeClassfication = homeConfigTypeClassfication;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public String getAncestors() {
return ancestors;
}
public void setAncestors(String ancestors) {
this.ancestors = ancestors;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -156,6 +213,13 @@ public class HwPortalConfig extends BaseEntity
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.append("configTypeName", getConfigTypeName())
.append("homeConfigTypePic", getHomeConfigTypePic())
.append("homeConfigTypeIcon", getHomeConfigTypeIcon())
.append("homeConfigTypeName", getHomeConfigTypeName())
.append("homeConfigTypeClassfication", getHomeConfigTypeClassfication())
.append("parentId", getParentId())
.append("ancestors", getAncestors())
.toString();
}
}

@ -29,6 +29,10 @@ public class HwProductInfoDetail extends TreeEntity
@Excel(name = "配置模式(1图标 +文字+内容横铺4个2左标题+内容右图片3左图标右标题+内容一行2个4左大图右标题+内容一行2个5上标题+下图片6上标题+内容下图片7图标标题内容一行3个,8一张图9上图下内容一行4个);针对右children时配置的")
private String configModal;
/** 配置模式(1图标 +文字+内容横铺4个2左标题+内容右图片3左图标右标题+内容一行2个4左大图右标题+内容一行2个5上标题+下图片6上标题+内容下图片7图标标题内容一行3个,8一张图9上图下内容一行4个);针对右children时配置的 */
@Excel(name = "配置模式(1图标 +文字+内容横铺4个2左标题+内容右图片3左图标右标题+内容一行2个4左大图右标题+内容一行2个5上标题+下图片6上标题+内容下图片7图标标题内容一行3个,8一张图9上图下内容一行4个);针对右children时配置的")
private String configModel;
/** 标题 */
@Excel(name = "标题")
private String productInfoDetailTitle;
@ -120,6 +124,13 @@ public class HwProductInfoDetail extends TreeEntity
this.hwProductInfoDetailList = hwProductInfoDetailList;
}
public String getConfigModel() {
return configModel;
}
public void setConfigModel(String configModel) {
this.configModel = configModel;
}
@Override
public String toString() {

@ -0,0 +1,79 @@
package com.ruoyi.portal.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
/**
* haiweijson hw_web
*
* @author ruoyi
* @date 2025-08-18
*/
public class HwWeb extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long webId;
/** json */
@Excel(name = "json")
private String webJson;
/** json字符串 */
@Excel(name = "json字符串")
private String webJsonString;
/** 页面 */
@Excel(name = "页面")
private Long webCode;
public void setWebId(Long webId)
{
this.webId = webId;
}
public Long getWebId()
{
return webId;
}
public void setWebJson(String webJson)
{
this.webJson = webJson;
}
public String getWebJson()
{
return webJson;
}
public void setWebJsonString(String webJsonString)
{
this.webJsonString = webJsonString;
}
public String getWebJsonString()
{
return webJsonString;
}
public void setWebCode(Long webCode)
{
this.webCode = webCode;
}
public Long getWebCode()
{
return webCode;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("webId", getWebId())
.append("webJson", getWebJson())
.append("webJsonString", getWebJsonString())
.append("webCode", getWebCode())
.toString();
}
}

@ -0,0 +1,124 @@
package com.ruoyi.portal.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.TreeEntity;
import java.util.List;
/**
* haiwei hw_web_menu
*
* @author zch
* @date 2025-08-18
*/
public class HwWebMenu extends TreeEntity
{
private static final long serialVersionUID = 1L;
/** 菜单主键id */
private Long webMenuId;
/** 父节点 */
@Excel(name = "父节点")
private Long parent;
/** 状态 */
@Excel(name = "状态")
private String status;
/** 菜单名称 */
@Excel(name = "菜单名称")
private String webMenuName;
/** 租户 */
@Excel(name = "租户")
private Long tenantId;
/** 图片地址 */
@Excel(name = "图片地址")
private String webMenuPic;
/** 官网菜单类型 */
@Excel(name = "官网菜单类型")
private Long webMenuType;
public void setWebMenuId(Long webMenuId)
{
this.webMenuId = webMenuId;
}
public Long getWebMenuId()
{
return webMenuId;
}
public void setParent(Long parent)
{
this.parent = parent;
}
public Long getParent()
{
return parent;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setWebMenuName(String webMenuName)
{
this.webMenuName = webMenuName;
}
public String getWebMenuName()
{
return webMenuName;
}
public void setTenantId(Long tenantId)
{
this.tenantId = tenantId;
}
public Long getTenantId()
{
return tenantId;
}
public void setWebMenuPic(String webMenuPic)
{
this.webMenuPic = webMenuPic;
}
public String getWebMenuPic()
{
return webMenuPic;
}
public void setWebMenuType(Long webMenuType)
{
this.webMenuType = webMenuType;
}
public Long getWebMenuType()
{
return webMenuType;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("webMenuId", getWebMenuId())
.append("parent", getParent())
.append("ancestors", getAncestors())
.append("status", getStatus())
.append("webMenuName", getWebMenuName())
.append("tenantId", getTenantId())
.append("webMenuPic", getWebMenuPic())
.append("webMenuType", getWebMenuType())
.toString();
}
}

@ -69,4 +69,13 @@ public interface HwPortalConfigMapper
public List<HwPortalConfig> selectHwPortalConfigJoinList(HwPortalConfig hwPortalConfig);
/**
*
*
* @param hwPortalConfig
* @return
*/
public List<HwPortalConfig> selectHwPortalConfigList2(HwPortalConfig hwPortalConfig);
}

@ -0,0 +1,61 @@
package com.ruoyi.portal.mapper;
import java.util.List;
import com.ruoyi.portal.domain.HwWeb;
/**
* haiweijsonMapper
*
* @author ruoyi
* @date 2025-08-18
*/
public interface HwWebMapper
{
/**
* haiweijson
*
* @param webId haiweijson
* @return haiweijson
*/
public HwWeb selectHwWebByWebcode(Long webCode);
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return haiweijson
*/
public List<HwWeb> selectHwWebList(HwWeb hwWeb);
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return
*/
public int insertHwWeb(HwWeb hwWeb);
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return
*/
public int updateHwWeb(HwWeb hwWeb);
/**
* haiweijson
*
* @param webId haiweijson
* @return
*/
public int deleteHwWebByWebId(Long webId);
/**
* haiweijson
*
* @param webIds
* @return
*/
public int deleteHwWebByWebIds(Long[] webIds);
}

@ -0,0 +1,61 @@
package com.ruoyi.portal.mapper;
import java.util.List;
import com.ruoyi.portal.domain.HwWebMenu;
/**
* haiweiMapper
*
* @author zch
* @date 2025-08-18
*/
public interface HwWebMenuMapper
{
/**
* haiwei
*
* @param webMenuId haiwei
* @return haiwei
*/
public HwWebMenu selectHwWebMenuByWebMenuId(Long webMenuId);
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return haiwei
*/
public List<HwWebMenu> selectHwWebMenuList(HwWebMenu hwWebMenu);
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return
*/
public int insertHwWebMenu(HwWebMenu hwWebMenu);
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return
*/
public int updateHwWebMenu(HwWebMenu hwWebMenu);
/**
* haiwei
*
* @param webMenuId haiwei
* @return
*/
public int deleteHwWebMenuByWebMenuId(Long webMenuId);
/**
* haiwei
*
* @param webMenuIds
* @return
*/
public int deleteHwWebMenuByWebMenuIds(Long[] webMenuIds);
}

@ -0,0 +1,68 @@
package com.ruoyi.portal.service;
import java.util.List;
import com.ruoyi.portal.domain.HwWebMenu;
/**
* haiweiService
*
* @author zch
* @date 2025-08-18
*/
public interface IHwWebMenuService
{
/**
* haiwei
*
* @param webMenuId haiwei
* @return haiwei
*/
public HwWebMenu selectHwWebMenuByWebMenuId(Long webMenuId);
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return haiwei
*/
public List<HwWebMenu> selectHwWebMenuList(HwWebMenu hwWebMenu);
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return
*/
public int insertHwWebMenu(HwWebMenu hwWebMenu);
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return
*/
public int updateHwWebMenu(HwWebMenu hwWebMenu);
/**
* haiwei
*
* @param webMenuIds haiwei
* @return
*/
public int deleteHwWebMenuByWebMenuIds(Long[] webMenuIds);
/**
* haiwei
*
* @param webMenuId haiwei
* @return
*/
public int deleteHwWebMenuByWebMenuId(Long webMenuId);
/**
*
*/
public List<HwWebMenu> selectMenuTree(HwWebMenu hwWebMenu);
}

@ -0,0 +1,61 @@
package com.ruoyi.portal.service;
import java.util.List;
import com.ruoyi.portal.domain.HwWeb;
/**
* haiweijsonService
*
* @author ruoyi
* @date 2025-08-18
*/
public interface IHwWebService
{
/**
* haiweijson
*
* @param webId haiweijson
* @return haiweijson
*/
public HwWeb selectHwWebByWebcode(Long webCode);
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return haiweijson
*/
public List<HwWeb> selectHwWebList(HwWeb hwWeb);
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return
*/
public int insertHwWeb(HwWeb hwWeb);
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return
*/
public int updateHwWeb(HwWeb hwWeb);
/**
* haiweijson
*
* @param webIds haiweijson
* @return
*/
public int deleteHwWebByWebIds(Long[] webIds);
/**
* haiweijson
*
* @param webId haiweijson
* @return
*/
public int deleteHwWebByWebId(Long webId);
}

@ -42,6 +42,10 @@ public class HwPortalConfigServiceImpl implements IHwPortalConfigService
@Override
public List<HwPortalConfig> selectHwPortalConfigList(HwPortalConfig hwPortalConfig)
{
if("2".equals(hwPortalConfig.getPortalConfigType())){
List<HwPortalConfig> hwPortalConfigs = hwPortalConfigMapper.selectHwPortalConfigList2(hwPortalConfig);
return hwPortalConfigs;
}
return hwPortalConfigMapper.selectHwPortalConfigList(hwPortalConfig);
}

@ -123,6 +123,17 @@ public class HwProductInfoServiceImpl implements IHwProductInfoService
}
}
}
for (HwProductInfo productInfo : hwProductInfoJoinDetailList) {
List<HwProductInfoDetail> hwProductInfoDetailList = productInfo.getHwProductInfoDetailList();
for (HwProductInfoDetail hwProductInfoDetail : hwProductInfoDetailList) {
if ("13".equals(hwProductInfoDetail.getConfigModel())){
// 将每个产品信息的明细列表转换为树形结构
List<HwProductInfoDetail> treeStructureList = buildProductInfoDetailTree(productInfo.getHwProductInfoDetailList());
productInfo.setHwProductInfoDetailList(treeStructureList);
}
}
}
return hwProductInfoJoinDetailList;
}

@ -0,0 +1,168 @@
package com.ruoyi.portal.service.impl;
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;
/**
* haiweiService
*
* @author zch
* @date 2025-08-18
*/
@Service
public class HwWebMenuServiceImpl implements IHwWebMenuService
{
@Autowired
private HwWebMenuMapper hwWebMenuMapper;
/**
* haiwei
*
* @param webMenuId haiwei
* @return haiwei
*/
@Override
public HwWebMenu selectHwWebMenuByWebMenuId(Long webMenuId)
{
return hwWebMenuMapper.selectHwWebMenuByWebMenuId(webMenuId);
}
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return haiwei
*/
@Override
public List<HwWebMenu> selectHwWebMenuList(HwWebMenu hwWebMenu)
{
List<HwWebMenu> hwWebMenus = hwWebMenuMapper.selectHwWebMenuList(hwWebMenu);
return hwWebMenus;
}
/**
*
*/
@Override
public List<HwWebMenu> selectMenuTree(HwWebMenu hwWebMenu)
{
List<HwWebMenu> hwWebMenus = hwWebMenuMapper.selectHwWebMenuList(hwWebMenu);
return buildWebMenuTree(hwWebMenus);
}
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return
*/
@Override
public int insertHwWebMenu(HwWebMenu hwWebMenu)
{
return hwWebMenuMapper.insertHwWebMenu(hwWebMenu);
}
/**
* haiwei
*
* @param hwWebMenu haiwei
* @return
*/
@Override
public int updateHwWebMenu(HwWebMenu hwWebMenu)
{
return hwWebMenuMapper.updateHwWebMenu(hwWebMenu);
}
/**
* haiwei
*
* @param webMenuIds haiwei
* @return
*/
@Override
public int deleteHwWebMenuByWebMenuIds(Long[] webMenuIds)
{
return hwWebMenuMapper.deleteHwWebMenuByWebMenuIds(webMenuIds);
}
/**
* haiwei
*
* @param webMenuId haiwei
* @return
*/
@Override
public int deleteHwWebMenuByWebMenuId(Long webMenuId)
{
return hwWebMenuMapper.deleteHwWebMenuByWebMenuId(webMenuId);
}
/**
*
*
* @param menus
* @return
*/
public List<HwWebMenu> buildWebMenuTree(List<HwWebMenu> menus) {
List<HwWebMenu> returnList = new ArrayList<>();
List<Long> tempList = menus.stream().map(HwWebMenu::getWebMenuId).collect(Collectors.toList());
for (HwWebMenu menu : menus) {
// 如果是顶级节点(parent为null、0或者不在当前列表中), 遍历该父节点的所有子节点
if (menu.getParent() == null || menu.getParent() == 0L || !tempList.contains(menu.getParent())) {
recursionFn(menus, menu);
returnList.add(menu);
}
}
if (returnList.isEmpty()) {
returnList = menus;
}
return returnList;
}
/**
*
*/
private void recursionFn(List<HwWebMenu> list, HwWebMenu t) {
// 得到子节点列表
List<HwWebMenu> childList = getChildList(list, t);
t.setChildren(childList);
for (HwWebMenu tChild : childList) {
if (hasChild(list, tChild)) {
recursionFn(list, tChild);
}
}
}
/**
*
*/
private List<HwWebMenu> getChildList(List<HwWebMenu> list, HwWebMenu t) {
List<HwWebMenu> tlist = new ArrayList<HwWebMenu>();
Iterator<HwWebMenu> it = list.iterator();
while (it.hasNext()) {
HwWebMenu n = it.next();
if (StringUtils.isNotNull(n.getParent()) && n.getParent().longValue() == t.getWebMenuId().longValue()) {
tlist.add(n);
}
}
return tlist;
}
/**
*
*/
private boolean hasChild(List<HwWebMenu> list, HwWebMenu t) {
return !getChildList(list, t).isEmpty();
}
}

@ -0,0 +1,101 @@
package com.ruoyi.portal.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.portal.mapper.HwWebMapper;
import com.ruoyi.portal.domain.HwWeb;
import com.ruoyi.portal.service.IHwWebService;
/**
* haiweijsonService
*
* @author ruoyi
* @date 2025-08-18
*/
@Service
public class HwWebServiceImpl implements IHwWebService
{
@Autowired
private HwWebMapper hwWebMapper;
/**
* haiweijson
*
* @param webId haiweijson
* @return haiweijson
*/
@Override
public HwWeb selectHwWebByWebcode(Long webCode)
{
HwWeb hwWeb = hwWebMapper.selectHwWebByWebcode(webCode);
return hwWeb;
}
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return haiweijson
*/
@Override
public List<HwWeb> selectHwWebList(HwWeb hwWeb)
{
return hwWebMapper.selectHwWebList(hwWeb);
}
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return
*/
@Override
public int insertHwWeb(HwWeb hwWeb)
{
return hwWebMapper.insertHwWeb(hwWeb);
}
/**
* haiweijson
*
* @param hwWeb haiweijson
* @return
*/
@Override
public int updateHwWeb(HwWeb hwWeb)
{
HwWeb codeWeb = new HwWeb();
//编号唯一
codeWeb.setWebCode(hwWeb.getWebCode());
if(hwWebMapper.selectHwWebList(codeWeb).isEmpty()){
return hwWebMapper.insertHwWeb(hwWeb);
}
return hwWebMapper.updateHwWeb(hwWeb);
}
/**
* haiweijson
*
* @param webIds haiweijson
* @return
*/
@Override
public int deleteHwWebByWebIds(Long[] webIds)
{
return hwWebMapper.deleteHwWebByWebIds(webIds);
}
/**
* haiweijson
*
* @param webId haiweijson
* @return
*/
@Override
public int deleteHwWebByWebId(Long webId)
{
return hwWebMapper.deleteHwWebByWebId(webId);
}
}

@ -21,8 +21,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="configTypeName" column="config_type_name" />
</resultMap>
<resultMap type="HwPortalConfig" id="HwPortalConfigResult2">
<result property="portalConfigId" column="portal_config_id" />
<result property="portalConfigType" column="portal_config_type" />
<result property="portalConfigTypeId" column="portal_config_type_id" />
<result property="portalConfigTitle" column="portal_config_title" />
<result property="portalConfigOrder" column="portal_config_order" />
<result property="portalConfigDesc" column="portal_config_desc" />
<result property="buttonName" column="button_name" />
<result property="routerAddress" column="router_address" />
<result property="portalConfigPic" column="portal_config_pic" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="configTypeName" column="config_type_name" />
<result property="homeConfigTypePic" column="home_config_type_pic" />
<result property="homeConfigTypeIcon" column="home_config_type_icon" />
<result property="homeConfigTypeName" column="home_config_type_name" />
<result property="homeConfigTypeClassfication" column="config_type_classfication" />
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
</resultMap>
<sql id="selectHwPortalConfigVo">
select portal_config_id, portal_config_type,portal_config_type_id, portal_config_title, portal_config_order, portal_config_desc, button_name, router_address, portal_config_pic, create_time, create_by, update_time, update_by from hw_portal_config
select portal_config_id, portal_config_type,portal_config_type_id, portal_config_title, portal_config_order,
portal_config_desc, button_name, router_address, portal_config_pic, create_time, create_by, update_time,
update_by
from hw_portal_config
</sql>
<sql id="selectHwPortalConfigVo2">
select hpc.portal_config_id, hpc.portal_config_type,hpc.portal_config_type_id, hpc.portal_config_title, hpc.portal_config_order,
hpc.portal_config_desc, hpc.button_name, hpc.router_address, hpc.portal_config_pic, hpc.create_time, hpc.create_by, hpc.update_time,
hpc.update_by,
hpct.config_type_name,
hpct.home_config_type_pic,
hpct.config_type_icon,
hpct.home_config_type_name,
hpct.config_type_classfication,
hpct.parent_id,
hpct.ancestors
from hw_portal_config hpc
left join hw_portal_config_type hpct on hpc.portal_config_type_id = hpct.config_type_id
</sql>
<select id="selectHwPortalConfigList" parameterType="HwPortalConfig" resultMap="HwPortalConfigResult">
@ -38,6 +80,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="portalConfigPic != null and portalConfigPic != ''"> and portal_config_pic = #{portalConfigPic}</if>
</where>
</select>
<select id="selectHwPortalConfigList2" parameterType="HwPortalConfig" resultMap="HwPortalConfigResult2">
<include refid="selectHwPortalConfigVo2"/>
<where>
<if test="portalConfigType != null and portalConfigType != ''"> and portal_config_type = #{portalConfigType}</if>
<if test="portalConfigTypeId != null "> and portal_config_type_id = #{portalConfigTypeId}</if>
<if test="portalConfigTitle != null and portalConfigTitle != ''"> and portal_config_title like concat('%', #{portalConfigTitle}, '%')</if>
<if test="portalConfigOrder != null "> and portal_config_order = #{portalConfigOrder}</if>
<if test="portalConfigDesc != null and portalConfigDesc != ''"> and portal_config_desc = #{portalConfigDesc}</if>
<if test="buttonName != null and buttonName != ''"> and button_name like concat('%', #{buttonName}, '%')</if>
<if test="routerAddress != null and routerAddress != ''"> and router_address = #{routerAddress}</if>
<if test="portalConfigPic != null and portalConfigPic != ''"> and portal_config_pic = #{portalConfigPic}</if>
</where>
</select>
<select id="selectHwPortalConfigByPortalConfigId" parameterType="Long" resultMap="HwPortalConfigResult">
<include refid="selectHwPortalConfigVo"/>

@ -19,6 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="parentId" column="parent_id" />
<result property="configTypeName" column="config_type_name" />
</resultMap>
<resultMap id="HwProductInfoHwProductInfoDetailResult" type="HwProductInfo" extends="HwProductInfoResult">
@ -38,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createBy" column="sub_create_by" />
<result property="updateTime" column="sub_update_time" />
<result property="updateBy" column="sub_update_by" />
<result property="configModel" column="config_model" />
</resultMap>
<sql id="selectHwProductInfoVo">
@ -122,7 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectHwProductInfoJoinDetailList" parameterType="HwProductInfo" resultMap="HwProductInfoHwProductInfoDetailResult">
select a.product_info_id, a.config_type_id, a.tab_flag, a.config_modal, a.product_info_etitle, a.product_info_ctitle, a.product_info_order, a.create_time, a.create_by, a.update_time, a.update_by,
b.product_info_detail_id as sub_product_info_detail_id, b.parent_id as sub_parent_id, b.product_info_id as sub_product_info_id, b.product_info_detail_title as sub_product_info_detail_title, b.product_info_detail_desc as sub_product_info_detail_desc, b.product_info_detail_order as sub_product_info_detail_order, b.product_info_detail_pic as sub_product_info_detail_pic, b.ancestors as sub_ancestors, b.create_time as sub_create_time, b.create_by as sub_create_by, b.update_time as sub_update_time, b.update_by as sub_update_by
b.product_info_detail_id as sub_product_info_detail_id, b.parent_id as sub_parent_id, b.product_info_id as sub_product_info_id, b.product_info_detail_title as sub_product_info_detail_title, b.product_info_detail_desc as sub_product_info_detail_desc, b.product_info_detail_order as sub_product_info_detail_order, b.product_info_detail_pic as sub_product_info_detail_pic, b.ancestors as sub_ancestors, b.create_time as sub_create_time, b.create_by as sub_create_by, b.update_time as sub_update_time, b.update_by as sub_update_by,
b.config_modal AS config_model
from hw_product_info a
left join hw_product_info_detail b on b.product_info_id = a.product_info_id
<where>

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.portal.mapper.HwWebMapper">
<resultMap type="HwWeb" id="HwWebResult">
<result property="webId" column="web_id" />
<result property="webJson" column="web_json" />
<result property="webJsonString" column="web_json_string" />
<result property="webCode" column="web_code" />
</resultMap>
<sql id="selectHwWebVo">
select web_id, web_json, web_json_string, web_code from hw_web
</sql>
<select id="selectHwWebList" parameterType="HwWeb" resultMap="HwWebResult">
<include refid="selectHwWebVo"/>
<where>
<if test="webId != null "> and web_id = #{webId}</if>
<if test="webJson != null and webJson != ''"> and web_json = #{webJson}</if>
<if test="webJsonString != null and webJsonString != ''"> and web_json_string = #{webJsonString}</if>
<if test="webCode != null "> and web_code = #{webCode}</if>
</where>
</select>
<select id="selectHwWebByWebcode" parameterType="Long" resultMap="HwWebResult">
<include refid="selectHwWebVo"/>
where web_code = #{webCode}
</select>
<insert id="insertHwWeb" parameterType="HwWeb" useGeneratedKeys="true" keyProperty="webId">
insert into hw_web
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="webJson != null">web_json,</if>
<if test="webJsonString != null">web_json_string,</if>
<if test="webCode != null">web_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="webJson != null">#{webJson},</if>
<if test="webJsonString != null">#{webJsonString},</if>
<if test="webCode != null">#{webCode},</if>
</trim>
</insert>
<update id="updateHwWeb" parameterType="HwWeb">
update hw_web
<trim prefix="SET" suffixOverrides=",">
<if test="webJson != null">web_json = #{webJson},</if>
<if test="webJsonString != null">web_json_string = #{webJsonString},</if>
<if test="webCode != null">web_code = #{webCode},</if>
</trim>
where web_code = #{webCode}
</update>
<delete id="deleteHwWebByWebId" parameterType="Long">
delete from hw_web where web_id = #{webId}
</delete>
<delete id="deleteHwWebByWebIds" parameterType="String">
delete from hw_web where web_id in
<foreach item="webId" collection="array" open="(" separator="," close=")">
#{webId}
</foreach>
</delete>
</mapper>

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.portal.mapper.HwWebMenuMapper">
<resultMap type="HwWebMenu" id="HwWebMenuResult">
<result property="webMenuId" column="web_menu_id" />
<result property="parent" column="parent" />
<result property="ancestors" column="ancestors" />
<result property="status" column="status" />
<result property="webMenuName" column="web_menu_name" />
<result property="tenantId" column="tenant_id" />
<result property="webMenuPic" column="web_menu__pic" />
<result property="webMenuType" column="web_menu_type" />
</resultMap>
<sql id="selectHwWebMenuVo">
select web_menu_id, parent, ancestors, status, web_menu_name, tenant_id, web_menu__pic, web_menu_type from hw_web_menu
</sql>
<select id="selectHwWebMenuList" parameterType="HwWebMenu" resultMap="HwWebMenuResult">
<include refid="selectHwWebMenuVo"/>
<where>
<if test="parent != null "> and parent = #{parent}</if>
<if test="ancestors != null and ancestors != ''"> and ancestors = #{ancestors}</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="tenantId != null "> and tenant_id = #{tenantId}</if>
<if test="webMenuPic != null and webMenuPic != ''"> and web_menu__pic = #{webMenuPic}</if>
<if test="webMenuType != null "> and web_menu_type = #{webMenuType}</if>
</where>
</select>
<select id="selectHwWebMenuByWebMenuId" parameterType="Long" resultMap="HwWebMenuResult">
<include refid="selectHwWebMenuVo"/>
where web_menu_id = #{webMenuId}
</select>
<insert id="insertHwWebMenu" parameterType="HwWebMenu">
insert into hw_web_menu
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="webMenuId != null">web_menu_id,</if>
<if test="parent != null">parent,</if>
<if test="ancestors != null">ancestors,</if>
<if test="status != null">status,</if>
<if test="webMenuName != null">web_menu_name,</if>
<if test="tenantId != null">tenant_id,</if>
<if test="webMenuPic != null">web_menu__pic,</if>
<if test="webMenuType != null">web_menu_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="webMenuId != null">#{webMenuId},</if>
<if test="parent != null">#{parent},</if>
<if test="ancestors != null">#{ancestors},</if>
<if test="status != null">#{status},</if>
<if test="webMenuName != null">#{webMenuName},</if>
<if test="tenantId != null">#{tenantId},</if>
<if test="webMenuPic != null">#{webMenuPic},</if>
<if test="webMenuType != null">#{webMenuType},</if>
</trim>
</insert>
<update id="updateHwWebMenu" parameterType="HwWebMenu">
update hw_web_menu
<trim prefix="SET" suffixOverrides=",">
<if test="parent != null">parent = #{parent},</if>
<if test="ancestors != null">ancestors = #{ancestors},</if>
<if test="status != null">status = #{status},</if>
<if test="webMenuName != null">web_menu_name = #{webMenuName},</if>
<if test="tenantId != null">tenant_id = #{tenantId},</if>
<if test="webMenuPic != null">web_menu__pic = #{webMenuPic},</if>
<if test="webMenuType != null">web_menu_type = #{webMenuType},</if>
</trim>
where web_menu_id = #{webMenuId}
</update>
<delete id="deleteHwWebMenuByWebMenuId" parameterType="Long">
delete from hw_web_menu where web_menu_id = #{webMenuId}
</delete>
<delete id="deleteHwWebMenuByWebMenuIds" parameterType="String">
delete from hw_web_menu where web_menu_id in
<foreach item="webMenuId" collection="array" open="(" separator="," close=")">
#{webMenuId}
</foreach>
</delete>
</mapper>

@ -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,52 @@
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'
})
}
export function selectMenuTree(query) {
return request({
url: '/portal/hwWebMenu/selectMenuTree',
method: 'get',
params: query
})
}

@ -0,0 +1,308 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="父节点" prop="parent">
<el-input
v-model="queryParams.parent"
placeholder="请输入父节点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="祖先" prop="ancestors">
<el-input
v-model="queryParams.ancestors"
placeholder="请输入祖先"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="菜单名称" prop="webMenuName">
<el-input
v-model="queryParams.webMenuName"
placeholder="请输入菜单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="租户" prop="tenantId">
<el-input
v-model="queryParams.tenantId"
placeholder="请输入租户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="图片地址" prop="webMenuPic">
<el-input
v-model="queryParams.webMenuPic"
placeholder="请输入图片地址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['portal:hwWebMenu:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
>展开/折叠</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="hwWebMenuList"
row-key="webMenuId"
:default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column label="父节点" prop="parent" />
<el-table-column label="祖先" align="center" prop="ancestors" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="菜单名称" align="center" prop="webMenuName" />
<el-table-column label="租户" align="center" prop="tenantId" />
<el-table-column label="图片地址" align="center" prop="webMenuPic" />
<el-table-column label="官网菜单类型" align="center" prop="webMenuType" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['portal:hwWebMenu:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['portal:hwWebMenu:add']"
>新增</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['portal:hwWebMenu:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改haiwei官网菜单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="父节点" prop="parent">
<treeselect v-model="form.parent" :options="hwWebMenuOptions" :normalizer="normalizer" placeholder="请选择父节点" />
</el-form-item>
<el-form-item label="菜单名称" prop="webMenuName">
<el-input v-model="form.webMenuName" placeholder="请输入菜单名称" />
</el-form-item>
<el-form-item label="租户" prop="tenantId">
<el-input v-model="form.tenantId" placeholder="请输入租户" />
</el-form-item>
<el-form-item label="图片地址" prop="webMenuPic">
<el-input v-model="form.webMenuPic" placeholder="请输入图片地址" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listHwWebMenu, getHwWebMenu, delHwWebMenu, addHwWebMenu, updateHwWebMenu } from "@/api/portal/hwWebMenu";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "HwWebMenu",
components: {
Treeselect
},
data() {
return {
//
loading: true,
//
showSearch: true,
// haiwei
hwWebMenuList: [],
// haiwei
hwWebMenuOptions: [],
//
title: "",
//
open: false,
//
isExpandAll: true,
//
refreshTable: true,
//
queryParams: {
parent: null,
ancestors: null,
status: null,
webMenuName: null,
tenantId: null,
webMenuPic: null,
webMenuType: null
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询haiwei官网菜单列表 */
getList() {
this.loading = true;
listHwWebMenu(this.queryParams).then(response => {
this.hwWebMenuList = this.handleTree(response.data, "webMenuId", "parent");
this.loading = false;
});
},
/** 转换haiwei官网菜单数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.webMenuId,
label: node.webMenuName,
children: node.children
};
},
/** 查询haiwei官网菜单下拉树结构 */
getTreeselect() {
listHwWebMenu().then(response => {
this.hwWebMenuOptions = [];
const data = { webMenuId: 0, webMenuName: '顶级节点', children: [] };
data.children = this.handleTree(response.data, "webMenuId", "parent");
this.hwWebMenuOptions.push(data);
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
webMenuId: null,
parent: null,
ancestors: null,
status: null,
webMenuName: null,
tenantId: null,
webMenuPic: null,
webMenuType: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd(row) {
this.reset();
this.getTreeselect();
if (row != null && row.webMenuId) {
this.form.parent = row.webMenuId;
} else {
this.form.parent = 0;
}
this.open = true;
this.title = "添加haiwei官网菜单";
},
/** 展开/折叠操作 */
toggleExpandAll() {
this.refreshTable = false;
this.isExpandAll = !this.isExpandAll;
this.$nextTick(() => {
this.refreshTable = true;
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.getTreeselect();
if (row != null) {
this.form.parent = row.webMenuId;
}
getHwWebMenu(row.webMenuId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改haiwei官网菜单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.webMenuId != null) {
updateHwWebMenu(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addHwWebMenu(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
this.$modal.confirm('是否确认删除haiwei官网菜单编号为"' + row.webMenuId + '"的数据项?').then(function() {
return delHwWebMenu(row.webMenuId);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}
}
};
</script>
Loading…
Cancel
Save