包扫描

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/AppApplication.java

@@ -2,15 +2,16 @@ package com.xxfc.platform.app;
 
 import com.ace.cache.EnableAceCache;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
-import com.spring4all.swagger.EnableSwagger2Doc;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {
+        "com.xxfc.platform",
+        "com.github.wxiaoqi.*"
+})
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/ImApplication.java

@@ -10,7 +10,10 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
+@SpringBootApplication(scanBasePackages = {
+        "com.xxfc.platform",
+        "com.github.wxiaoqi.*"
+},exclude = DataSourceAutoConfiguration.class)
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/OrderApplication.java

@@ -10,7 +10,10 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {
+        "com.xxfc.platform",
+        "com.github.wxiaoqi.*"
+})
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodSite.java

@@ -21,7 +21,7 @@ public class TourGoodSite implements Serializable {
 	
     @Id
 	@GeneratedValue(generator = "JDBC")
-	@ApiModelProperty("")
+	@ApiModelProperty("主键")
     private Integer id;
 
 	/**
@@ -45,7 +45,9 @@ public class TourGoodSite implements Serializable {
 	@ApiModelProperty(value = "站点地址")
     private String address;
 
-    //分公司id
+	/**
+	 * 	分公司id
+	 */
 	@Column(name = "company_id")
 	@ApiModelProperty(value = "分公司id")
 	private String companyId;
@@ -78,52 +80,72 @@ public class TourGoodSite implements Serializable {
 	@ApiModelProperty("地址-市(名称)")
 	private Integer cityName;
 
-	//出发时间
+	/**
+	 *	出发时间
+	 */
     @Column(name = "depart_time")
 	@ApiModelProperty(value = "出发时间")
     private Long departTime;
-	
-	    //站点经度
-    @Column(name = "longitude")
+
+	/**
+	 * 	站点经度
+	 */
+	@Column(name = "longitude")
 	@ApiModelProperty(value = "站点经度")
     private Double longitude;
-	
-	    //站点纬度
+
+	/**
+	 * 	站点纬度
+	 */
     @Column(name = "latitude")
 	@ApiModelProperty(value = "站点纬度")
     private Double latitude;
-	
-	    //类型：0起点，1-途径点；2-终点
+
+	/**
+	 * 	类型：0起点，1-途径点；2-终点
+	 */
     @Column(name = "type")
 	@ApiModelProperty(value = "类型：0起点，1-途径点；2-终点")
     private Integer type;
-	
-	    //排序
-    @Column(name = "rank")
+
+	/**
+	 * 排序
+	 */
+	@Column(name = "rank")
 	@ApiModelProperty(value = "排序")
     private Integer rank;
-	
-	    //状态 0正常 1关闭
+
+	/**
+	 * 	状态 0正常 1关闭
+	 */
     @Column(name = "status")
 	@ApiModelProperty(value = "状态 0正常 1关闭")
     private Integer status;
-	
-	    //创建时间
-    @Column(name = "crt_time")
+
+	/**
+	 * 	创建时间
+	 */
+	@Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间")
     private Long crtTime;
-	
-	    //更新时间
+
+	/**
+	 * 	更新时间
+	 */
     @Column(name = "upd_time")
 	@ApiModelProperty(value = "更新时间", hidden = true )
     private Long updTime;
-	
-	    //站点介绍
-    @Column(name = "intro")
+
+	/**
+	 * 	站点介绍
+	 */
+	@Column(name = "intro")
 	@ApiModelProperty(value = "站点介绍")
     private String intro;
-	
-	    //是否删除；0-正常；1-删除
+
+	/**
+	 * 	是否删除；0-正常；1-删除
+	 */
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
     private Integer isDel;

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodSpe.java

@@ -19,38 +19,48 @@ import lombok.Data;
 public class TourGoodSpe implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
-	    //
     @Id
 	@GeneratedValue(generator = "JDBC")
-	@ApiModelProperty("")
     private Integer id;
-	
-	    //商品id
+
+	/**
+	 * 	商品id
+	 */
     @Column(name = "good_id")
 	@ApiModelProperty(value = "商品id")
     private Integer goodId;
-	
-	    //规格名
-    @Column(name = "title")
+
+	/**
+	 * 	规格名
+	 */
+	@Column(name = "title")
 	@ApiModelProperty(value = "规格名")
     private String title;
-	
-	    //父id
+
+	/**
+	 * 	父id
+	 */
     @Column(name = "parent_id")
 	@ApiModelProperty(value = "父id")
     private Integer parentId;
-	
-	    //创建时间
-    @Column(name = "crt_time")
+
+	/**
+	 * 	创建时间
+	 */
+	@Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
-	
-	    //更新时间
+
+	/**
+	 * 	更新时间
+	 */
     @Column(name = "upd_time")
 	@ApiModelProperty(value = "更新时间", hidden = true )
     private Long updTime;
-	
-	    //是否删除:0-正常；1-删除
+
+	/**
+	 * 	是否删除:0-正常；1-删除
+	 */
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除:0-正常；1-删除")
     private Integer isDel;

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodSpePrice.java

@@ -19,67 +19,86 @@ import lombok.Data;
 @Table(name = "tour_good_spe_price")
 public class TourGoodSpePrice implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
-	    //
+
     @Id
 	@GeneratedValue(generator = "JDBC")
-	@ApiModelProperty("")
     private Integer id;
-	
-	    //商品id
-    @Column(name = "good_id")
+
+	/**
+	 * 商品id
+	 */
+	@Column(name = "good_id")
 	@ApiModelProperty(value = "商品id")
     private Integer goodId;
-	
-	    //出行时间
+
+	/**
+	 * 	出行时间
+	 */
     @Column(name = "start_time")
 	@ApiModelProperty(value = "出行时间")
     private Date startTime;
-	
-	    //结束时间
+
+	/**
+	 * 	结束时间
+	 */
     @Column(name = "end_time")
 	@ApiModelProperty(value = "结束时间")
     private Date endTime;
-	
-	    //规格id
+
+	/**
+	 * 	规格id
+	 */
     @Column(name = "spe_id")
 	@ApiModelProperty(value = "规格id")
     private String speId;
-	
-	    //价格
-    @Column(name = "price")
+
+	/**
+	 * 	价格
+	 */
+	@Column(name = "price")
 	@ApiModelProperty(value = "价格")
     private BigDecimal price;
-	
-	    //儿童价格
+
+	/**
+	 * 	儿童价格
+	 */
     @Column(name = "child_price")
 	@ApiModelProperty(value = "儿童价格")
     private BigDecimal childPrice;
-	
-	    //会员价格
+
+	/**
+	 * 	会员价格
+	 */
     @Column(name = "member_price")
 	@ApiModelProperty(value = "会员价格")
     private String memberPrice;
-	
-	    //库存
-    @Column(name = "stock")
+
+	/**
+	 * 	库存
+	 */
+	@Column(name = "stock")
 	@ApiModelProperty(value = "库存")
     private Integer stock;
-	
-	    //创建时间
+
+	/**
+	 * 	创建时间
+	 */
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
-	
-	    //更新时间
-    @Column(name = "upd_time")
+
+	/**
+	 * 	更新时间
+	 */
+	@Column(name = "upd_time")
 	@ApiModelProperty(value = "更新时间", hidden = true )
     private Long updTime;
-	
-	    //是否删除：0-正常；1-删除
+
+	/**
+	 * 	是否删除：0-正常；1-删除
+	 */
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
     private Integer isDel;
-	
 
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBannerBiz.java

@@ -112,7 +112,9 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner>
         if (CollectionUtils.isNotEmpty(tourTagBannerIds)){
             mapper.updateTourBannerStatusByTagannerIdsAndTagId(tourTagBannerIds,tourTagBannerDTOS.get(0).getTagId(),1);
         }else {
-            mapper.updateTourTagBannerStatusByTagId(tourTagBannerDTOS.get(0).getTagId(),1,Instant.now().toEpochMilli());
+            if (CollectionUtils.isNotEmpty(tourTagBannerDTOS)){
+                mapper.updateTourTagBannerStatusByTagId(tourTagBannerDTOS.get(0).getTagId(),1,Instant.now().toEpochMilli());
+            }
         }
         tourTagBannerDTOS.stream().filter(tourTagBannerDTO -> Objects.isNull(tourTagBannerDTO.getId())).peek(tourTagBannerDTO -> {
             save(tourTagBannerDTO,userDTO);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/UniversalApplication.java

@@ -9,7 +9,10 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {
+        "com.xxfc.platform",
+        "com.github.wxiaoqi.*"
+})
 @EnableDiscoveryClient
 @EnableAceAuthClient
 @EnableAceCache

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/VehicleApplication.java

@@ -8,15 +8,16 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {
+        "com.xxfc.platform",
+        "com.github.wxiaoqi.*"
+})
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
 @EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform.vehicle.feign"})
 @EnableAceCache
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.vehicle.mapper")
-//@MapperScan("com.xxfc.platform.vehicle.mapper")
-
 public class VehicleApplication {
 
     public static void main(String[] args) {