iss提交16；

更新使用dubbo服务的controller定义，添加@Conditional判定是否使用，同时更新相关legacy的controller定义

iss提交16；
更新使用dubbo服务的controller定义，添加@Conditional判定是否使用，同时更新相关legacy的controller定义
徐烜
1 parent b8136122
Showing 26 changed files with 275 additions and 27 deletions
src/main/java/com/bsth/controller/schedule/basicinfo/CarController_facade.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarDeviceController_facade.java
src/main/java/com/bsth/controller/schedule/basicinfo/EmployeeController_facade.java
src/main/java/com/bsth/controller/schedule/basicinfo/legacy/CarDeviceController.java
src/main/java/com/bsth/controller/schedule/basicinfo/legacy/CarsController.java
src/main/java/com/bsth/controller/schedule/basicinfo/legacy/EmployeeController.java
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/LogController_facade.java
src/main/java/com/bsth/controller/schedule/core/RerunController_facade.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController_facade.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/ScheduleRule1FlatController_facade.java
src/main/java/com/bsth/controller/schedule/core/TTInfoBxDetailController_facade.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java
src/main/java/com/bsth/controller/schedule/core/legacy/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/legacy/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/core/legacy/GuideboardInfoController.java
@@ -2,6 +2,7 @@ package com.bsth.controller.schedule.basicinfo;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.CarDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
@@ -12,6 +13,7 @@ import com.bsth.service.schedule.utils.DataToolsFile;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,7 +27,8 @@ import java.util.*;
 /**
  * 车辆基础信息controller_facade
  */
