Merge remote-tracking branch 'origin/holiday-price' into holiday-price

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -133,4 +133,5 @@ public interface UserFeign {
 
     @GetMapping("/member/user")
     BaseUserMember findBaseUserMemberByUserId(@RequestParam(value = "userId") Integer userId);
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java

 package com.github.wxiaoqi.security.admin.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 用户信息表
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class AppUserVo {
 
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Festival.java

+package com.xxfc.platform.vehicle.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/18 17:29
+ */
+@Data
+@Table(name = "festival")
+@NoArgsConstructor
+@AllArgsConstructor
+public class Festival {
+     @Id
+     @GeneratedValue(generator = "JDBC")
+     private Integer id;
+     private String name;
+     @Column(name = "crt_time")
+     private Date crtTime;
+}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModelHolidayPrice.java

@@ -36,7 +36,8 @@ public class VehicleModelHolidayPrice implements Serializable {
     /**
      * 节假日
      */
-    private String festival;
+    @Column(name = "festival_id")
+    private Integer festivalId;
     /**
      * 倍数
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehicleModelHolidayPriceFindDTO.java

@@ -20,5 +20,6 @@ import java.util.Date;
 @NoArgsConstructor
 public class VehicleModelHolidayPriceFindDTO  extends PageParam {
       private String festival;
-      private Date  date;
+      private String  date;
+      private Integer  year;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehicleModelHolidayPriceSaveDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,13 +21,16 @@ import java.util.List;
 @NoArgsConstructor
 public class VehicleModelHolidayPriceSaveDTO implements Serializable {
     private static final long serialVersionUID = 1L;
-    private Long id;
+    /**
+     * 节假日id
+     */
+    private Integer id;
     /**
      * 节假日日期
      */
-    private String date;
+    private List<Date> date;
     /**
-     * 节假日
+     * 节假日名称
      */
     private String festival;
     /**

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

+package com.xxfc.platform.vehicle.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.vehicle.entity.Festival;
+import com.xxfc.platform.vehicle.mapper.FestivalMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/18 17:31
+ */
+@Transactional(rollbackFor = Exception.class)
+@Service
+public class FestivalBiz extends BaseBiz<FestivalMapper,Festival> {
+
+     public void add(Festival festival){
+         if (Objects.isNull(festival.getId())){
+             festival.setCrtTime(new Date());
+             mapper.insertSelective(festival);
+         }else {
+             mapper.updateByPrimaryKey(festival);
+         }
+     }
+
+     public void deleteById(Integer festivalId){
+         Festival festival = new Festival();
+         festival.setId(festivalId);
+         mapper.deleteByPrimaryKey(festival);
+     }
+
+    public Map<Integer, Festival> findFestivalsByIds(List<Integer> festivalIds) {
+         Map<Integer,Festival> festivalMap =  new HashMap<>(20);
+        List<Festival> festivals = mapper.selectByIdList(festivalIds);
+        if (CollectionUtils.isNotEmpty(festivalIds)){
+            festivalMap = festivals.stream().collect(Collectors.toMap(Festival::getId, Function.identity()));
+        }
+        return festivalMap;
+    }
+}

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

+package com.xxfc.platform.vehicle.mapper;
+
+
+import com.xxfc.platform.vehicle.entity.Festival;
+import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/18 17:33
+ */
+public interface FestivalMapper extends Mapper<Festival>, SelectByIdListMapper<Festival,Integer> {
+}

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleModelHolidayPrice;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
 /**
@@ -9,5 +10,5 @@ import tk.mybatis.mapper.common.Mapper;
  * @description
  * @data 2019/10/14 17:32
  */
-public interface VehicleModelHolidayPriceMapper extends Mapper<VehicleModelHolidayPrice> {
+public interface VehicleModelHolidayPriceMapper extends Mapper<VehicleModelHolidayPrice>, InsertListMapper<VehicleModelHolidayPrice> {
 }

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

@@ -11,14 +11,11 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/VehicleModelHolidayPriceAdminController.java

@@ -36,7 +36,7 @@ public class VehicleModelHolidayPriceAdminController {
 
     @GetMapping("/{id}")
     public ObjectRestResponse<VehicleModelHolidayPriceSaveDTO> findVehicleModelHolidayPrice(@PathVariable(value = "id") Long id){
-        VehicleModelHolidayPriceSaveDTO  vehicleModelHolidayPriceSaveDTO = vehicleModelHolidayPriceBiz.findVehicleModelHolidayPriceById(id);
+        VehicleModelHolidayPriceSaveDTO  vehicleModelHolidayPriceSaveDTO = vehicleModelHolidayPriceBiz.findVehicleModelHolidayPriceFestivalId(id);
         return ObjectRestResponse.succ(vehicleModelHolidayPriceSaveDTO);
     }