diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java index c820fff..e72c785 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java @@ -75,8 +75,7 @@ public class RoadController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('garden:road:query')") public CommonResult getRoad(@RequestParam("id") Long id) { - RoadDO road = roadService.getRoad(id); - return success(BeanUtils.toBean(road, RoadRespVO.class)); + return success(roadService.getRoad(id)); } @GetMapping("/page") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java index 387f5c5..2340f1c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java @@ -11,7 +11,8 @@ public class RoadSaveReqVO { @Schema(description = "道路名称", example = "赵六") - @Length(max = 128) + @NotEmpty(message = "道路名称不能为空") + @Size(min=2, max = 128, message = "道路名称长度") private String roadName; @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11139") @@ -31,26 +32,32 @@ public class RoadSaveReqVO { private Integer levelId; @Schema(description = "道路属性") + @Size(min=2, max = 50) private String roadAttr; @Schema(description = "道路方位 W-西 E-东 N-北 S-南 参考字典roadDirection", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "道路方位 W-西 E-东 N-北 S-南 参考字典roadDirection不能为空") + @Size(min=2, max = 50) private String direction; @Schema(description = "行道树绿化面积", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "行道树绿化面积不能为空") + @Size(min=2, max = 50) private String greenBeltTreeArea; @Schema(description = "绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "绿化带面积不能为空") + @Size(min=2, max = 50) private String greenBeltArea; @Schema(description = "总绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "总绿化带面积不能为空") + @Size(min=2, max = 50) private String totalArea; @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "行道树(棵)面积不能为空") + @Size(min=2, max = 50) private String treeArea; @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadService.java index 7e9d2bc..e7a97b1 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadService.java @@ -49,7 +49,7 @@ public interface RoadService { * @param id 编号 * @return 道路管理 */ - RoadDO getRoad(Long id); + RoadRespVO getRoad(Long id); /** * 获得道路管理分页 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java index 40d34a4..099404b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java @@ -97,8 +97,13 @@ public class RoadServiceImpl implements RoadService { } @Override - public RoadDO getRoad(Long id) { - return roadMapper.selectById(id); + public RoadRespVO getRoad(Long id) { + RoadDO roadDO = roadMapper.selectById(id); + RoadRespVO respVO = BeanUtils.toBean(roadDO, RoadRespVO.class); + List list = new ArrayList<>(); + list.add(respVO); + addDataInspectionPlan(list); + return respVO; } @Override diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/user/AdminUserApi.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/user/AdminUserApi.java index acdd493..840046d 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/user/AdminUserApi.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/user/AdminUserApi.java @@ -2,6 +2,7 @@ package com.zteits.urbanops.module.system.api.user; import com.zteits.urbanops.framework.common.util.collection.CollectionUtils; import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; +import com.zteits.urbanops.module.system.controller.admin.user.vo.user.DictDataRespVO; import java.util.Collection; import java.util.Collections; @@ -86,4 +87,9 @@ public interface AdminUserApi { */ void validateUserList(Collection ids); + /** + * 获取登录人业务线列表 + * @return 业务线列表 + */ + List getLoginBusiLine(); } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/user/AdminUserApiImpl.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/user/AdminUserApiImpl.java index 2d12c2b..5c7e35f 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/user/AdminUserApiImpl.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/user/AdminUserApiImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjUtil; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.framework.datapermission.core.util.DataPermissionUtils; import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; +import com.zteits.urbanops.module.system.controller.admin.user.vo.user.DictDataRespVO; import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO; import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO; import com.zteits.urbanops.module.system.service.dept.DeptService; @@ -83,4 +84,9 @@ public class AdminUserApiImpl implements AdminUserApi { userService.validateUserList(ids); } + @Override + public List getLoginBusiLine() { + return userService.getLoginBusiLine(); + } + }