微调

src/main/java/org/springblade/modules/system/excel/CableExcel.java

@@ -37,9 +37,12 @@ import java.io.Serializable;
 public class CableExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	@ExcelProperty("船号")
+	@ExcelProperty("产品编号")
 	private String shipNo;
 
+	@ExcelProperty(value = "标签")
+	private String label;
+
 	@ExcelProperty("图号")
 	private String pictureNo;
 
@@ -105,8 +108,6 @@ public class CableExcel implements Serializable {
 
 	@ExcelProperty(value = "备注")
 	private String remark;
-/*
-	@ExcelProperty(value = "标签")
-	private String label;*/
+
 
 }

src/main/java/org/springblade/ship/cable/controller/CableController.java

@@ -89,6 +89,7 @@ public class CableController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入cable")
 	public R<IPage<CableVO>> list(CableVO cable, Query query) {
 		QueryWrapper<Cable> queryWrapper = Condition.getQueryWrapper(cable);
+		queryWrapper.lambda().orderByDesc(Cable::getCreateTime);
 		if (cable.getCreateTimeBegin() != null && cable.getCreateTimeEnd() != null){
 			queryWrapper.lambda().between(Cable::getCreateTime, cable.getCreateTimeBegin(), cable.getCreateTimeEnd());
 		}

src/main/java/org/springblade/ship/device/controller/DeviceController.java

@@ -16,25 +16,24 @@
  */
 package org.springblade.ship.device.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.ship.device.entity.Device;
+import org.springblade.ship.device.service.IDeviceService;
 import org.springblade.ship.device.vo.DeviceVO;
 import org.springblade.ship.device.wrapper.DeviceWrapper;
-import org.springblade.ship.device.service.IDeviceService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  *  控制器
@@ -68,7 +67,7 @@ public class DeviceController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入device")
 	public R<IPage<DeviceVO>> list(Device device, Query query) {
-		IPage<Device> pages = deviceService.page(Condition.getPage(query), Condition.getQueryWrapper(device));
+		IPage<Device> pages = deviceService.page(Condition.getPage(query), Condition.getQueryWrapper(device).lambda().orderByDesc(Device::getCreateTime));
 		return R.data(DeviceWrapper.build().pageVO(pages));
 	}
 

src/main/java/org/springblade/ship/ship/controller/ShipController.java

@@ -16,25 +16,24 @@
  */
 package org.springblade.ship.ship.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.ship.ship.entity.Ship;
+import org.springblade.ship.ship.service.IShipService;
 import org.springblade.ship.ship.vo.ShipVO;
 import org.springblade.ship.ship.wrapper.ShipWrapper;
-import org.springblade.ship.ship.service.IShipService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  *  控制器
@@ -62,19 +61,19 @@ public class ShipController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入ship")
 	public R<IPage<ShipVO>> list(Ship ship, Query query) {
-		IPage<Ship> pages = shipService.page(Condition.getPage(query), Condition.getQueryWrapper(ship));
+		IPage<Ship> pages = shipService.page(Condition.getPage(query), Condition.getQueryWrapper(ship).lambda().orderByDesc(Ship::getCreateTime));
 		return R.data(ShipWrapper.build().pageVO(pages));
 	}
 
 
 	/**
-	 * 自定义分页 
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +84,7 @@ public class ShipController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +94,7 @@ public class ShipController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +104,7 @@ public class ShipController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -114,9 +113,9 @@ public class ShipController extends BladeController {
 		return R.status(shipService.saveOrUpdate(ship));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -125,5 +124,5 @@ public class ShipController extends BladeController {
 		return R.status(shipService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

src/main/java/org/springblade/ship/shipyard/controller/ShipyardController.java

@@ -16,25 +16,24 @@
  */
 package org.springblade.ship.shipyard.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.ship.shipyard.entity.Shipyard;
+import org.springblade.ship.shipyard.service.IShipyardService;
 import org.springblade.ship.shipyard.vo.ShipyardVO;
 import org.springblade.ship.shipyard.wrapper.ShipyardWrapper;
-import org.springblade.ship.shipyard.service.IShipyardService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  *  控制器
@@ -62,19 +61,19 @@ public class ShipyardController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入shipyard")
 	public R<IPage<ShipyardVO>> list(Shipyard shipyard, Query query) {
-		IPage<Shipyard> pages = shipyardService.page(Condition.getPage(query), Condition.getQueryWrapper(shipyard));
+		IPage<Shipyard> pages = shipyardService.page(Condition.getPage(query), Condition.getQueryWrapper(shipyard).lambda().orderByDesc(Shipyard::getCreateTime));
 		return R.data(ShipyardWrapper.build().pageVO(pages));
 	}
 
 
 	/**
-	 * 自定义分页 
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +84,7 @@ public class ShipyardController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +94,7 @@ public class ShipyardController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +104,7 @@ public class ShipyardController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -114,9 +113,9 @@ public class ShipyardController extends BladeController {
 		return R.status(shipyardService.saveOrUpdate(shipyard));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -125,5 +124,5 @@ public class ShipyardController extends BladeController {
 		return R.status(shipyardService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     host: 127.0.0.1
     port: 6379
     password:
-    database: 0
+    database: 3
     ssl: false
     ##redis 集群环境配置
     #cluster:

src/main/resources/application-test.yml

@@ -7,16 +7,16 @@ spring:
     host: 127.0.0.1
     port: 6379
     password:
-    database: 0
+    database: 3
     ssl: false
     ##redis 集群环境配置
     #cluster:
     #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
     #  commandTimeout: 5000
   datasource:
-    url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.1.218:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: root@123456
 
 #第三方登陆
 social: