1、修改使用dubbo的controller创建过程，使用spring @Condition配置config工程的DubboConfigCondition判定是否创建

2、对应不使用dubbo的controller，使用spring @ConditionOnMissBean 判定是否创建 3、将TTInfoBx相关的服务代码拷贝到主项目中（防止不使用dubbo时这部分业务报错） 4、修改相关配置文件

1、修改使用dubbo的controller创建过程，使用spring @Condition配置config工程的DubboConfigCondition判定是否创建
2、对应不使用dubbo的controller，使用spring @ConditionOnMissBean 判定是否创建 3、将TTInfoBx相关的服务代码拷贝到主项目中（防止不使用dubbo时这部分业务报错） 4、修改相关配置文件
徐烜
1 parent a7985eed
Showing 16 changed files with 230 additions and 10 deletions
src/main/java/com/bsth/controller/schedule/core/LogController_facade.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController_facade.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanInfoController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanInfoController_facade.java
src/main/java/com/bsth/controller/schedule/core/TTInfoBxDetailController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoBxDetailController_facade.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java
src/main/java/com/bsth/entity/schedule/TTInfoBxDetail.java
src/main/java/com/bsth/entity/schedule/covert/BxTypeConverter.java
src/main/java/com/bsth/repository/schedule/TTInfoBxDetailRepository.java
src/main/java/com/bsth/service/schedule/TTInfoBxDetailService.java
src/main/java/com/bsth/service/schedule/TTInfoBxDetailServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/datatools/config-prod.properties
 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
@@ -5,9 +5,11 @@ import com.bsth.controller.schedule.BController;
 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 +18,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,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.service.BServiceFacade;
 import com.bsth.control_v2.plan_module.common.service.schedule.PlanGenerateFacade;
@@ -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
@@ -84,7 +87,7 @@ public class SchedulePlanController_facade extends BController_facade&lt;Long, Plan
      */
     @Override
     protected PlanDto saveExtend(PlanDto planDto) {
-        planGenerateFacade.generatePlan(planDto);
+//        planGenerateFacade.generatePlan(planDto);
         return planDto;
     }
@@ -5,6 +5,7 @@ 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.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.web.bind.annotation.*;
 import java.util.Date;
@@ -15,8 +16,9 @@ import java.util.Map;
 /**
  * Created by xu on 17/5/1.
  */
