潘钊 / bsth_control · Commits

Commit 0bea80cf96a3218cfb2d22ea3237fde3538513d8

Authored by 徐烜
1 parent b8136122

iss提交16； 

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