潘钊 / bsth_control · Commits

Commit c8968c8dec2bef4f5cd0284c726731b8bdc9b857

Authored by 徐烜
1 parent c1ca9b9d

iss提交13： 

1、修改SchedulePlanController_facade内部调用，使用暴露的tcc排班生成服务
2、删除application_dubbo_consumer.xml文件，已经使用了自定义auto config类了（bsth-control_v2-plan_module-common-config）
Inline Side-by-side
Showing 2 changed files with 20 additions and 55 deletions
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController_facade.java
  View file @c8968c8
... ... @@ -3,8 +3,8 @@ package com.bsth.controller.schedule.core;
3 3 import com.alibaba.dubbo.config.annotation.Reference;
4 4 import com.bsth.common.ResponseCode;
5 5 import com.bsth.control_v2.plan_module.common.dto.schedule.PlanDto;
  6 +import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
6 7 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
7   -import com.bsth.control_v2.plan_module.common.service.schedule.PlanGenerateFacade;
8 8 import com.bsth.control_v2.plan_module.common.service.schedule.PlanServiceFacade;
9 9 import com.bsth.control_v2.plan_module.common.service.schedule.validate.PlanPreValidateFacade;
10 10 import com.bsth.controller.schedule.BController_facade;
... ... @@ -27,8 +27,6 @@ public class SchedulePlanController_facade extends BController_facade<Long, Plan
27 27 private PlanServiceFacade planServiceFacade;
28 28 @Reference
29 29 private PlanPreValidateFacade planPreValidateFacade;
30   - @Reference
31   - private PlanGenerateFacade planGenerateFacade;
32 30  
33 31 @Override
34 32 protected BServiceFacade<Long, PlanDto> getBServiceFacade() {
... ... @@ -84,10 +82,28 @@ public class SchedulePlanController_facade extends BController_facade&lt;Long, Plan
84 82 */
85 83 @Override
86 84 protected PlanDto saveExtend(PlanDto planDto) {
87   - planGenerateFacade.generatePlan(planDto);
  85 + planServiceFacade.planSaveTCC_m(planDto);
88 86 return planDto;
89 87 }
90 88  
  89 + @Override
  90 + public void setCreateUserInfo(PlanDto planDto, Integer userId, Date createDate) {
  91 + UserDto userDto = UserDto.getBuilder()
  92 + .setId(userId)
  93 + .build();
  94 + planDto.setCreateBy(userDto);
  95 + planDto.setCreateDate(createDate);
  96 + }
  97 +
  98 + @Override
  99 + public void setUpdateUserInfo(PlanDto planDto, Integer userId, Date updateDate) {
  100 + UserDto userDto = UserDto.getBuilder()
  101 + .setId(userId)
  102 + .build();
  103 + planDto.setUpdateBy(userDto);
  104 + planDto.setUpdateDate(updateDate);
  105 + }
  106 +
91 107 //------------------------- 以下是还未服务话的功能 --------------------------//
92 108 @Autowired
93 109 private SchedulePlanService schedulePlanService;
... ...
src/main/resources/dubbo/applicationContext_dubbo_consumer.xml deleted 100644 → 0
  View file @c1ca9b9
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
3   - xsi:schemaLocation="http://www.springframework.org/schema/beans
4   - http://www.springframework.org/schema/beans/spring-beans.xsd
5   - http://code.alibabatech.com/schema/dubbo
6   - http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
7   -
8   - <!-- 消费方应用名，用于计算依赖关系，不是匹配条件，不要与提供方一样 -->
9   - <dubbo:application name="bsth_control_v_multi_service" />
10   -
11   - <!-- 使用zookeeper注册中心暴露服务地址 -->
12   - <!-- 注册中心地址 -->
13   - <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181" check="false" />
14   -
15   - <!-- 人员信息服务 -->
16   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.baseinfo.PersonnelServiceFacade" id="personnelServiceFacadeImpl" check="false" />
17   - <!-- 车辆信息服务 -->
18   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.baseinfo.CarServiceFacade" id="carServiceFacadeImpl" check="false" />
19   - <!-- 车辆设备信息服务 -->
20   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.baseinfo.CarDeviceServiceFacade" id="carDeviceServiceFacadeImpl" check="false" />
21   -
22   - <!-- 车辆配置信息服务 -->
23   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.config.VehicleConfigServiceFacade" id="vehicleConfigServiceFacadeImpl" check="false" />
24   - <!-- 人员配置信息服务 -->
25   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.config.EmployeeConfigServiceFacade" id="employeeConfigServiceFacadeImpl" check="false" />
26   - <!-- 路牌配置信息服务 -->
27   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.config.LpConfigServiceFacade" id="lpConfigServiceFacadeImpl" check="false" />
28   - <!-- flat规则配置信息服务 -->
29   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.rule.FlatRuleConfigServiceFacade" id="flatRuleConfigServiceFacadeImpl" check="false" />
30   - <!-- rerun规则配置信息服务 -->
31   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.rule.RerunRuleConfigServiceFacade" id="rerunRuleConfigServiceFacadeImpl" check="false" />
32   -
33   - <!-- 时刻表班型明细服务 -->
34   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.timetable.TTInfoBxDetailServiceFacade" id="tTInfoBxDetailServiceFacadeImpl" check="false" />
35   - <!-- 时刻表明细服务 -->
36   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.timetable.TTInfoDetailServiceFacade" id="tTInfoDetailServiceFacadeImpl" check="false" />
37   - <!-- 时刻表服务 -->
38   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.timetable.TTInfoServiceFacade" id="tTInfoServiceFacadeImpl" check="false" />
39   - <!-- 日志服务 -->
40   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.log.LogServiceFacade" id="logServiceFacadeImpl" check="false" />
41   -
42   - <!-- 排班计划查询服务 -->
43   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.PlanServiceFacade" id="planServiceFacadeImpl" check="false" />
44   - <!-- 排班明细查询服务 -->
45   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.PlanInfoServiceFacade" id="planInfoServiceFacadeImpl" check="false" />
46   - <!-- 排班前置验证服务 -->
47   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.validate.PlanPreValidateFacade" id="planPreValidateFacadeImpl" check="false" />
48   - <!-- 排班生成服务 -->
49   - <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.PlanGenerateFacade" ref="planGenerateFacadeImpl" check="false" />
50   -
51   -</beans>