BJ_FS / urbanops

Commit 17a067a436cbe7469e13b88c67bbbcf70225614a

Authored by 颜惠青
1 parent 4018829f

工单 道路id由 LONG 改为 STRING

Inline Side-by-side
Showing 24 changed files with 33 additions and 31 deletions
urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java
  View file @17a067a
... ... @@ -10,5 +10,5 @@ import java.util.List;
10 10 public interface RoadApi {
11 11 List<RoadRespDTO> getRoadInfoBy(RoadReqDTO reqDTO);
12 12  
13   - RoadStreetRespDTO getRoadInfoById(Long id);
  13 + RoadStreetRespDTO getRoadInfoById(String id);
14 14 }
... ...
urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java
  View file @17a067a
... ... @@ -12,7 +12,7 @@ import lombok.Data;
12 12 @Data
13 13 public class RoadStreetRespDTO {
14 14  
15   - private Long id;
  15 + private String id;
16 16  
17 17 private String roadName;
18 18  
... ...
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/api/WorkOrderApi.java
  View file @17a067a
... ... @@ -33,7 +33,7 @@ public interface WorkOrderApi {
33 33 * @param busiLine
34 34 * @return
35 35 */
36   - public List<AdminUserRespVO> getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine);
  36 + public List<AdminUserRespVO> getUserByRoadIdAndRoleCode(String roadId, String roleCode, String busiLine);
37 37  
38 38 /**
39 39 * 创建工单API
... ...
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderAIReqVO.java
  View file @17a067a
... ... @@ -23,7 +23,7 @@ public class AppGardenWorkOrderAIReqVO {
23 23  
24 24 @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128")
25 25 @NotNull(message = "道路ID不能为空")
26   - private Long roadId;
  26 + private String roadId;
27 27  
28 28 /**
29 29 * 工单类型 Q:快速工单,C:普通工单,O:其他工单
... ... @@ -63,7 +63,7 @@ public class AppGardenWorkOrderAIReqVO {
63 63 @Schema(description = "工单名称", example = "绿地卫生")
64 64 private String orderName;
65 65  
66   - @Schema(description = "来源ID 工单来源 1、巡查，2、游客居民，3、12345，4、网格", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  66 + @Schema(description = "来源ID 工单来源 1、巡查，2、游客居民，3、12345，4、网格,5 大区经理，6 AI", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
67 67 //@NotNull(message = "来源ID不能为空")
68 68 private Integer sourceId;
69 69  
... ...
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderInspectorReqVO.java
  View file @17a067a
... ... @@ -23,7 +23,7 @@ public class AppGardenWorkOrderInspectorReqVO {
23 23  
24 24 @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128")
25 25 @NotNull(message = "道路ID不能为空")
26   - private Long roadId;
  26 + private String roadId;
27 27  
28 28 /**
29 29 * 工单类型 Q:快速工单,C:普通工单,O:其他工单
... ...
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java
  View file @17a067a
... ... @@ -24,7 +24,7 @@ public class AppGardenWorkOrderReqVO {
24 24  
25 25 @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128")
26 26 @NotNull(message = "道路ID不能为空")
27   - private Long roadId;
  27 + private String roadId;
28 28  
29 29 /**
30 30 * 工单类型 Q:快速工单,C:普通工单,O:其他工单
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java
  View file @17a067a
... ... @@ -62,8 +62,10 @@ public class RoadApiImpl implements RoadApi {
62 62 }
63 63  
64 64 @Override
65   - public RoadStreetRespDTO getRoadInfoById(Long id) {
66   - RoadRespVO roadRespVO = roadService.getUniqueRoad(id);
67   - return BeanUtils.toBean(roadRespVO, RoadStreetRespDTO.class);
  65 + public RoadStreetRespDTO getRoadInfoById(String id) {
  66 + RoadRespVO roadRespVO = roadService.getUniqueRoad(Long.parseLong(id));
  67 + RoadStreetRespDTO targetVO = BeanUtils.toBean(roadRespVO, RoadStreetRespDTO.class);
  68 + targetVO.setId(roadRespVO.getId().toString());
  69 + return targetVO;
68 70 }
69 71 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
  View file @17a067a
... ... @@ -17,7 +17,7 @@ public interface AppGardenWorkOrderConvert {
17 17  
18 18 default AppGardenWorkOrderReqVO buildAppGardenWorkOrderReqVO(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO, RoadDO roadDO, String planNo ) {
19 19 AppGardenWorkOrderReqVO orderReqVO = new AppGardenWorkOrderReqVO();
20   - orderReqVO.setRoadId(inspectionPlanDO.getRoadId());
  20 + orderReqVO.setRoadId(inspectionPlanDO.getRoadId().toString());
21 21 orderReqVO.setRoadName(inspectionPlanDO.getRoadName());
22 22 orderReqVO.setProblemsImgs(createReqVO.getImgList());
23 23 orderReqVO.setRemark(createReqVO.getRemark());
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java
  View file @17a067a
... ... @@ -67,7 +67,7 @@ public class WorkOrderApiImpl implements WorkOrderApi {
67 67 }
68 68  
69 69 @Override
70   - public List<AdminUserRespVO> getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine) {
  70 + public List<AdminUserRespVO> getUserByRoadIdAndRoleCode(String roadId, String roleCode, String busiLine) {
71 71 if(ObjectUtils.isEmpty(roadId) || ObjectUtils.isEmpty(roleCode) || ObjectUtils.isEmpty(busiLine)){
72 72 throw exception0(BAD_REQUEST.getCode(),"param:roadId,roleCode,busiLine 不能为空！");
73 73 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/garden/vo/BpmGardenTaskAssignReqVO.java
  View file @17a067a
... ... @@ -28,7 +28,7 @@ public class BpmGardenTaskAssignReqVO {
28 28  
29 29 @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128")
30 30 @NotNull(message = "道路ID不能为空")
31   - private Long roadId;
  31 + private String roadId;
32 32  
33 33 @Schema(description = "道路名称", example = "测试道路")
34 34 private String roadName;
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java
  View file @17a067a
... ... @@ -90,7 +90,7 @@ public class AppUniversalApprovalReqVO {
90 90 //-------------------------重新发起需提交表单数据------------------------
91 91 @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128")
92 92 @NotNull(message = "道路ID不能为空", groups = RelaunchGroup.class)
93   - private Long roadId;
  93 + private String roadId;
94 94  
95 95 @Schema(description = "道路名称", example = "测试道路")
96 96 private String roadName;
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskInspectorApproveReqVO.java
  View file @17a067a
... ... @@ -40,7 +40,7 @@ public class AppGardenTaskInspectorApproveReqVO {
40 40  
41 41 @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128")
42 42 @NotNull(message = "道路ID不能为空", groups = RelaunchGroup.class)
43   - private Long roadId;
  43 + private String roadId;
44 44  
45 45 @Schema(description = "道路名称", example = "测试道路")
46 46 private String roadName;
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskRegionMgrApproveReqVO.java
  View file @17a067a
... ... @@ -40,7 +40,7 @@ public class AppGardenTaskRegionMgrApproveReqVO {
40 40  
41 41 @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128")
42 42 @NotNull(message = "道路ID不能为空")
43   - private Long roadId;
  43 + private String roadId;
44 44  
45 45 @Schema(description = "道路名称", example = "测试道路")
46 46 private String roadName;
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java
  View file @17a067a
... ... @@ -64,7 +64,7 @@ public class MainInfoDO extends BaseDO {
64 64 /**
65 65 * 道路ID
66 66 */
67   - private Long roadId;
  67 + private String roadId;
68 68 /**
69 69 * 道路名称
70 70 */
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java
  View file @17a067a
... ... @@ -58,7 +58,7 @@ public class MainInfoExtDO extends BaseDO {
58 58 /**
59 59 * 道路ID
60 60 */
61   - private Long roadId;
  61 + private String roadId;
62 62 /**
63 63 * 道路名称
64 64 */
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
  View file @17a067a
... ... @@ -725,11 +725,11 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
725 725 @Result(column = "avatar", property = "avatar")
726 726 })
727 727 @DataPermission(enable = false)
728   - IPage<AdminUserRespDTO> getUserByRoadIdAndRoleCodeIPage(IPage<AdminUserRespDTO> page,@NonNull @Param("roadId") Long roadId,
  728 + IPage<AdminUserRespDTO> getUserByRoadIdAndRoleCodeIPage(IPage<AdminUserRespDTO> page,@NonNull @Param("roadId") String roadId,
729 729 @NonNull @Param("roleCode") String roleCode,
730 730 @NonNull @Param("busiLine") String busiLine);
731 731 @DataPermission(enable = false)
732   - default PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCodePage(PageParam pageParam,@NonNull @Param("roadId") Long roadId,
  732 + default PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCodePage(PageParam pageParam,@NonNull @Param("roadId") String roadId,
733 733 @NonNull @Param("roleCode") String roleCode,
734 734 @NonNull @Param("busiLine") String busiLine){
735 735 IPage<AdminUserRespDTO> mpPage = MyBatisUtils.buildPage(pageParam);
... ... @@ -739,7 +739,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
739 739 }
740 740  
741 741 @DataPermission(enable = false)
742   - default List<AdminUserRespDTO> getUserByRoadIdAndRoleCode(@NonNull @Param("roadId") Long roadId,
  742 + default List<AdminUserRespDTO> getUserByRoadIdAndRoleCode(@NonNull @Param("roadId") String roadId,
743 743 @NonNull @Param("roleCode") String roleCode,
744 744 @NonNull @Param("busiLine") String busiLine){
745 745 // 创建一个“不分页”的Page对象（size=Integer.MAX_VALUE，查询所有数据）
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java
  View file @17a067a
... ... @@ -50,5 +50,5 @@ public interface BpmAIService {
50 50 * @param roadId
51 51 * @return
52 52 */
53   - boolean isSanhaiByRoadId(Long roadId);
  53 + boolean isSanhaiByRoadId(String roadId);
54 54 }
55 55 \ No newline at end of file
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java
  View file @17a067a
... ... @@ -242,7 +242,7 @@ public class BpmAIServiceImpl implements BpmAIService{
242 242 //String busiLine = (String)processInstanceVariables.get(BPM_COMMON_PROD_BUSILINE);
243 243 //Long roadId = (Long) processInstanceVariables.get(BPM_COMMON_PROD_ROADID);
244 244 String busiLine = reqVO.getBusiLine();
245   - Long roadId = reqVO.getRoadId();
  245 + String roadId = reqVO.getRoadId();
246 246 String roleCode = BusiLineTeamLeaderRoleCodeEnum.getByCode(busiLine).getRoleCode();
247 247  
248 248 if(StringUtil.isEmpty(roleCode)){// 找不到 默认为园林组长的角色
... ... @@ -311,7 +311,7 @@ public class BpmAIServiceImpl implements BpmAIService{
311 311 }
312 312  
313 313 @Override
314   - public boolean isSanhaiByRoadId(Long roadId) {
  314 + public boolean isSanhaiByRoadId(String roadId) {
315 315 RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(roadId);
316 316 if(null == roadStreetRespDTO){
317 317 throw exception(APP_WORK_ROAD_NOT_EXISTS);
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java
  View file @17a067a
... ... @@ -208,7 +208,7 @@ public interface BpmGardenService {
208 208 * @param busiLine
209 209 * @return
210 210 */
211   - public PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCode(PageParam param,Long roadId,String roleCode,String busiLine);
  211 + public PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCode(PageParam param,String roadId,String roleCode,String busiLine);
212 212  
213 213 /**
214 214 * 附件更新通用方法
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
  View file @17a067a
... ... @@ -773,7 +773,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
773 773 }
774 774  
775 775 @Override
776   - public PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCode(PageParam param,Long roadId, String roleCode, String busiLine) {
  776 + public PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCode(PageParam param,String roadId, String roleCode, String busiLine) {
777 777 if(org.springframework.util.ObjectUtils.isEmpty(roadId) || org.springframework.util.ObjectUtils.isEmpty(roleCode) || org.springframework.util.ObjectUtils.isEmpty(busiLine)){
778 778 throw exception0(BAD_REQUEST.getCode(),"param:roadId,roleCode,busiLine 不能为空！");
779 779 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorService.java
  View file @17a067a
... ... @@ -51,5 +51,5 @@ public interface BpmInspectorService {
51 51 * @param roadId
52 52 * @return
53 53 */
54   - boolean isSanhaiByRoadId(Long roadId);
  54 + boolean isSanhaiByRoadId(String roadId);
55 55 }
56 56 \ No newline at end of file
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java
  View file @17a067a
... ... @@ -234,7 +234,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
234 234 //String busiLine = (String)processInstanceVariables.get(BPM_COMMON_PROD_BUSILINE);
235 235 //Long roadId = (Long) processInstanceVariables.get(BPM_COMMON_PROD_ROADID);
236 236 String busiLine = reqVO.getBusiLine();
237   - Long roadId = reqVO.getRoadId();
  237 + String roadId = reqVO.getRoadId();
238 238 String roleCode = BusiLineTeamLeaderRoleCodeEnum.getByCode(busiLine).getRoleCode();
239 239  
240 240 if(StringUtil.isEmpty(roleCode)){// 找不到 默认为园林组长的角色
... ... @@ -303,7 +303,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
303 303 }
304 304  
305 305 @Override
306   - public boolean isSanhaiByRoadId(Long roadId) {
  306 + public boolean isSanhaiByRoadId(String roadId) {
307 307 RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(roadId);
308 308 if(null == roadStreetRespDTO){
309 309 throw exception(APP_WORK_ROAD_NOT_EXISTS);
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmUniversalServiceImpl.java
  View file @17a067a
... ... @@ -196,7 +196,7 @@ public class BpmUniversalServiceImpl implements BpmUniversalService{
196 196 //String busiLine = (String)processInstanceVariables.get(BPM_COMMON_PROD_BUSILINE);
197 197 //Long roadId = (Long) processInstanceVariables.get(BPM_COMMON_PROD_ROADID);
198 198 String busiLine = reqVO.getBusiLine();
199   - Long roadId = reqVO.getRoadId();
  199 + String roadId = reqVO.getRoadId();
200 200 String roleCode = BusiLineTeamLeaderRoleCodeEnum.getByCode(busiLine).getRoleCode();
201 201  
202 202 if(StringUtil.isEmpty(roleCode)){// 找不到 默认为园林组长的角色
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/el/YlTaskAssignService.java
  View file @17a067a
... ... @@ -29,7 +29,7 @@ public class YlTaskAssignService {
29 29  
30 30 @Resource
31 31 private MainInfoExtMapper workOrderExtMapper;
32   - public Long getInitiatorApproverByBusiness(Long roadId,String roleCode,String busiLine) {
  32 + public Long getInitiatorApproverByBusiness(String roadId,String roleCode,String busiLine) {
33 33 List<AdminUserRespDTO> userList = workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId,roleCode,busiLine);
34 34 if(null != userList && userList.size() > 0){
35 35 return userList.get(0).getId();
... ...