AFL_VEHICLE_BRAND_INFO 从 154迁移到 159

src/main/java/com/qtzl/alterSales/dao/entity/primary/VehicleBrandInfo.java

@@ -1,112 +0,0 @@
-package com.qtzl.alterSales.dao.entity.primary;
-
-
-import cn.com.taiji.common.entity.StringUUIDEntity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.util.Date;
-
-@Entity
-@Table(name = "fss_vehicle_brand_info")
-public class VehicleBrandInfo extends StringUUIDEntity {
-
-    /**
-     * 品牌型号
-     */
-    private String brandModel;
-
-    /**
-     * 品牌型号
-     */
-    private String correspondingVehicle;
-
-    /**
-     * 是否删除,0未删除；1已删除 默认为0
-     */
-    private Integer isDelete;
-
-    /**
-     * 创建操作人
-     */
-    private String createdName;
-
-    /**
-     * 修改操作人
-     */
-    private String updatedName;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    @Column(name = "brand_model")
-    public String getBrandModel() {
-        return brandModel;
-    }
-
-    public void setBrandModel(String brandModel) {
-        this.brandModel = brandModel;
-    }
-
-    @Column(name = "corresponding_vehicle")
-    public String getCorrespondingVehicle() {
-        return correspondingVehicle;
-    }
-
-    public void setCorrespondingVehicle(String correspondingVehicle) {
-        this.correspondingVehicle = correspondingVehicle;
-    }
-
-    @Column(name = "is_delete")
-    public Integer getIsDelete() {
-        return isDelete;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    @Column(name = "created_name")
-    public String getCreatedName() {
-        return createdName;
-    }
-
-    public void setCreatedName(String createdName) {
-        this.createdName = createdName;
-    }
-
-    @Column(name = "updated_name")
-    public String getUpdatedName() {
-        return updatedName;
-    }
-
-    public void setUpdatedName(String updatedName) {
-        this.updatedName = updatedName;
-    }
-
-    @Column(name = "create_time")
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Column(name = "update_time")
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-}

src/main/java/com/qtzl/alterSales/dao/entity/second/AflVehicleBrandInfo.java

@@ -0,0 +1,92 @@
+package com.qtzl.alterSales.dao.entity.second;
+
+
+import cn.com.taiji.common.entity.StringUUIDEntity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Entity
+@Table(name = "AFL_VEHICLE_BRAND_INFO")
+public class AflVehicleBrandInfo extends StringUUIDEntity {
+
+    private String brandModel;
+
+    private String correspondingVehicle;
+
+    private Integer isDelete;
+
+    private String createdName;
+
+    private String updateName;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime upDateTime;
+
+    @Column(name = "BRAND_MODEL")
+    public String getBrandModel() {
+        return brandModel;
+    }
+
+    @Column(name = "CORRESPONDING_VEHICLE")
+    public String getCorrespondingVehicle() {
+        return correspondingVehicle;
+    }
+
+    @Column(name = "IS_DELETE")
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    @Column(name = "CREATED_NAME")
+    public String getCreatedName() {
+        return createdName;
+    }
+
+    @Column(name = "UPDATED_NAME")
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    @Column(name = "CREATE_TIME")
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    @Column(name = "UPDATE_TIME")
+    public LocalDateTime getUpDateTime() {
+        return upDateTime;
+    }
+
+    public void setBrandModel(String brandModel) {
+        this.brandModel = brandModel;
+    }
+
+    public void setCorrespondingVehicle(String correspondingVehicle) {
+        this.correspondingVehicle = correspondingVehicle;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public void setCreatedName(String createdName) {
+        this.createdName = createdName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public void setUpDateTime(LocalDateTime upDateTime) {
+        this.upDateTime = upDateTime;
+    }
+}

src/main/java/com/qtzl/alterSales/dao/repo/jpa/primary/VehicleBrandInfoRepo.java

@@ -1,17 +0,0 @@
-package com.qtzl.alterSales.dao.repo.jpa.primary;
-
-import com.qtzl.alterSales.dao.entity.primary.VehicleBrandInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-
-public interface VehicleBrandInfoRepo extends JpaRepository<VehicleBrandInfo, String>, JpaSpecificationExecutor<VehicleBrandInfo> {
-
-
-    @Query("SELECT COUNT(brandModel) FROM VehicleBrandInfo WHERE brandModel = ?1 AND isDelete = 0")
-    int findBylBrandMode(String brandModel);
-
-    @Query(value = "SELECT COUNT(brand_model) FROM fss_vehicle_brand_info WHERE brand_model = ?1 AND is_delete = 0 AND id != ?2",nativeQuery=true)
-    int findBylBrandModeAndId(String brandModel, String id);
-
-}

src/main/java/com/qtzl/alterSales/dao/repo/jpa/second/VehicleBrandInfoRepo.java

@@ -0,0 +1,17 @@
+package com.qtzl.alterSales.dao.repo.jpa.second;
+
+import com.qtzl.alterSales.dao.entity.second.AflVehicleBrandInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+public interface VehicleBrandInfoRepo extends JpaRepository<AflVehicleBrandInfo, String>, JpaSpecificationExecutor<AflVehicleBrandInfo> {
+
+
+    @Query("SELECT COUNT(brandModel) FROM AflVehicleBrandInfo WHERE brandModel = ?1 AND isDelete = 0")
+    int findBylBrandMode(String brandModel);
+
+    @Query(value = "SELECT COUNT(BRAND_MODEL) FROM AFL_VEHICLE_BRAND_INFO WHERE BRAND_MODEL = ?1 AND IS_DELETE = 0 AND id != ?2",nativeQuery=true)
+    int findBylBrandModeAndId(String brandModel, String id);
+
+}

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/VehicleBrandInfoQueryResponse.java

@@ -1,7 +1,7 @@
 package com.qtzl.alterSales.manager.model.protocol.sales;
 
-import com.qtzl.alterSales.dao.entity.primary.VehicleBrandInfo;
+import com.qtzl.alterSales.dao.entity.second.AflVehicleBrandInfo;
 import com.qtzl.alterSales.manager.model.protocol.AbstractAfterSalesPageResponse;
 
-public class VehicleBrandInfoQueryResponse extends AbstractAfterSalesPageResponse<VehicleBrandInfo> {
+public class VehicleBrandInfoQueryResponse extends AbstractAfterSalesPageResponse<AflVehicleBrandInfo> {
 }

src/main/java/com/qtzl/alterSales/manager/service/VehicleBrandInfoServiceImpl.java

@@ -3,8 +3,8 @@ package com.qtzl.alterSales.manager.service;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import com.google.common.collect.Lists;
-import com.qtzl.alterSales.dao.entity.primary.VehicleBrandInfo;
-import com.qtzl.alterSales.dao.repo.jpa.primary.VehicleBrandInfoRepo;
+import com.qtzl.alterSales.dao.entity.second.AflVehicleBrandInfo;
+import com.qtzl.alterSales.dao.repo.jpa.second.VehicleBrandInfoRepo;
 import com.qtzl.alterSales.manager.model.protocol.NoAttributeResponse;
 import com.qtzl.alterSales.manager.model.protocol.UcServiceError;
 import com.qtzl.alterSales.manager.model.protocol.sales.VehicleBrandInfoQueryRequest;
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.persistence.criteria.Predicate;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
@@ -38,10 +38,10 @@ public class VehicleBrandInfoServiceImpl implements  VehicleBrandInfoService {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该品牌型号已经存在,新增失败");
 //            return new VehicleBrandInfoResponse(2,"该品牌型号已经存在,新增失败").toJson();
         }
-        VehicleBrandInfo vehicleBrandInfo = new VehicleBrandInfo();
+        AflVehicleBrandInfo vehicleBrandInfo = new AflVehicleBrandInfo();
         BeanUtils.copyProperties(request,vehicleBrandInfo);
-        vehicleBrandInfo.setCreateTime(new Date());
-        vehicleBrandInfo.setUpdateTime(new Date());
+        vehicleBrandInfo.setCreateTime(LocalDateTime.now());
+        vehicleBrandInfo.setUpDateTime(LocalDateTime.now());
         try {
             vehicleBrandInfoRepo.save(vehicleBrandInfo);
             return new NoAttributeResponse().toJson();
@@ -57,7 +57,7 @@ public class VehicleBrandInfoServiceImpl implements  VehicleBrandInfoService {
     @Override
     public String find(VehicleBrandInfoQueryRequest request, Logger logger) throws ServiceHandleException {
         try {
-            Page<VehicleBrandInfo> page = select(request);
+            Page<AflVehicleBrandInfo> page = select(request);
             logger.info("选装-查询车型返回参数：{}", page.getContent().toString());
             return toResponse(page, request).toJson();
         } catch (Exception e) {
@@ -71,12 +71,12 @@ public class VehicleBrandInfoServiceImpl implements  VehicleBrandInfoService {
 
     @Override
     public String deleteById(VehicleBrandInfoRequest request, Logger logger) throws ServiceHandleException {
-        VehicleBrandInfo vehicleBrandInfo = vehicleBrandInfoRepo.findById(request.getId()).orElse(null);
+        AflVehicleBrandInfo vehicleBrandInfo = vehicleBrandInfoRepo.findById(request.getId()).orElse(null);
         if (vehicleBrandInfo==null||vehicleBrandInfo.getIsDelete()==1){
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("需要删除的品牌型号不存在,删除失败");
         }
-        vehicleBrandInfo.setUpdatedName(request.getUpdatedName());
-        vehicleBrandInfo.setUpdateTime(new Date());
+        vehicleBrandInfo.setUpdateName(request.getUpdatedName());
+        vehicleBrandInfo.setUpDateTime(LocalDateTime.now());
         vehicleBrandInfo.setIsDelete(1);
         try {
             vehicleBrandInfoRepo.save(vehicleBrandInfo);
@@ -92,7 +92,7 @@ public class VehicleBrandInfoServiceImpl implements  VehicleBrandInfoService {
 
     @Override
     public String update(VehicleBrandInfoRequest request, Logger logger) throws ServiceHandleException {
-        VehicleBrandInfo vehicleBrandInfo = vehicleBrandInfoRepo.findById(request.getId()).orElse(null);
+        AflVehicleBrandInfo vehicleBrandInfo = vehicleBrandInfoRepo.findById(request.getId()).orElse(null);
         if (vehicleBrandInfo==null||vehicleBrandInfo.getIsDelete()==1){
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("需要修改的品牌型号不存在,修改失败");
         }
@@ -102,12 +102,12 @@ public class VehicleBrandInfoServiceImpl implements  VehicleBrandInfoService {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该品牌型号已经存在,修改失败");
         }
 
-        vehicleBrandInfo.setUpdatedName(request.getUpdatedName());
+        vehicleBrandInfo.setUpdateName(request.getUpdatedName());
         vehicleBrandInfo.setCorrespondingVehicle(request.getCorrespondingVehicle());
         if (!StringUtil.isEmpty(request.getBrandModel())){
             vehicleBrandInfo.setBrandModel(request.getBrandModel());
         }
-        vehicleBrandInfo.setUpdateTime(new Date());
+        vehicleBrandInfo.setUpDateTime(LocalDateTime.now());
         try {
             vehicleBrandInfoRepo.save(vehicleBrandInfo);
             return new NoAttributeResponse().toJson();
@@ -120,7 +120,7 @@ public class VehicleBrandInfoServiceImpl implements  VehicleBrandInfoService {
         }
     }
 
-    private VehicleBrandInfoQueryResponse toResponse(Page<VehicleBrandInfo> page, VehicleBrandInfoQueryRequest request) {
+    private VehicleBrandInfoQueryResponse toResponse(Page<AflVehicleBrandInfo> page, VehicleBrandInfoQueryRequest request) {
         final VehicleBrandInfoQueryResponse response = new VehicleBrandInfoQueryResponse();
         response.setCurrentPage(request.getPageNo());
         response.setPageSize(request.getPageSize());
@@ -134,7 +134,7 @@ public class VehicleBrandInfoServiceImpl implements  VehicleBrandInfoService {
         return response;
     }
 
-    private Page<VehicleBrandInfo> select(VehicleBrandInfoQueryRequest request) throws ServiceHandleException {
+    private Page<AflVehicleBrandInfo> select(VehicleBrandInfoQueryRequest request) throws ServiceHandleException {
         if (request.getPageSize() > 100) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请求每页数量过大  " + request.getPageSize());
         }