iss提交12：

1、添加使用路牌配置服务的controller，把原来的controller放入legacy包中 2、在dubbo消费者配置文件中配置路牌配置服务

iss提交12：
1、添加使用路牌配置服务的controller，把原来的controller放入legacy包中 2、在dubbo消费者配置文件中配置路牌配置服务
徐烜
1 parent bf084608
Showing 10 changed files with 110 additions and 17 deletions
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/RerunController_facade.java
src/main/java/com/bsth/controller/schedule/core/ScheduleRule1FlatController_facade.java
src/main/java/com/bsth/controller/schedule/core/RerunController.java → src/main/java/com/bsth/controller/schedule/core/legacy/RerunController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java → src/main/java/com/bsth/controller/schedule/core/legacy/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanInfoController.java → src/main/java/com/bsth/controller/schedule/core/legacy/SchedulePlanInfoController.java
src/main/java/com/bsth/controller/schedule/core/ScheduleRule1FlatController.java → src/main/java/com/bsth/controller/schedule/core/legacy/ScheduleRule1FlatController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java → src/main/java/com/bsth/controller/schedule/core/legacy/TTInfoDetailController.java
src/main/resources/application-dev.properties
src/main/resources/dubbo/applicationContext_dubbo_consumer.xml
@@ -105,7 +105,7 @@ public class GuideboardInfoController_facade extends BController_facade&lt;Long, Lp
                                     .setId(Integer.valueOf(param.get("xl.id_eq").toString()))
                                     .build()
                     ))
-                    .setLpName(param.get("lpName_eq") == null ? null : param.get("lpNo_eq").toString())
+                    .setLpName(param.get("lpName_eq") == null ? null : param.get("lpName_eq").toString())
                     .build();
             lpConfigServiceFacade.validate_lpname_duplicate(lpConfigDto);
             rtn.put("status", ResponseCode.SUCCESS);
+package com.bsth.controller.schedule.core;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+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.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * Created by xu on 16/10/20.
+ */
+@RestController
+@RequestMapping("rms")
+public class RerunController_facade extends BController_facade<Long, RerunRuleDto> {
+    @Override
+    public void setCreateUserInfo(RerunRuleDto rerunRuleDto, Integer userId, Date createDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        rerunRuleDto.setCreateBy(userDto);
+        rerunRuleDto.setCreateDate(createDate);
+    }
+
+    @Override
+    public void setUpdateUserInfo(RerunRuleDto rerunRuleDto, Integer userId, Date updateDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        rerunRuleDto.setUpdateBy(userDto);
+        rerunRuleDto.setUpdateDate(updateDate);
+    }
+
+    @Reference
+    private RerunRuleConfigServiceFacade rerunRuleConfigServiceFacade;
+
+    @Override
+    protected BServiceFacade<Long, RerunRuleDto> getBServiceFacade() {
+        return rerunRuleConfigServiceFacade;
+    }
+}
+package com.bsth.controller.schedule.core;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+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.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * Created by xu on 16/7/4.
+ */
+@RestController
+@RequestMapping("sr1fc")
+public class ScheduleRule1FlatController_facade extends BController_facade<Long, FlatRuleDto> {
+    @Override
+    public void setCreateUserInfo(FlatRuleDto flatRuleDto, Integer userId, Date createDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        flatRuleDto.setCreateBy(userDto);
+        flatRuleDto.setCreateDate(createDate);
+    }
+
+    @Override
+    public void setUpdateUserInfo(FlatRuleDto flatRuleDto, Integer userId, Date updateDate) {
+        UserDto userDto = UserDto.getBuilder()
+                .setId(userId)
+                .build();
+        flatRuleDto.setUpdateBy(userDto);
+        flatRuleDto.setUpdateDate(updateDate);
+    }
+
+    @Reference
+    private FlatRuleConfigServiceFacade flatRuleConfigServiceFacade;
+
+    @Override
+    protected BServiceFacade<Long, FlatRuleDto> getBServiceFacade() {
+        return flatRuleConfigServiceFacade;
+    }
+}
-package com.bsth.controller.schedule.core;
+package com.bsth.controller.schedule.core.legacy;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.rule.RerunRule;
-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
+//@RequestMapping("rms")
 public class RerunController extends BController<RerunRule, Long> {
-package com.bsth.controller.schedule.core;
+package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
-package com.bsth.controller.schedule.core;
+package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 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.*;
+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 java.util.Date;
 import java.util.HashMap;
-package com.bsth.controller.schedule.core;
+package com.bsth.controller.schedule.core.legacy;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
-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
+//@RequestMapping("sr1fc")
 public class ScheduleRule1FlatController extends BController<ScheduleRule1Flat, Long> {
-package com.bsth.controller.schedule.core;
+package com.bsth.controller.schedule.core.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
@@ -13,8 +13,8 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-#spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= root
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
@@ -25,6 +25,10 @@
     <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.config.EmployeeConfigServiceFacade" id="employeeConfigServiceFacadeImpl" check="false" />
     <!-- 路牌配置信息服务 -->
     <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.config.LpConfigServiceFacade" id="lpConfigServiceFacadeImpl" check="false" />
+    <!-- flat规则配置信息服务 -->
+    <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.rule.FlatRuleConfigServiceFacade" id="flatRuleConfigServiceFacadeImpl" check="false" />
+    <!-- rerun规则配置信息服务 -->
+    <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.rule.RerunRuleConfigServiceFacade" id="rerunRuleConfigServiceFacadeImpl" check="false" />
     <!-- 时刻表班型明细服务 -->
     <dubbo:reference interface="com.bsth.control_v2.plan_module.common.service.schedule.timetable.TTInfoBxDetailServiceFacade" id="tTInfoBxDetailServiceFacadeImpl" check="false" />