java/vehicleInspection.git

			@@ -30,7 +30,7 @@
			* @Date 2024/12/17 20:18
			*/
			@RestController
			@RequestMapping("/api/patrolTask")
			@RequestMapping("/base/patrolTask")
			public class PatrolTaskController extends BaseController {

			@Resource
			@@ -119,7 +119,8 @@
			List<Vehicle> list = new ArrayList<>();
			if(null != year){
			for (Vehicle vehicle : vehicleList) {
			if("2".equals(year)){
			String vehicleGpsProtocol = vehicle.getVehicleGpsProtocol();
			if(2023 == year && null != vehicleGpsProtocol && vehicleGpsProtocol.equals("2")){
			list.add(vehicle);
			}
			}
			@@ -137,9 +138,10 @@
			List<Ship> shipList = VideoGateway.getShipList(null, null, null, 0);
			List<Ship> list = new ArrayList<>();
			if(null != year){
			for (Ship vehicle : shipList) {
			if("2".equals(year)){
			list.add(vehicle);
			for (Ship ship : shipList) {
			String vehicleGpsProtocol = ship.getVehicleGpsProtocol();
			if(2023 == year && null != vehicleGpsProtocol && vehicleGpsProtocol.equals("2")){
			list.add(ship);
			}
			}
			}else{

			@@ -50,6 +50,7 @@
			<if test="null != item.status">
			and a.status = #{item.status}
			</if>
			order by a.execution_time desc
			</select>

			@@ -36,23 +36,23 @@


			---
			spring:
			datasource:
			url: jdbc:mysql://127.0.0.1:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
			username: root
			password: 123456
			db-name: guns #用来搜集数据库的所有表
			filters: wall,mergeStat

			#线上环境
			#spring:
			# datasource:
			# url: jdbc:mysql://rm-m5e57gbu0gdv901ub.mysql.rds.aliyuncs.com:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
			# username: vehicleInspection
			# password: SYzt1953123456
			# url: jdbc:mysql://127.0.0.1:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
			# username: root
			# password: 123456
			# db-name: guns #用来搜集数据库的所有表
			# filters: wall,mergeStat

			#线上环境
			spring:
			datasource:
			url: jdbc:mysql://rm-m5e57gbu0gdv901ub.mysql.rds.aliyuncs.com:3306/vehicle_inspection?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
			username: vehicleInspection
			password: SYzt1953123456
			db-name: guns #用来搜集数据库的所有表
			filters: wall,mergeStat


			#多数据源情况的配置
			guns:

	guns-admin/src/main/java/com/stylefeng/guns/modular/api/PatrolTaskController.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TaskDetailMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	guns-admin/src/main/resources/application.yml	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史