diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java index 24e3f41..6e5bfe1 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java @@ -74,7 +74,8 @@ public class PasswordAuthStrategy implements IAuthStrategy { model.setDevice(client.getDeviceType()); // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 // 例如: 后台用户30分钟过期 app用户1天过期 - model.setTimeout(client.getTimeout()); + //model.setTimeout(client.getTimeout()); + model.setTimeout(43200L); // 12小时 = 12 * 60 * 60 model.setActiveTimeout(client.getActiveTimeout()); model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); // 生成token diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/DeviceInfoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/DeviceInfoController.java new file mode 100644 index 0000000..b47850b --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/DeviceInfoController.java @@ -0,0 +1,113 @@ +package org.dromara.demo.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.demo.domain.vo.StationSelectVo; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.demo.domain.vo.DeviceInfoVo; +import org.dromara.demo.domain.bo.DeviceInfoBo; +import org.dromara.demo.service.IDeviceInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备信息 + * + * @author GJH + * @date 2025-07-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/air/deviceInfo") +public class DeviceInfoController extends BaseController { + + private final IDeviceInfoService deviceInfoService; + + /** + * 查询设备信息列表 + */ + //@SaCheckPermission("air:deviceInfo:list") + @GetMapping("/list") + public TableDataInfo list(DeviceInfoBo bo, PageQuery pageQuery) { + return deviceInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备信息列表 + */ + //@SaCheckPermission("air:deviceInfo:export") + @Log(title = "设备信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DeviceInfoBo bo, HttpServletResponse response) { + List list = deviceInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "设备信息", DeviceInfoVo.class, response); + } + + /** + * 获取设备信息详细信息 + * + * @param id 主键 + */ + //@SaCheckPermission("air:deviceInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(deviceInfoService.queryById(id)); + } + + /** + * 新增设备信息 + */ + //@SaCheckPermission("air:deviceInfo:add") + @Log(title = "设备信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DeviceInfoBo bo) { + return toAjax(deviceInfoService.insertByBo(bo)); + } + + /** + * 修改设备信息 + */ + //@SaCheckPermission("air:deviceInfo:edit") + @Log(title = "设备信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DeviceInfoBo bo) { + return toAjax(deviceInfoService.updateByBo(bo)); + } + + /** + * 删除设备信息 + * + * @param ids 主键串 + */ + //@SaCheckPermission("air:deviceInfo:remove") + @Log(title = "设备信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(deviceInfoService.deleteWithValidByIds(List.of(ids), true)); + } + + + @GetMapping("/getStationList") + public R< List> getStationList() { + List stationList = deviceInfoService.getStationList(); + return R.ok(stationList); + } +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java new file mode 100644 index 0000000..579b4e4 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java @@ -0,0 +1,84 @@ +package org.dromara.demo.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 设备信息对象 device_info + * + * @author GJH + * @date 2025-07-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("device_info") +public class DeviceInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID（自增） + */ + @TableId(value = "id") + private String id; + + /** + * 站点 + */ + private String station; + + /** + * 所属区域 + */ + private String area; + + /** + * 设备名称 + */ + private String device; + + /** + * 设备型号 + */ + private String model; + + /** + * 生产厂家 + */ + private String manufacturer; + + /** + * 生产日期 + */ + private Date manufactureDate; + + /** + * 序列号 + */ + private String number; + + /** + * 检测物 + */ + private String testSubstance; + + /** + * 状态 + */ + private String status; + + /** + * 删除标志 + */ + @TableLogic + private Long delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/DeviceInfoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/DeviceInfoBo.java new file mode 100644 index 0000000..61b819f --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/DeviceInfoBo.java @@ -0,0 +1,89 @@ +package org.dromara.demo.domain.bo; + +import org.dromara.demo.domain.DeviceInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 设备信息业务对象 device_info + * + * @author GJH + * @date 2025-07-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DeviceInfo.class, reverseConvertGenerate = false) +public class DeviceInfoBo extends BaseEntity { + + /** + * 主键ID（自增） + */ + //@NotBlank(message = "主键ID（自增）不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 站点 + */ + //@NotBlank(message = "站点不能为空", groups = { AddGroup.class, EditGroup.class }) + private String station; + + /** + * 所属区域 + */ + //@NotBlank(message = "所属区域不能为空", groups = { AddGroup.class, EditGroup.class }) + private String area; + + /** + * 设备名称 + */ + //@NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String device; + + /** + * 设备型号 + */ + //@NotBlank(message = "设备型号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String model; + + /** + * 生产厂家 + */ + //@NotBlank(message = "生产厂家不能为空", groups = { AddGroup.class, EditGroup.class }) + private String manufacturer; + + /** + * 生产日期 + */ + //@NotNull(message = "生产日期不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date manufactureDate; + + /** + * 序列号 + */ + //@NotBlank(message = "序列号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String number; + + /** + * 检测物 + */ + //@NotBlank(message = "检测物不能为空", groups = { AddGroup.class, EditGroup.class }) + private String testSubstance; + + /** + * 状态 + */ + //@NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java new file mode 100644 index 0000000..4834c12 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java @@ -0,0 +1,98 @@ +package org.dromara.demo.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.demo.domain.DeviceInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 设备信息视图对象 device_info + * + * @author GJH + * @date 2025-07-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DeviceInfo.class) +public class DeviceInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID（自增） + */ + @ExcelProperty(value = "主键ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "自=增") + private String id; + + /** + * 站点 + */ + @ExcelProperty(value = "站点") + private String station; + + /** + * 所属区域 + */ + @ExcelProperty(value = "所属区域") + private String area; + + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String device; + + /** + * 设备型号 + */ + @ExcelProperty(value = "设备型号") + private String model; + + /** + * 生产厂家 + */ + @ExcelProperty(value = "生产厂家") + private String manufacturer; + + /** + * 生产日期 + */ + @ExcelProperty(value = "生产日期") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date manufactureDate; + + /** + * 序列号 + */ + @ExcelProperty(value = "序列号") + private String number; + + /** + * 检测物 + */ + @ExcelProperty(value = "检测物") + private String testSubstance; + + /** + * 状态 + */ + @ExcelProperty(value = "状态") + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/RegionVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/RegionVo.java index f4eaf61..4648af6 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/RegionVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/RegionVo.java @@ -1,28 +1,16 @@ package org.dromara.demo.domain.vo; -public class RegionVo { - private String id; - private String name; - - public RegionVo(String id, String name) { - this.id = id; - this.name = name; - } - - // Getter and Setter - public String getId() { - return id; - } +import lombok.Data; - public void setId(String id) { - this.id = id; - } +@Data +public class RegionVo { + private String value; + // 无参构造函数（Lombok已经帮你生成了，除非你手动写了其他构造函数） + public RegionVo() {} - public String getName() { - return name; + // 全参构造函数 + public RegionVo(String value) { + this.value = value; } - public void setName(String name) { - this.name = name; - } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/StationSelectVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/StationSelectVo.java new file mode 100644 index 0000000..cfe985c --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/StationSelectVo.java @@ -0,0 +1,15 @@ +package org.dromara.demo.domain.vo; + +import lombok.Data; + +@Data +public class StationSelectVo { + private String value; + + public StationSelectVo() {} + + // 全参构造函数 + public StationSelectVo(String value) { + this.value = value; + } +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/DeviceInfoMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/DeviceInfoMapper.java new file mode 100644 index 0000000..f63ebbf --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/DeviceInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.demo.mapper; + +import org.dromara.demo.domain.DeviceInfo; +import org.dromara.demo.domain.vo.DeviceInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备信息Mapper接口 + * + * @author GJH + * @date 2025-07-01 + */ +public interface DeviceInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IDeviceInfoService.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IDeviceInfoService.java new file mode 100644 index 0000000..2eb02ba --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IDeviceInfoService.java @@ -0,0 +1,72 @@ +package org.dromara.demo.service; + +import org.dromara.demo.domain.vo.DeviceInfoVo; +import org.dromara.demo.domain.bo.DeviceInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.demo.domain.vo.StationSelectVo; + +import java.util.Collection; +import java.util.List; + +/** + * 设备信息Service接口 + * + * @author GJH + * @date 2025-07-01 + */ +public interface IDeviceInfoService { + + /** + * 查询设备信息 + * + * @param id 主键 + * @return 设备信息 + */ + DeviceInfoVo queryById(String id); + + /** + * 分页查询设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备信息分页列表 + */ + TableDataInfo queryPageList(DeviceInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备信息列表 + * + * @param bo 查询条件 + * @return 设备信息列表 + */ + List queryList(DeviceInfoBo bo); + + /** + * 新增设备信息 + * + * @param bo 设备信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DeviceInfoBo bo); + + /** + * 修改设备信息 + * + * @param bo 设备信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DeviceInfoBo bo); + + /** + * 校验并批量删除设备信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + + List getStationList(); +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/DeviceInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/DeviceInfoServiceImpl.java new file mode 100644 index 0000000..2290482 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/DeviceInfoServiceImpl.java @@ -0,0 +1,146 @@ +package org.dromara.demo.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.demo.domain.vo.StationSelectVo; +import org.springframework.stereotype.Service; +import org.dromara.demo.domain.bo.DeviceInfoBo; +import org.dromara.demo.domain.vo.DeviceInfoVo; +import org.dromara.demo.domain.DeviceInfo; +import org.dromara.demo.mapper.DeviceInfoMapper; +import org.dromara.demo.service.IDeviceInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备信息Service业务层处理 + * + * @author GJH + * @date 2025-07-01 + */ +@RequiredArgsConstructor +@Service +public class DeviceInfoServiceImpl implements IDeviceInfoService { + + private final DeviceInfoMapper baseMapper; + + /** + * 查询设备信息 + * + * @param id 主键 + * @return 设备信息 + */ + @Override + public DeviceInfoVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DeviceInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备信息列表 + * + * @param bo 查询条件 + * @return 设备信息列表 + */ + @Override + public List queryList(DeviceInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DeviceInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getStation()), DeviceInfo::getStation, bo.getStation()); + lqw.eq(StringUtils.isNotBlank(bo.getArea()), DeviceInfo::getArea, bo.getArea()); + lqw.eq(StringUtils.isNotBlank(bo.getDevice()), DeviceInfo::getDevice, bo.getDevice()); + lqw.eq(StringUtils.isNotBlank(bo.getModel()), DeviceInfo::getModel, bo.getModel()); + lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), DeviceInfo::getManufacturer, bo.getManufacturer()); + lqw.eq(bo.getManufactureDate() != null, DeviceInfo::getManufactureDate, bo.getManufactureDate()); + lqw.eq(StringUtils.isNotBlank(bo.getNumber()), DeviceInfo::getNumber, bo.getNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getTestSubstance()), DeviceInfo::getTestSubstance, bo.getTestSubstance()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), DeviceInfo::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增设备信息 + * + * @param bo 设备信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DeviceInfoBo bo) { + DeviceInfo add = MapstructUtils.convert(bo, DeviceInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设备信息 + * + * @param bo 设备信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DeviceInfoBo bo) { + DeviceInfo update = MapstructUtils.convert(bo, DeviceInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DeviceInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除设备信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public List getStationList() { + List list = this.queryList(new DeviceInfoBo()); + List values = list.stream().map(DeviceInfoVo::getStation).distinct().toList(); + return values.stream().map(StationSelectVo::new).toList(); + } + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java index cad216a..553bbd2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/StationInfoServiceImpl.java @@ -141,19 +141,19 @@ public class StationInfoServiceImpl implements IStationInfoService { public List getHangzhouRegions() { List regions = new ArrayList<>(); - regions.add(new RegionVo("1", "上城区")); - regions.add(new RegionVo("2", "拱墅区")); - regions.add(new RegionVo("3", "西湖区")); - regions.add(new RegionVo("4", "滨江区")); - regions.add(new RegionVo("5", "萧山区")); - regions.add(new RegionVo("6", "余杭区")); - regions.add(new RegionVo("7", "临平区")); - regions.add(new RegionVo("8", "钱塘区")); - regions.add(new RegionVo("9", "富阳区")); - regions.add(new RegionVo("10", "临安区")); - regions.add(new RegionVo("11", "桐庐县")); - regions.add(new RegionVo("12", "淳安县")); - regions.add(new RegionVo("13", "建德市")); + regions.add(new RegionVo("上城区")); + regions.add(new RegionVo("拱墅区")); + regions.add(new RegionVo("西湖区")); + regions.add(new RegionVo("滨江区")); + regions.add(new RegionVo("萧山区")); + regions.add(new RegionVo("余杭区")); + regions.add(new RegionVo("临平区")); + regions.add(new RegionVo("钱塘区")); + regions.add(new RegionVo("富阳区")); + regions.add(new RegionVo("临安区")); + regions.add(new RegionVo("桐庐县")); + regions.add(new RegionVo("淳安县")); + regions.add(new RegionVo("建德市")); return regions; }