diff --git a/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/CarouselAdsController.java b/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/CarouselAdsController.java index 7af56e1..98ddcb4 100644 --- a/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/CarouselAdsController.java +++ b/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/CarouselAdsController.java @@ -44,7 +44,8 @@ public class CarouselAdsController extends BaseController /** * 导出轮播广告列表 */ - @PreAuthorize("@ss.hasPermi('muhu:ads:export')") +// @PreAuthorize("@ss.hasPermi('muhu:ads:export')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "轮播广告", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, CarouselAds carouselAds) @@ -57,7 +58,8 @@ public class CarouselAdsController extends BaseController /** * 获取轮播广告详细信息 */ - @PreAuthorize("@ss.hasPermi('muhu:ads:query')") +// @PreAuthorize("@ss.hasPermi('muhu:ads:query')") + @PreAuthorize("@ss.hasRole('muhu')") @GetMapping(value = "/{carouselId}") public AjaxResult getInfo(@PathVariable("carouselId") Long carouselId) { @@ -67,7 +69,8 @@ public class CarouselAdsController extends BaseController /** * 新增轮播广告 */ - @PreAuthorize("@ss.hasPermi('muhu:ads:add')") +// @PreAuthorize("@ss.hasPermi('muhu:ads:add')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "轮播广告", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody CarouselAds carouselAds) @@ -78,7 +81,8 @@ public class CarouselAdsController extends BaseController /** * 修改轮播广告 */ - @PreAuthorize("@ss.hasPermi('muhu:ads:edit')") +// @PreAuthorize("@ss.hasPermi('muhu:ads:edit')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "轮播广告", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody CarouselAds carouselAds) @@ -89,7 +93,8 @@ public class CarouselAdsController extends BaseController /** * 删除轮播广告 */ - @PreAuthorize("@ss.hasPermi('muhu:ads:remove')") +// @PreAuthorize("@ss.hasPermi('muhu:ads:remove')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "轮播广告", businessType = BusinessType.DELETE) @DeleteMapping("/{carouselIds}") public AjaxResult remove(@PathVariable Long[] carouselIds) diff --git a/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/DisasterWarningController.java b/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/DisasterWarningController.java index 16d4e53..c41e76d 100644 --- a/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/DisasterWarningController.java +++ b/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/DisasterWarningController.java @@ -37,7 +37,8 @@ public class DisasterWarningController extends BaseController /** * 查询灾害预警信息列表 */ - @PreAuthorize("@ss.hasPermi('muhu:warning:list')") +// @PreAuthorize("@ss.hasPermi('muhu:warning:list')") + @PreAuthorize("@ss.hasRole('muhu')") @GetMapping("/list") public TableDataInfo list(DisasterWarning disasterWarning) { @@ -49,7 +50,8 @@ public class DisasterWarningController extends BaseController /** * 导出灾害预警信息列表 */ - @PreAuthorize("@ss.hasPermi('muhu:warning:export')") +// @PreAuthorize("@ss.hasPermi('muhu:warning:export')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "灾害预警信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, DisasterWarning disasterWarning) @@ -62,7 +64,8 @@ public class DisasterWarningController extends BaseController /** * 获取灾害预警信息详细信息 */ - @PreAuthorize("@ss.hasPermi('muhu:warning:query')") +// @PreAuthorize("@ss.hasPermi('muhu:warning:query')") + @PreAuthorize("@ss.hasRole('muhu')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +75,8 @@ public class DisasterWarningController extends BaseController /** * 新增灾害预警信息 */ - @PreAuthorize("@ss.hasPermi('muhu:warning:add')") +// @PreAuthorize("@ss.hasPermi('muhu:warning:add')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "灾害预警信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody DisasterWarning disasterWarning) @@ -83,7 +87,7 @@ public class DisasterWarningController extends BaseController /** * 修改灾害预警信息 */ - @PreAuthorize("@ss.hasPermi('muhu:warning:edit')") +// @PreAuthorize("@ss.hasPermi('muhu:warning:edit')") @Log(title = "灾害预警信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody DisasterWarning disasterWarning) diff --git a/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/MerchantMapInfoController.java b/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/MerchantMapInfoController.java index a0a0c60..4963dce 100644 --- a/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/MerchantMapInfoController.java +++ b/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/MerchantMapInfoController.java @@ -37,7 +37,8 @@ public class MerchantMapInfoController extends BaseController /** * 查询商户地图信息列表 */ - @PreAuthorize("@ss.hasPermi('muhu:info:list')") +// @PreAuthorize("@ss.hasPermi('muhu:info:list')") + @PreAuthorize("@ss.hasRole('muhu')") @GetMapping("/list") public TableDataInfo list(MerchantMapInfo merchantMapInfo) { @@ -49,7 +50,8 @@ public class MerchantMapInfoController extends BaseController /** * 导出商户地图信息列表 */ - @PreAuthorize("@ss.hasPermi('muhu:info:export')") +// @PreAuthorize("@ss.hasPermi('muhu:info:export')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "商户地图信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, MerchantMapInfo merchantMapInfo) @@ -62,7 +64,8 @@ public class MerchantMapInfoController extends BaseController /** * 获取商户地图信息详细信息 */ - @PreAuthorize("@ss.hasPermi('muhu:info:query')") +// @PreAuthorize("@ss.hasPermi('muhu:info:query')") + @PreAuthorize("@ss.hasRole('muhu')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +75,8 @@ public class MerchantMapInfoController extends BaseController /** * 新增商户地图信息 */ - @PreAuthorize("@ss.hasPermi('muhu:info:add')") +// @PreAuthorize("@ss.hasPermi('muhu:info:add')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "商户地图信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody MerchantMapInfo merchantMapInfo) @@ -83,7 +87,8 @@ public class MerchantMapInfoController extends BaseController /** * 修改商户地图信息 */ - @PreAuthorize("@ss.hasPermi('muhu:info:edit')") +// @PreAuthorize("@ss.hasPermi('muhu:info:edit')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "商户地图信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody MerchantMapInfo merchantMapInfo) @@ -94,7 +99,8 @@ public class MerchantMapInfoController extends BaseController /** * 删除商户地图信息 */ - @PreAuthorize("@ss.hasPermi('muhu:info:remove')") +// @PreAuthorize("@ss.hasPermi('muhu:info:remove')") + @PreAuthorize("@ss.hasRole('muhu')") @Log(title = "商户地图信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/MuhuServiceGuideController.java b/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/MuhuServiceGuideController.java new file mode 100644 index 0000000..c4fd748 --- /dev/null +++ b/chenhai-admin/src/main/java/com/chenhai/web/controller/muhu/MuhuServiceGuideController.java @@ -0,0 +1,110 @@ +package com.chenhai.web.controller.muhu; + +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +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.chenhai.common.annotation.Log; +import com.chenhai.common.core.controller.BaseController; +import com.chenhai.common.core.domain.AjaxResult; +import com.chenhai.common.enums.BusinessType; +import com.chenhai.muhu.domain.MuhuServiceGuide; +import com.chenhai.muhu.service.IMuhuServiceGuideService; +import com.chenhai.common.utils.poi.ExcelUtil; +import com.chenhai.common.core.page.TableDataInfo; + +/** + * 办事指南Controller + * + * @author ruoyi + * @date 2025-12-31 + */ +@RestController +@RequestMapping("/muhu/guide") +public class MuhuServiceGuideController extends BaseController +{ + @Autowired + private IMuhuServiceGuideService muhuServiceGuideService; + + /** + * 查询办事指南列表 + */ +// @PreAuthorize("@ss.hasPermi('muhu:guide:list')") + @PreAuthorize("@ss.hasRole('muhu')") + @GetMapping("/list") + public TableDataInfo list(MuhuServiceGuide muhuServiceGuide) + { + startPage(); + List list = muhuServiceGuideService.selectMuhuServiceGuideList(muhuServiceGuide); + return getDataTable(list); + } + + /** + * 导出办事指南列表 + */ +// @PreAuthorize("@ss.hasPermi('muhu:guide:export')") + @PreAuthorize("@ss.hasRole('muhu')") + @Log(title = "办事指南", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MuhuServiceGuide muhuServiceGuide) + { + List list = muhuServiceGuideService.selectMuhuServiceGuideList(muhuServiceGuide); + ExcelUtil util = new ExcelUtil(MuhuServiceGuide.class); + util.exportExcel(response, list, "办事指南数据"); + } + + /** + * 获取办事指南详细信息 + */ +// @PreAuthorize("@ss.hasPermi('muhu:guide:query')") + @PreAuthorize("@ss.hasRole('muhu')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(muhuServiceGuideService.selectMuhuServiceGuideById(id)); + } + + /** + * 新增办事指南 + */ +// @PreAuthorize("@ss.hasPermi('muhu:guide:add')") + @PreAuthorize("@ss.hasRole('muhu')") + @Log(title = "办事指南", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MuhuServiceGuide muhuServiceGuide) + { + return toAjax(muhuServiceGuideService.insertMuhuServiceGuide(muhuServiceGuide)); + } + + /** + * 修改办事指南 + */ +// @PreAuthorize("@ss.hasPermi('muhu:guide:edit')") + @PreAuthorize("@ss.hasRole('muhu')") + @Log(title = "办事指南", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MuhuServiceGuide muhuServiceGuide) + { + return toAjax(muhuServiceGuideService.updateMuhuServiceGuide(muhuServiceGuide)); + } + + /** + * 删除办事指南 + */ +// @PreAuthorize("@ss.hasPermi('muhu:guide:remove')") + @PreAuthorize("@ss.hasRole('muhu')") + @Log(title = "办事指南", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(muhuServiceGuideService.deleteMuhuServiceGuideByIds(ids)); + } +} diff --git a/chenhai-system/src/main/java/com/chenhai/muhu/domain/MerchantMapInfo.java b/chenhai-system/src/main/java/com/chenhai/muhu/domain/MerchantMapInfo.java index 94a41de..70790f9 100644 --- a/chenhai-system/src/main/java/com/chenhai/muhu/domain/MerchantMapInfo.java +++ b/chenhai-system/src/main/java/com/chenhai/muhu/domain/MerchantMapInfo.java @@ -21,7 +21,7 @@ public class MerchantMapInfo extends BaseEntity /** 商户名称 */ @Excel(name = "商户名称") - private String merchantName; + private String title; /** 商户类型:药店/兽医诊所/畜牧站/农牧局/其他 */ @Excel(name = "商户类型:药店/兽医诊所/畜牧站/农牧局/其他") @@ -47,6 +47,19 @@ public class MerchantMapInfo extends BaseEntity @Excel(name = "经度") private BigDecimal longitude; + @Excel(name = "图标") + private String iconPath; + + public void setIconPath(String iconPath) + { + this.iconPath = iconPath; + } + + public String getIconPath() + { + return iconPath; + } + public void setId(Long id) { this.id = id; @@ -57,14 +70,14 @@ public class MerchantMapInfo extends BaseEntity return id; } - public void setMerchantName(String merchantName) + public void setTitle(String title) { - this.merchantName = merchantName; + this.title = title; } - public String getMerchantName() + public String getTitle() { - return merchantName; + return title; } public void setMerchantType(String merchantType) @@ -131,13 +144,14 @@ public class MerchantMapInfo extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) - .append("merchantName", getMerchantName()) + .append("title", getTitle()) .append("merchantType", getMerchantType()) .append("merchantSubtype", getMerchantSubtype()) .append("region", getRegion()) .append("address", getAddress()) .append("latitude", getLatitude()) .append("longitude", getLongitude()) + .append("iconPath", getIconPath()) .toString(); } } diff --git a/chenhai-system/src/main/java/com/chenhai/muhu/domain/MuhuServiceGuide.java b/chenhai-system/src/main/java/com/chenhai/muhu/domain/MuhuServiceGuide.java new file mode 100644 index 0000000..fd53373 --- /dev/null +++ b/chenhai-system/src/main/java/com/chenhai/muhu/domain/MuhuServiceGuide.java @@ -0,0 +1,158 @@ +package com.chenhai.muhu.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.chenhai.common.annotation.Excel; +import com.chenhai.common.core.domain.BaseEntity; + +/** + * 办事指南对象 muhu_service_guide + * + * @author ruoyi + * @date 2025-12-31 + */ +public class MuhuServiceGuide extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 商户ID */ + private Long id; + + /** 图标 */ + @Excel(name = "图标") + private String iconPath; + + /** 商户名称 */ + @Excel(name = "商户名称") + private String title; + + /** 商户类型:药店/兽医诊所/畜牧站/农牧局/其他 */ + @Excel(name = "商户类型:药店/兽医诊所/畜牧站/农牧局/其他") + private String guideType; + + /** 商户子类型(如:药店_兽药、药店_人药) */ + @Excel(name = "商户子类型", readConverterExp = "如=:药店_兽药、药店_人药") + private String merchantSubtype; + + /** 所在区域 */ + @Excel(name = "所在区域") + private String region; + + /** 详细地址 */ + @Excel(name = "详细地址") + private String address; + + /** 纬度 */ + @Excel(name = "纬度") + private BigDecimal latitude; + + /** 经度 */ + @Excel(name = "经度") + private BigDecimal longitude; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setIconPath(String iconPath) + { + this.iconPath = iconPath; + } + + public String getIconPath() + { + return iconPath; + } + + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + + public void setGuideType(String guideType) + { + this.guideType = guideType; + } + + public String getGuideType() + { + return guideType; + } + + public void setMerchantSubtype(String merchantSubtype) + { + this.merchantSubtype = merchantSubtype; + } + + public String getMerchantSubtype() + { + return merchantSubtype; + } + + public void setRegion(String region) + { + this.region = region; + } + + public String getRegion() + { + return region; + } + + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + + public void setLatitude(BigDecimal latitude) + { + this.latitude = latitude; + } + + public BigDecimal getLatitude() + { + return latitude; + } + + public void setLongitude(BigDecimal longitude) + { + this.longitude = longitude; + } + + public BigDecimal getLongitude() + { + return longitude; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("iconPath", getIconPath()) + .append("title", getTitle()) + .append("guideType", getGuideType()) + .append("merchantSubtype", getMerchantSubtype()) + .append("region", getRegion()) + .append("address", getAddress()) + .append("latitude", getLatitude()) + .append("longitude", getLongitude()) + .toString(); + } +} diff --git a/chenhai-system/src/main/java/com/chenhai/muhu/mapper/MuhuServiceGuideMapper.java b/chenhai-system/src/main/java/com/chenhai/muhu/mapper/MuhuServiceGuideMapper.java new file mode 100644 index 0000000..dcb29a1 --- /dev/null +++ b/chenhai-system/src/main/java/com/chenhai/muhu/mapper/MuhuServiceGuideMapper.java @@ -0,0 +1,61 @@ +package com.chenhai.muhu.mapper; + +import java.util.List; +import com.chenhai.muhu.domain.MuhuServiceGuide; + +/** + * 办事指南Mapper接口 + * + * @author ruoyi + * @date 2025-12-31 + */ +public interface MuhuServiceGuideMapper +{ + /** + * 查询办事指南 + * + * @param id 办事指南主键 + * @return 办事指南 + */ + public MuhuServiceGuide selectMuhuServiceGuideById(Long id); + + /** + * 查询办事指南列表 + * + * @param muhuServiceGuide 办事指南 + * @return 办事指南集合 + */ + public List selectMuhuServiceGuideList(MuhuServiceGuide muhuServiceGuide); + + /** + * 新增办事指南 + * + * @param muhuServiceGuide 办事指南 + * @return 结果 + */ + public int insertMuhuServiceGuide(MuhuServiceGuide muhuServiceGuide); + + /** + * 修改办事指南 + * + * @param muhuServiceGuide 办事指南 + * @return 结果 + */ + public int updateMuhuServiceGuide(MuhuServiceGuide muhuServiceGuide); + + /** + * 删除办事指南 + * + * @param id 办事指南主键 + * @return 结果 + */ + public int deleteMuhuServiceGuideById(Long id); + + /** + * 批量删除办事指南 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMuhuServiceGuideByIds(Long[] ids); +} diff --git a/chenhai-system/src/main/java/com/chenhai/muhu/service/IMuhuServiceGuideService.java b/chenhai-system/src/main/java/com/chenhai/muhu/service/IMuhuServiceGuideService.java new file mode 100644 index 0000000..bbf462a --- /dev/null +++ b/chenhai-system/src/main/java/com/chenhai/muhu/service/IMuhuServiceGuideService.java @@ -0,0 +1,61 @@ +package com.chenhai.muhu.service; + +import java.util.List; +import com.chenhai.muhu.domain.MuhuServiceGuide; + +/** + * 办事指南Service接口 + * + * @author ruoyi + * @date 2025-12-31 + */ +public interface IMuhuServiceGuideService +{ + /** + * 查询办事指南 + * + * @param id 办事指南主键 + * @return 办事指南 + */ + public MuhuServiceGuide selectMuhuServiceGuideById(Long id); + + /** + * 查询办事指南列表 + * + * @param muhuServiceGuide 办事指南 + * @return 办事指南集合 + */ + public List selectMuhuServiceGuideList(MuhuServiceGuide muhuServiceGuide); + + /** + * 新增办事指南 + * + * @param muhuServiceGuide 办事指南 + * @return 结果 + */ + public int insertMuhuServiceGuide(MuhuServiceGuide muhuServiceGuide); + + /** + * 修改办事指南 + * + * @param muhuServiceGuide 办事指南 + * @return 结果 + */ + public int updateMuhuServiceGuide(MuhuServiceGuide muhuServiceGuide); + + /** + * 批量删除办事指南 + * + * @param ids 需要删除的办事指南主键集合 + * @return 结果 + */ + public int deleteMuhuServiceGuideByIds(Long[] ids); + + /** + * 删除办事指南信息 + * + * @param id 办事指南主键 + * @return 结果 + */ + public int deleteMuhuServiceGuideById(Long id); +} diff --git a/chenhai-system/src/main/java/com/chenhai/muhu/service/impl/MuhuServiceGuideServiceImpl.java b/chenhai-system/src/main/java/com/chenhai/muhu/service/impl/MuhuServiceGuideServiceImpl.java new file mode 100644 index 0000000..38754ac --- /dev/null +++ b/chenhai-system/src/main/java/com/chenhai/muhu/service/impl/MuhuServiceGuideServiceImpl.java @@ -0,0 +1,93 @@ +package com.chenhai.muhu.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.chenhai.muhu.mapper.MuhuServiceGuideMapper; +import com.chenhai.muhu.domain.MuhuServiceGuide; +import com.chenhai.muhu.service.IMuhuServiceGuideService; + +/** + * 办事指南Service业务层处理 + * + * @author ruoyi + * @date 2025-12-31 + */ +@Service +public class MuhuServiceGuideServiceImpl implements IMuhuServiceGuideService +{ + @Autowired + private MuhuServiceGuideMapper muhuServiceGuideMapper; + + /** + * 查询办事指南 + * + * @param id 办事指南主键 + * @return 办事指南 + */ + @Override + public MuhuServiceGuide selectMuhuServiceGuideById(Long id) + { + return muhuServiceGuideMapper.selectMuhuServiceGuideById(id); + } + + /** + * 查询办事指南列表 + * + * @param muhuServiceGuide 办事指南 + * @return 办事指南 + */ + @Override + public List selectMuhuServiceGuideList(MuhuServiceGuide muhuServiceGuide) + { + return muhuServiceGuideMapper.selectMuhuServiceGuideList(muhuServiceGuide); + } + + /** + * 新增办事指南 + * + * @param muhuServiceGuide 办事指南 + * @return 结果 + */ + @Override + public int insertMuhuServiceGuide(MuhuServiceGuide muhuServiceGuide) + { + return muhuServiceGuideMapper.insertMuhuServiceGuide(muhuServiceGuide); + } + + /** + * 修改办事指南 + * + * @param muhuServiceGuide 办事指南 + * @return 结果 + */ + @Override + public int updateMuhuServiceGuide(MuhuServiceGuide muhuServiceGuide) + { + return muhuServiceGuideMapper.updateMuhuServiceGuide(muhuServiceGuide); + } + + /** + * 批量删除办事指南 + * + * @param ids 需要删除的办事指南主键 + * @return 结果 + */ + @Override + public int deleteMuhuServiceGuideByIds(Long[] ids) + { + return muhuServiceGuideMapper.deleteMuhuServiceGuideByIds(ids); + } + + /** + * 删除办事指南信息 + * + * @param id 办事指南主键 + * @return 结果 + */ + @Override + public int deleteMuhuServiceGuideById(Long id) + { + return muhuServiceGuideMapper.deleteMuhuServiceGuideById(id); + } +} diff --git a/chenhai-system/src/main/resources/mapper/muhu/MerchantMapInfoMapper.xml b/chenhai-system/src/main/resources/mapper/muhu/MerchantMapInfoMapper.xml index 2798d5a..2d0fd74 100644 --- a/chenhai-system/src/main/resources/mapper/muhu/MerchantMapInfoMapper.xml +++ b/chenhai-system/src/main/resources/mapper/muhu/MerchantMapInfoMapper.xml @@ -1,84 +1,89 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + + - select id, merchant_name, merchant_type, merchant_subtype, region, address, latitude, longitude from merchant_map_info + select id, title, merchant_type, merchant_subtype, region, address, latitude, longitude, icon_path from muhu_merchant_map_info - + - insert into merchant_map_info + insert into muhu_merchant_map_info - merchant_name, + title, merchant_type, merchant_subtype, region, address, latitude, longitude, - + icon_path, + - #{merchantName}, + #{title}, #{merchantType}, #{merchantSubtype}, #{region}, #{address}, #{latitude}, #{longitude}, - + #{iconPath}, + - update merchant_map_info + update muhu_merchant_map_info - merchant_name = #{merchantName}, + title = #{title}, merchant_type = #{merchantType}, merchant_subtype = #{merchantSubtype}, region = #{region}, address = #{address}, latitude = #{latitude}, longitude = #{longitude}, + icon_path = #{iconPath}, where id = #{id} - delete from merchant_map_info where id = #{id} + delete from muhu_merchant_map_info where id = #{id} - delete from merchant_map_info where id in + delete from muhu_merchant_map_info where id in #{id} diff --git a/chenhai-system/src/main/resources/mapper/muhu/MuhuServiceGuideMapper.xml b/chenhai-system/src/main/resources/mapper/muhu/MuhuServiceGuideMapper.xml new file mode 100644 index 0000000..bc98f19 --- /dev/null +++ b/chenhai-system/src/main/resources/mapper/muhu/MuhuServiceGuideMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + select id, iconPath, title, guide_type, merchant_subtype, region, address, latitude, longitude from muhu_service_guide + + + + + + + + insert into muhu_service_guide + + iconPath, + title, + guide_type, + merchant_subtype, + region, + address, + latitude, + longitude, + + + #{iconPath}, + #{title}, + #{guideType}, + #{merchantSubtype}, + #{region}, + #{address}, + #{latitude}, + #{longitude}, + + + + + update muhu_service_guide + + iconPath = #{iconPath}, + title = #{title}, + guide_type = #{guideType}, + merchant_subtype = #{merchantSubtype}, + region = #{region}, + address = #{address}, + latitude = #{latitude}, + longitude = #{longitude}, + + where id = #{id} + + + + delete from muhu_service_guide where id = #{id} + + + + delete from muhu_service_guide where id in + + #{id} + + + \ No newline at end of file diff --git a/chenhai-ui/src/api/muhu/guide.js b/chenhai-ui/src/api/muhu/guide.js new file mode 100644 index 0000000..22548c5 --- /dev/null +++ b/chenhai-ui/src/api/muhu/guide.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询办事指南列表 +export function listGuide(query) { + return request({ + url: '/muhu/guide/list', + method: 'get', + params: query + }) +} + +// 查询办事指南详细 +export function getGuide(id) { + return request({ + url: '/muhu/guide/' + id, + method: 'get' + }) +} + +// 新增办事指南 +export function addGuide(data) { + return request({ + url: '/muhu/guide', + method: 'post', + data: data + }) +} + +// 修改办事指南 +export function updateGuide(data) { + return request({ + url: '/muhu/guide', + method: 'put', + data: data + }) +} + +// 删除办事指南 +export function delGuide(id) { + return request({ + url: '/muhu/guide/' + id, + method: 'delete' + }) +} diff --git a/chenhai-ui/src/api/muhu/info.js b/chenhai-ui/src/api/muhu/info.js new file mode 100644 index 0000000..74729ee --- /dev/null +++ b/chenhai-ui/src/api/muhu/info.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询商户地图信息列表 +export function listInfo(query) { + return request({ + url: '/muhu/info/list', + method: 'get', + params: query + }) +} + +// 查询商户地图信息详细 +export function getInfo(id) { + return request({ + url: '/muhu/info/' + id, + method: 'get' + }) +} + +// 新增商户地图信息 +export function addInfo(data) { + return request({ + url: '/muhu/info', + method: 'post', + data: data + }) +} + +// 修改商户地图信息 +export function updateInfo(data) { + return request({ + url: '/muhu/info', + method: 'put', + data: data + }) +} + +// 删除商户地图信息 +export function delInfo(id) { + return request({ + url: '/muhu/info/' + id, + method: 'delete' + }) +} diff --git a/chenhai-ui/src/api/system/base.js b/chenhai-ui/src/api/system/base.js new file mode 100644 index 0000000..b357abc --- /dev/null +++ b/chenhai-ui/src/api/system/base.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询知识库管理列表 +export function listBase(query) { + return request({ + url: '/system/base/list', + method: 'get', + params: query + }) +} + +// 查询知识库管理详细 +export function getBase(id) { + return request({ + url: '/system/base/' + id, + method: 'get' + }) +} + +// 新增知识库管理 +export function addBase(data) { + return request({ + url: '/system/base', + method: 'post', + data: data + }) +} + +// 修改知识库管理 +export function updateBase(data) { + return request({ + url: '/system/base', + method: 'put', + data: data + }) +} + +// 删除知识库管理 +export function delBase(id) { + return request({ + url: '/system/base/' + id, + method: 'delete' + }) +} diff --git a/chenhai-ui/src/views/muhu/guide/index.vue b/chenhai-ui/src/views/muhu/guide/index.vue new file mode 100644 index 0000000..fea7620 --- /dev/null +++ b/chenhai-ui/src/views/muhu/guide/index.vue @@ -0,0 +1,304 @@ + + + diff --git a/chenhai-ui/src/views/system/base/index.vue b/chenhai-ui/src/views/system/base/index.vue new file mode 100644 index 0000000..32d584a --- /dev/null +++ b/chenhai-ui/src/views/system/base/index.vue @@ -0,0 +1,322 @@ + + + diff --git a/chenhai-ui/src/views/vet/certificate/index.vue b/chenhai-ui/src/views/vet/certificate/index.vue index 72e7482..ccc9e5d 100644 --- a/chenhai-ui/src/views/vet/certificate/index.vue +++ b/chenhai-ui/src/views/vet/certificate/index.vue @@ -230,7 +230,7 @@