-//@RestController
-//@RequestMapping("spic")
+@RestController
+@ConditionalOnMissingBean(SchedulePlanInfoController_facade.class)
+@RequestMapping("spic")
 public class SchedulePlanInfoController extends BController<SchedulePlanInfo, Long> {
     @Autowired
     private SchedulePlanInfoService schedulePlanInfoService;
@@ -2,12 +2,14 @@ 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;
@@ -18,6 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("spic")
 public class SchedulePlanInfoController_facade extends BController_facade<Long, PlanInfoDto>  {
     @Reference
+package com.bsth.controller.schedule.core;
+
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.TTInfoBxDetail;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@ConditionalOnMissingBean(TTInfoBxDetailController_facade.class)
+@RequestMapping("tibxdc")
+public class TTInfoBxDetailController extends BController<TTInfoBxDetail, Long> {
+}
 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
@@ -10,6 +10,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;
@@ -21,8 +22,9 @@ import java.util.Map;
 /**
  * Created by xu on 17/1/4.
  */
-//@RestController
-//@RequestMapping("tidc")
+@RestController
+@ConditionalOnMissingBean(TTInfoDetailController_facade.class)
+@RequestMapping("tidc")
 public class TTInfoDetailController extends BController<TTInfoDetail, Long> {
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
@@ -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;
@@ -11,6 +12,7 @@ import com.bsth.controller.schedule.BController_facade;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 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;
@@ -22,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 @RestController
+@Conditional(DubboConfigCondition.class)
 @RequestMapping("tidc")
 public class TTInfoDetailController_facade extends BController_facade<Long, TTInfoDetailDto> {
     @Reference
+package com.bsth.entity.schedule;
+
+import com.bsth.control_v2.plan_module.common.enums.ttinfo.BxType;
+import com.bsth.entity.Line;
+import com.bsth.entity.schedule.covert.BxTypeConverter;
+
+import javax.persistence.*;
+
+/**
+ * 时刻表明细信息（班型信息）。
+ */
+@Entity
+@Table(name = "bsth_c_s_ttinfo_bx_detail")
+public class TTInfoBxDetail extends BEntity {
+
+    /** 主健Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+
+    /** 关联线路 */
+    @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+    private Line xl;
+    /** 线路版本（bsth_c_line_versions表对应字段） */
+    @Column(nullable = false)
+    private int lineVersion;
+    /** 时刻表主对象关联 */
+    @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+    private TTInfo ttinfo;
+    /** 关联的路牌 */
+    @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+    private GuideboardInfo lp;
+
+    /** 路牌班型1 */
+    @Convert(converter = BxTypeConverter.class)
+    @Column(nullable = false)
+    private BxType bxType1;
+    /** 路牌班型2 */
+    @Column(nullable = false)
+    @Convert(converter = BxTypeConverter.class)
+    private BxType bxType2;
+    /** 路牌配档数 */
+    private String bxPds;
+
+    /** 版本控制 */
+    @Version
+    @Column(nullable = false)
+    private int version;
+
+    // TODO：
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Line getXl() {
+        return xl;
+    }
+
+    public void setXl(Line xl) {
+        this.xl = xl;
+    }
+
+    public int getLineVersion() {
+        return lineVersion;
+    }
+
+    public void setLineVersion(int lineVersion) {
+        this.lineVersion = lineVersion;
+    }
+
+    public TTInfo getTtinfo() {
+        return ttinfo;
+    }
+
+    public void setTtinfo(TTInfo ttinfo) {
+        this.ttinfo = ttinfo;
+    }
+
+    public GuideboardInfo getLp() {
+        return lp;
+    }
+
+    public void setLp(GuideboardInfo lp) {
+        this.lp = lp;
+    }
+
+    public BxType getBxType1() {
+        return bxType1;
+    }
+
+    public void setBxType1(BxType bxType1) {
+        this.bxType1 = bxType1;
+    }
+
+    public BxType getBxType2() {
+        return bxType2;
+    }
+
+    public void setBxType2(BxType bxType2) {
+        this.bxType2 = bxType2;
+    }
+
+    public String getBxPds() {
+        return bxPds;
+    }
+
+    public void setBxPds(String bxPds) {
+        this.bxPds = bxPds;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+}
+package com.bsth.entity.schedule.covert;
+
+import com.bsth.control_v2.plan_module.common.enums.ttinfo.BxType;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Convert;
+
+@Convert
+public class BxTypeConverter implements AttributeConverter<BxType, String> {
+    @Override
+    public String convertToDatabaseColumn(BxType attribute) {
+        return attribute.getDicDesc();
+    }
+
+    @Override
+    public BxType convertToEntityAttribute(String dbData) {
+        if (StringUtils.isEmpty(dbData)) {
+            return null;
+        } else {
+            return BxType.fromDicDesc(dbData);
+        }
+
+    }
+}
+package com.bsth.repository.schedule;
+
+import com.bsth.entity.schedule.TTInfoBxDetail;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TTInfoBxDetailRepository extends BaseRepository<TTInfoBxDetail, Long> {
+
+}
+package com.bsth.service.schedule;
+
+
+import com.bsth.entity.schedule.TTInfoBxDetail;
+
+/**
+ * 时刻表班型明细服务。
+ */
+public interface TTInfoBxDetailService extends BService<TTInfoBxDetail, Long> {
+
+}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.schedule.TTInfoBxDetail;
+import com.bsth.service.schedule.impl.BServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
+public class TTInfoBxDetailServiceImpl extends BServiceImpl<TTInfoBxDetail, Long> implements TTInfoBxDetailService {
+
+}
@@ -3,7 +3,7 @@ server.port=9088
 #management.address= 127.0.0.1
 management.security.enabled=false
 management.context-path=/manage
-dubbo.use=true
+dubbo.use=false
 spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
@@ -5,11 +5,11 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=10.10.150.20
+datatools.kvars_dbip=10.10.200.121
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=root2jsp@JSP
+datatools.kvars_dbpwd=root2jsp
 #数据库库名
 datatools.kvars_dbdname=control