-@RestController(value = "carsController_sc")
+@RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("cars_sc")
 public class CarController_facade extends BController_facade<Integer, CarDto> {
@@ -2,12 +2,14 @@ package com.bsth.controller.schedule.basicinfo;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.CarDeviceDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
 import com.bsth.control_v2.plan_module.common.service.baseinfo.CarDeviceServiceFacade;
 import com.bsth.controller.schedule.BController_facade;
 import org.joda.time.DateTime;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -17,7 +19,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-@RestController(value = "carDeviceController_sc")
+@RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("cde_sc")
 public class CarDeviceController_facade extends BController_facade<Long, CarDeviceDto> {
     @Override
@@ -2,6 +2,7 @@ package com.bsth.controller.schedule.basicinfo;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.PersonnelDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
@@ -12,6 +13,7 @@ import com.bsth.service.schedule.utils.DataToolsFile;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -26,6 +28,7 @@ import java.util.*;
  * 人员基础信息Controller_facade
  */
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("ee")
 public class EmployeeController_facade extends BController_facade<Integer, PersonnelDto> {
     @Override
@@ -2,13 +2,16 @@ package com.bsth.controller.schedule.basicinfo.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.basicinfo.CarDeviceController_facade;
 import com.bsth.entity.CarDevice;
 import com.bsth.service.schedule.CarDeviceService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
 import java.util.Map;
@@ -16,8 +19,9 @@ import java.util.Map;
 /**
  * Created by xu on 16/12/15.
  */
-//@RestController(value = "carDeviceController_sc")
-//@RequestMapping("cde_sc")
+@RestController("carDeviceController_sc")
+@ConditionalOnMissingBean(CarDeviceController_facade.class)
+@RequestMapping("cde_sc")
 public class CarDeviceController extends BController<CarDevice, Long> {
     @Autowired
     private CarDeviceService carDeviceService;
@@ -2,13 +2,16 @@ package com.bsth.controller.schedule.basicinfo.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.basicinfo.CarController_facade;
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.CarsService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
 import java.util.Map;
@@ -16,8 +19,9 @@ import java.util.Map;
 /**
  * 车辆基础信息controller
  */
-//@RestController(value = "carsController_sc")
-//@RequestMapping("cars_sc")
+@RestController("carsController_sc")
+@ConditionalOnMissingBean(CarController_facade.class)
+@RequestMapping("cars_sc")
 public class CarsController extends BController<Cars, Integer> {
     @Autowired
     private CarsService carsService;
@@ -2,13 +2,16 @@ package com.bsth.controller.schedule.basicinfo.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.basicinfo.EmployeeController_facade;
 import com.bsth.entity.Personnel;
 import com.bsth.service.schedule.EmployeeService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
 import java.util.Map;
@@ -16,8 +19,9 @@ import java.util.Map;
 /**
  * 人员基础信息Controller
  */
-//@RestController
-//@RequestMapping("ee")
+@RestController
+@ConditionalOnMissingBean(EmployeeController_facade.class)
+@RequestMapping("ee")
 public class EmployeeController extends BController<Personnel, Integer> {
     @Autowired
     private EmployeeService employeeService;
@@ -3,6 +3,7 @@ package com.bsth.controller.schedule.core;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.CarDto;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.LineDto;
 import com.bsth.control_v2.plan_module.common.dto.schedule.config.VehicleConfigDto;
@@ -17,6 +18,7 @@ import com.bsth.service.schedule.utils.DataToolsFile;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -33,6 +35,7 @@ import java.util.*;
  * Created by xu on 16/5/9.
  */
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("cci")
 public class CarConfigInfoController_facade extends BController_facade<Long, VehicleConfigDto> {
@@ -3,6 +3,7 @@ package com.bsth.controller.schedule.core;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.LineDto;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.PersonnelDto;
 import com.bsth.control_v2.plan_module.common.dto.schedule.config.EmployeeConfigDto;
@@ -17,6 +18,7 @@ import com.bsth.service.schedule.utils.DataToolsFile;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -30,6 +32,7 @@ import java.util.*;
  * Created by xu on 16/5/10.
  */
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("eci")
 public class EmployeeConfigInfoController_facade extends BController_facade<Long, EmployeeConfigDto> {
@@ -2,6 +2,7 @@ package com.bsth.controller.schedule.core;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.LineDto;
 import com.bsth.control_v2.plan_module.common.dto.schedule.config.LpConfigDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
@@ -13,6 +14,7 @@ import com.bsth.service.schedule.utils.DataToolsFile;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -24,6 +26,7 @@ import java.util.*;
  * 路牌管理控制器。
  */
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("gic")
 public class GuideboardInfoController_facade extends BController_facade<Long, LpConfigDto> {
     @Override
+package com.bsth.controller.schedule.core;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
+import com.bsth.control_v2.plan_module.common.dto.schedule.log.ModuleOperatorLogDto;
+import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
+import com.bsth.control_v2.plan_module.common.service.log.LogServiceFacade;
+import com.bsth.controller.schedule.BController_facade;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Conditional(DubboConfigCondition.class)
+@RequestMapping("s_log")
+public class LogController_facade extends BController_facade<Long, ModuleOperatorLogDto> {
+    @Reference
+    private LogServiceFacade logServiceFacade;
+
+    @Override
+    protected BServiceFacade<Long, ModuleOperatorLogDto> getBServiceFacade() {
+        return logServiceFacade;
+    }
+}
 package com.bsth.controller.schedule.core;
 import com.alibaba.dubbo.config.annotation.Reference;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.schedule.rule.RerunRuleDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
 import com.bsth.control_v2.plan_module.common.service.schedule.rule.RerunRuleConfigServiceFacade;
 import com.bsth.controller.schedule.BController_facade;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +17,7 @@ import java.util.Date;
  * Created by xu on 16/10/20.
  */
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("rms")
 public class RerunController_facade extends BController_facade<Long, RerunRuleDto> {
     @Override
@@ -2,6 +2,7 @@ package com.bsth.controller.schedule.core;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.schedule.PlanDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
@@ -11,6 +12,7 @@ import com.bsth.controller.schedule.BController_facade;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.schedule.SchedulePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -21,6 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("spc")
 public class SchedulePlanController_facade extends BController_facade<Long, PlanDto> {
     @Reference
+package com.bsth.controller.schedule.core;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
+import com.bsth.control_v2.plan_module.common.dto.schedule.PlanInfoDto;
+import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
+import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
+import com.bsth.control_v2.plan_module.common.service.schedule.PlanInfoServiceFacade;
+import com.bsth.control_v2.plan_module.common.utils.SystemInfoUtils;
+import com.bsth.controller.schedule.BController_facade;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@Conditional(DubboConfigCondition.class)
+@RequestMapping("spic")
+public class SchedulePlanInfoController_facade extends BController_facade<Long, PlanInfoDto>  {
+    @Reference
+    private PlanInfoServiceFacade planInfoServiceFacade;
+
+    @Override
+    protected BServiceFacade<Long, PlanInfoDto> getBServiceFacade() {
+        return planInfoServiceFacade;
+    }
+
+    @Override
+    public void setCreateUserInfo(PlanInfoDto planInfoDto, Integer userId, Date createDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        planInfoDto.setCreateBy(userDto);
+        planInfoDto.setCreateDate(createDate);
+    }
+
+    @Override
+    public void setUpdateUserInfo(PlanInfoDto planInfoDto, Integer userId, Date updateDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        planInfoDto.setUpdateBy(userDto);
+        planInfoDto.setUpdateDate(updateDate);
+    }
+
+    @Override
+    protected boolean isUpdateExtend() {
+        return true;
+    }
+
+    @Override
+    protected PlanInfoDto updateExtend(PlanInfoDto planInfoDto) {
+        return this.planInfoServiceFacade.updateInfo(planInfoDto, SystemInfoUtils.createClientSystemInfo());
+    }
+
+    @RequestMapping(value = "/groupextinfos/{xlid}/{date}", method = RequestMethod.GET)
+    public Map<String, Object> findGroupInfoExt(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "date") Date scheduleDate) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("data", this.planInfoServiceFacade.findPlanGroupInfo(xlid, scheduleDate));
+
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
+
+        return resultMap;
+    }
+
+    @RequestMapping(value = "/lastestsd/{xlid}", method = RequestMethod.GET)
+    public Map<String, Object> findLastestPlanDate(
+            @PathVariable(value = "xlid") Integer xlid) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("data", this.planInfoServiceFacade.findLastestPlanInfoDate(xlid));
+
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
+
+        return resultMap;
+    }
+
+
+}
 package com.bsth.controller.schedule.core;
 import com.alibaba.dubbo.config.annotation.Reference;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.schedule.rule.FlatRuleDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
 import com.bsth.control_v2.plan_module.common.service.schedule.rule.FlatRuleConfigServiceFacade;
 import com.bsth.controller.schedule.BController_facade;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +17,7 @@ import java.util.Date;
  * Created by xu on 16/7/4.
  */
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("sr1fc")
 public class ScheduleRule1FlatController_facade extends BController_facade<Long, FlatRuleDto> {
     @Override
+package com.bsth.controller.schedule.core;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
+import com.bsth.control_v2.plan_module.common.dto.schedule.timetable.TTInfoBxDetailDto;
+import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
+import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
+import com.bsth.control_v2.plan_module.common.service.schedule.timetable.TTInfoBxDetailServiceFacade;
+import com.bsth.controller.schedule.BController_facade;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+@RestController
+@Conditional(DubboConfigCondition.class)
+@RequestMapping("tibxdc")
+public class TTInfoBxDetailController_facade extends BController_facade<Long, TTInfoBxDetailDto> {
+    @Reference
+    private TTInfoBxDetailServiceFacade ttInfoBxDetailServiceFacade;
+
+    @Override
+    protected BServiceFacade<Long, TTInfoBxDetailDto> getBServiceFacade() {
+        return ttInfoBxDetailServiceFacade;
+    }
+
+    @Override
+    public void setCreateUserInfo(TTInfoBxDetailDto ttInfoBxDetailDto, Integer userId, Date createDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        ttInfoBxDetailDto.setCreateBy(userDto);
+        ttInfoBxDetailDto.setCreateDate(createDate);
+    }
+
+    @Override
+    public void setUpdateUserInfo(TTInfoBxDetailDto ttInfoBxDetailDto, Integer userId, Date updateDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        ttInfoBxDetailDto.setUpdateBy(userDto);
+        ttInfoBxDetailDto.setUpdateDate(updateDate);
+    }
+}
@@ -2,6 +2,7 @@ package com.bsth.controller.schedule.core;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.baseinfo.LineDto;
 import com.bsth.control_v2.plan_module.common.dto.schedule.timetable.TTInfoDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
@@ -9,6 +10,7 @@ import com.bsth.control_v2.plan_module.common.exception.PlanModuleException;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
 import com.bsth.control_v2.plan_module.common.service.schedule.timetable.TTInfoServiceFacade;
 import com.bsth.controller.schedule.BController_facade;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.*;
 import java.util.Date;
@@ -18,7 +20,8 @@ import java.util.Map;
 /**
  * Created by xu on 16/12/20.
  */
-@RestController(value = "tTInfoController_ec")
+@RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping(value = "tic_ec")
 public class TTInfoController_facade extends BController_facade<Long, TTInfoDto> {
     @Override
@@ -2,6 +2,7 @@ package com.bsth.controller.schedule.core;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.bsth.common.ResponseCode;
+import com.bsth.control_v2.plan_module.common.config.springboot.dubbo.DubboConfigCondition;
 import com.bsth.control_v2.plan_module.common.dto.schedule.timetable.TTInfoDetailDto;
 import com.bsth.control_v2.plan_module.common.dto.sys.UserDto;
 import com.bsth.control_v2.plan_module.common.service.BServiceFacade;
@@ -17,6 +18,7 @@ import com.bsth.service.schedule.utils.DataToolsFileType;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -25,6 +27,7 @@ import java.io.*;
 import java.util.*;
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("tidc")
 public class TTInfoDetailController_facade extends BController_facade<Long, TTInfoDetailDto> {
     @Reference
@@ -3,15 +3,18 @@ package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.CarConfigInfoController_facade;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.service.schedule.CarConfigInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -22,8 +25,9 @@ import java.util.Map;
 /**
  * Created by xu on 16/5/9.
  */
-//@RestController
-//@RequestMapping("cci")
+@RestController
+@ConditionalOnMissingBean(CarConfigInfoController_facade.class)
+@RequestMapping("cci")
 public class CarConfigInfoController extends BController<CarConfigInfo, Long> {
     @Autowired
     private CarConfigInfoRepository carConfigInfoRepository;
@@ -3,12 +3,14 @@ package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.EmployeeConfigInfoController_facade;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
@@ -20,8 +22,9 @@ import java.util.Map;
 /**
  * Created by xu on 16/5/10.
  */
-//@RestController
-//@RequestMapping("eci")
+@RestController
+@ConditionalOnMissingBean(EmployeeConfigInfoController_facade.class)
+@RequestMapping("eci")
 public class EmployeeConfigInfoController extends BController<EmployeeConfigInfo, Long> {
     @Autowired
     private EmployeeConfigInfoRepository employeeConfigInfoRepository;
@@ -2,11 +2,13 @@ package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.GuideboardInfoController_facade;
 import com.bsth.entity.schedule.GuideboardInfo;
 import com.bsth.repository.schedule.GuideboardInfoRepository;
 import com.bsth.service.schedule.GuideboardInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.*;
 import java.util.HashMap;
@@ -16,8 +18,9 @@ import java.util.Map;
 /**
  * 路牌管理控制器。
  */
-//@RestController
-//@RequestMapping("gic")
+@RestController
+@ConditionalOnMissingBean(GuideboardInfoController_facade.class)
+@RequestMapping("gic")
 public class GuideboardInfoController extends BController<GuideboardInfo, Long> {
     @Autowired
     private GuideboardInfoService guideboardInfoService;
 package com.bsth.controller.schedule.core.legacy;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.RerunController_facade;
 import com.bsth.entity.schedule.rule.RerunRule;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 /**
  * Created by xu on 16/10/20.
  */
-//@RestController
-//@RequestMapping("rms")
+@RestController
+@ConditionalOnMissingBean(RerunController_facade.class)
+@RequestMapping("rms")
 public class RerunController extends BController<RerunRule, Long> {
@@ -2,12 +2,15 @@ package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.SchedulePlanController_facade;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.schedule.SchedulePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 import java.util.HashMap;
@@ -16,8 +19,9 @@ import java.util.Map;
 /**
  * Created by xu on 16/6/16.
  */
-//@RestController
-//@RequestMapping("spc")
+@RestController
+@ConditionalOnMissingBean(SchedulePlanController_facade.class)
+@RequestMapping("spc")
 public class SchedulePlanController extends BController<SchedulePlan, Long> {
     @Autowired
     private SchedulePlanService schedulePlanService;
@@ -2,13 +2,12 @@ package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.SchedulePlanInfoController_facade;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
-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.RequestMethod;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.HashMap;
@@ -19,6 +18,10 @@ import java.util.Map;
  * Created by xu on 17/5/1.
  */
 @RestController
+<<<<<<< HEAD
+=======
+@ConditionalOnMissingBean(SchedulePlanInfoController_facade.class)
+>>>>>>> b165084... iss提交16；
 @RequestMapping("spic")
 public class SchedulePlanInfoController extends BController<SchedulePlanInfo, Long> {
     @Autowired
 package com.bsth.controller.schedule.core.legacy;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.ScheduleRule1FlatController_facade;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 /**
  * Created by xu on 16/7/4.
  */
-//@RestController
-//@RequestMapping("sr1fc")
+@RestController
+@ConditionalOnMissingBean(ScheduleRule1FlatController_facade.class)
+@RequestMapping("sr1fc")
 public class ScheduleRule1FlatController extends BController<ScheduleRule1Flat, Long> {
@@ -2,10 +2,12 @@ package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.TTInfoController_facade;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.*;
 import java.util.HashMap;
@@ -14,8 +16,9 @@ import java.util.Map;
 /**
  * Created by xu on 16/12/20.
  */
-//@RestController(value = "tTInfoController_ec")
-//@RequestMapping(value = "tic_ec")
+@RestController
+@ConditionalOnMissingBean(TTInfoController_facade.class)
+@RequestMapping(value = "tic_ec")
 public class TTInfoController extends BController<TTInfo, Long> {
     @Autowired
     private TTInfoService ttInfoService;
@@ -2,6 +2,7 @@ package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
+import com.bsth.controller.schedule.core.TTInfoDetailController_facade;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
@@ -10,6 +11,7 @@ import com.bsth.service.schedule.timetable.ExcelFormatType;
 import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsFileType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
@@ -22,6 +24,10 @@ import java.util.Map;
  * Created by xu on 17/1/4.
  */
 @RestController
+<<<<<<< HEAD
+=======
+@ConditionalOnMissingBean(TTInfoDetailController_facade.class)
+>>>>>>> b165084... iss提交16；
 @RequestMapping("tidc")
 public class TTInfoDetailController extends BController<TTInfoDetail, Long> {
     @Autowired