:fire: 增加local环境，增加多个岗位异常信息，修改交出案件信息返回提示，修改提交岗位记录时的数据修改方式

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record_item/controller/AdminPostRecordItemController.java

@@ -0,0 +1,167 @@
+package org.jeecg.modules.admin_post_record_item.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.admin_post_record_item.entity.AdminPostRecordItem;
+import org.jeecg.modules.admin_post_record_item.service.IAdminPostRecordItemService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 岗位异常信息
+ * @Author: WangBaoQuan
+ * @Date:   2023-07-17
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="岗位异常信息")
+@RestController
+@RequestMapping("/a/adminPostRecordItem")
+public class AdminPostRecordItemController extends JeecgController<AdminPostRecordItem, IAdminPostRecordItemService> {
+	@Autowired
+	private IAdminPostRecordItemService adminPostRecordItemService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param adminPostRecordItem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "岗位异常信息-分页列表查询")
+	@ApiOperation(value="岗位异常信息-分页列表查询", notes="岗位异常信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(AdminPostRecordItem adminPostRecordItem,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<AdminPostRecordItem> queryWrapper = QueryGenerator.initQueryWrapper(adminPostRecordItem, req.getParameterMap());
+		Page<AdminPostRecordItem> page = new Page<AdminPostRecordItem>(pageNo, pageSize);
+		IPage<AdminPostRecordItem> pageList = adminPostRecordItemService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param adminPostRecordItem
+	 * @return
+	 */
+	@AutoLog(value = "岗位异常信息-添加")
+	@ApiOperation(value="岗位异常信息-添加", notes="岗位异常信息-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody AdminPostRecordItem adminPostRecordItem) {
+		adminPostRecordItemService.save(adminPostRecordItem);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param adminPostRecordItem
+	 * @return
+	 */
+	@AutoLog(value = "岗位异常信息-编辑")
+	@ApiOperation(value="岗位异常信息-编辑", notes="岗位异常信息-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<?> edit(@RequestBody AdminPostRecordItem adminPostRecordItem) {
+		adminPostRecordItemService.updateById(adminPostRecordItem);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "岗位异常信息-通过id删除")
+	@ApiOperation(value="岗位异常信息-通过id删除", notes="岗位异常信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		adminPostRecordItemService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "岗位异常信息-批量删除")
+	@ApiOperation(value="岗位异常信息-批量删除", notes="岗位异常信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.adminPostRecordItemService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功！");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "岗位异常信息-通过id查询")
+	@ApiOperation(value="岗位异常信息-通过id查询", notes="岗位异常信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		AdminPostRecordItem adminPostRecordItem = adminPostRecordItemService.getById(id);
+		return Result.OK(adminPostRecordItem);
+	}
+
+  /**
+   * 导出excel
+   *
+   * @param request
+   * @param adminPostRecordItem
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, AdminPostRecordItem adminPostRecordItem) {
+      return super.exportXls(request, adminPostRecordItem, AdminPostRecordItem.class, "岗位异常信息");
+  }
+
+  /**
+   * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      return super.importExcel(request, response, AdminPostRecordItem.class);
+  }
+
+}

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record_item/entity/AdminPostRecordItem.java

@@ -0,0 +1,67 @@
+package org.jeecg.modules.admin_post_record_item.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 岗位异常信息
+ * @Author: WangBaoQuan
+ * @Date:   2023-07-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("admin_post_record_item")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="admin_post_record_item对象", description="岗位异常信息")
+public class AdminPostRecordItem {
+    
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+	private java.lang.Integer id;
+	/**admin_post_record.id*/
+	@Excel(name = "admin_post_record.id", width = 15)
+    @ApiModelProperty(value = "admin_post_record.id")
+	private java.lang.String mainId;
+	/**提交人*/
+	@Excel(name = "提交人", width = 15)
+    @ApiModelProperty(value = "提交人")
+	private java.lang.String submitter;
+	/**测试状态*/
+	@Excel(name = "测试状态", width = 15)
+    @ApiModelProperty(value = "测试状态")
+	private java.lang.String testType;
+	/**测试内容*/
+	@Excel(name = "测试内容", width = 15)
+    @ApiModelProperty(value = "测试内容")
+	private java.lang.Object testContent;
+	/**测试图片*/
+	@Excel(name = "测试图片", width = 15)
+    @ApiModelProperty(value = "测试图片")
+	private java.lang.String testPic;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+	private java.util.Date createTime;
+	/**修改时间*/
+	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+	private java.util.Date updateTime;
+}

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record_item/mapper/AdminPostRecordItemMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.admin_post_record_item.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.admin_post_record_item.entity.AdminPostRecordItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 岗位异常信息
+ * @Author: WangBaoQuan
+ * @Date:   2023-07-17
+ * @Version: V1.0
+ */
+public interface AdminPostRecordItemMapper extends BaseMapper<AdminPostRecordItem> {
+
+}

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record_item/mapper/xml/AdminPostRecordItemMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.admin_post_record_item.mapper.AdminPostRecordItemMapper">
+
+</mapper>

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record_item/service/IAdminPostRecordItemService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.admin_post_record_item.service;
+
+import org.jeecg.modules.admin_post_record_item.entity.AdminPostRecordItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 岗位异常信息
+ * @Author: WangBaoQuan
+ * @Date:   2023-07-17
+ * @Version: V1.0
+ */
+public interface IAdminPostRecordItemService extends IService<AdminPostRecordItem> {
+
+}

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_post_record_item/service/impl/AdminPostRecordItemServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.admin_post_record_item.service.impl;
+
+import org.jeecg.modules.admin_post_record_item.entity.AdminPostRecordItem;
+import org.jeecg.modules.admin_post_record_item.mapper.AdminPostRecordItemMapper;
+import org.jeecg.modules.admin_post_record_item.service.IAdminPostRecordItemService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 岗位异常信息
+ * @Author: WangBaoQuan
+ * @Date:   2023-07-17
+ * @Version: V1.0
+ */
+@Service
+public class AdminPostRecordItemServiceImpl extends ServiceImpl<AdminPostRecordItemMapper, AdminPostRecordItem> implements IAdminPostRecordItemService {
+
+}

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/APIController.java

@@ -16,6 +16,7 @@ import okhttp3.Response;
 import org.checkerframework.checker.units.qual.A;
 import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.base.BaseMap;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
@@ -41,6 +42,8 @@ import org.jeecg.modules.admin_order.service.IAdminOrderExamineService;
 import org.jeecg.modules.admin_order.service.IAdminOrderService;
 import org.jeecg.modules.admin_post_record.entity.AdminPostRecord;
 import org.jeecg.modules.admin_post_record.service.IAdminPostRecordService;
+import org.jeecg.modules.admin_post_record_item.entity.AdminPostRecordItem;
+import org.jeecg.modules.admin_post_record_item.service.IAdminPostRecordItemService;
 import org.jeecg.modules.admin_security_check.entity.AdminSecurityCheck;
 import org.jeecg.modules.admin_security_check.entity.AdminSecurityCheckPic;
 import org.jeecg.modules.admin_security_check.service.IAdminSecurityCheckPicService;
@@ -106,6 +109,8 @@ public class APIController {
     private IAdminInspectionItems2Service adminInspectionItems2Service;
     @Autowired
     private IAdminEditMessageService adminEditMessageService;
+    @Autowired
+    private IAdminPostRecordItemService adminPostRecordItemService;
 
     @PostMapping(value = "/sredis")
     public void sredis(@RequestBody String str) {
@@ -741,6 +746,54 @@ public class APIController {
         }
     }
 
+    /**
+     * 添加
+     *
+     * @param adminPostRecordItem
+     * @return
+     */
+    @AutoLog(value = "岗位异常信息-添加")
+    @ApiOperation(value="岗位异常信息-添加", notes="岗位异常信息-添加")
+    @PostMapping(value = "/addAdminPostRecordItem")
+    public Result<?> add(@RequestHeader("Authorization") String Authorization, @RequestBody AdminPostRecordItem adminPostRecordItem) {
+        Result<AdminPostRecordItem> result = new Result<AdminPostRecordItem>();
+        result.setCode(200);
+        if (Authorization.equals("")) {
+            result.setMessage("token不能为空");
+            return result;
+        }
+
+        String name = JwtUtil.getUsername(Authorization);
+
+        //校验token==================
+        if (!redisUtil.hasKey(CommonConstant.PREFIX_NFT_USER_TOKEN + name)) {
+            result.setMessage("TOKEN失效");
+            result.setCode(201);
+            return result;
+        }
+        //1. 校验用户是否有效
+        //update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
+        QueryWrapper<AdminUserStaff> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", name);
+        AdminUserStaff one = adminUserStaffService.getOne(queryWrapper);
+        if (one == null) {
+            result.setMessage("token校验该用户不存在");
+            baseCommonService.addLog("用户校验失败，用户不存在！", CommonConstant.LOG_TYPE_1, null);
+            return result;
+        }
+        if(Strings.isNullOrEmpty(adminPostRecordItem.getMainId())) {
+            result.setMessage("岗位id不能为空");
+            return result;
+        }
+        if(Strings.isNullOrEmpty(adminPostRecordItem.getTestType())) {
+            result.setMessage("状态不能为空");
+            return result;
+        }
+        adminPostRecordItem.setSubmitter(name);
+        adminPostRecordItemService.save(adminPostRecordItem);
+        return Result.OK("添加成功！");
+    }
+
     @ApiOperation(value = "查询这个人在这个机位上是否提交到岗", notes = "查询这个人在这个机位上是否提交到岗")
     @PostMapping(value = "/beOnDutyRrNot/{aircraftNum}")
     public Result<AdminPostRecord> beOnDutyRrNot(@RequestHeader("Authorization") String Authorization, @PathVariable String aircraftNum) {
@@ -911,16 +964,18 @@ public class APIController {
 
             adminAircraftPositionService.updateById(byId);
 
-            AdminPostRecord adminPostRecord2 = new AdminPostRecord();
-//            adminPostRecord2.setId( adminPostRecord.getId() );
-            adminPostRecord2.setId(one1.getId());
-            adminPostRecord2.setTestType(adminPostRecord.getTestType());
-            adminPostRecord2.setTestContent(adminPostRecord.getTestContent());
-            adminPostRecord2.setTestPic(adminPostRecord.getTestPic());
-            adminPostRecord2.setSignaturePic(adminPostRecord.getSignaturePic());
-            adminPostRecord2.setRemark(adminPostRecord.getRemark());
-            adminPostRecord2.setBeonDutyorNot(2);
-            adminPostRecordService.updateById(adminPostRecord2);
+//            AdminPostRecord adminPostRecord2 = new AdminPostRecord();
+////            adminPostRecord2.setId( adminPostRecord.getId() );
+//            adminPostRecord2.setId(one1.getId());
+//            adminPostRecord2.setTestType(adminPostRecord.getTestType());
+//            adminPostRecord2.setTestContent(adminPostRecord.getTestContent());
+//            adminPostRecord2.setTestPic(adminPostRecord.getTestPic());
+//            adminPostRecord2.setSignaturePic(adminPostRecord.getSignaturePic());
+//            adminPostRecord2.setRemark(adminPostRecord.getRemark());
+//            adminPostRecord2.setBeonDutyorNot(2);
+            adminPostRecord.setId(one1.getId());
+            adminPostRecord.setBeonDutyorNot(2);
+            adminPostRecordService.updateById(adminPostRecord);
             result.setMessage("提交岗位记录成功");
             result.setResult("提交岗位记录成功");
             result.setCode(200);
@@ -1350,7 +1405,8 @@ public class APIController {
         QueryWrapper<AdminAircraftPosition> adminAircaftQueryWarpper = new QueryWrapper<AdminAircraftPosition>();
         adminAircaftQueryWarpper.eq("aircraft_position_num", adminOrder.getAircraftPositionNum())
                 .eq("aircraft_num", adminOrder.getAircraftNum())
-                .eq("drop_time", adminOrder.getDropTime())
+                //.eq("drop_time", adminOrder.getDropTime())
+                .eq("flight_sole", adminOrder.getFlightSole())
                 .eq("flight_num",adminOrder.getFlightNum())
         ;
         AdminAircraftPosition adminAircraftPosition = adminAircraftPositionService.getOne(adminAircaftQueryWarpper);
@@ -1600,6 +1656,8 @@ public class APIController {
 //                adminSecurityCheck.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
 //                adminSecurityCheck.setFlightNum( adminOrderExamine.getFlightNum() );
                 adminSecurityCheckService.updateById(adminSecurityCheck);
+                result.setMessage("交出成功");
+                result.setResult("交出成功");
             }
             if (adminOrderExamine.getJiaochuOrJieshou().equals("接收")) {
                 AdminOrder adminOrder = new AdminOrder();
@@ -1619,9 +1677,9 @@ public class APIController {
 //                adminSecurityCheck.setAircraftPositionNum( adminOrderExamine.getAircraftPositionNum() );
 //                adminSecurityCheck.setFlightNum( adminOrderExamine.getFlightNum() );
                 adminSecurityCheckService.updateById(adminSecurityCheck);
+                result.setMessage("接收成功");
+                result.setResult("接收成功");
             }
-            result.setMessage("提交交出安检信息成功");
-            result.setResult("提交交出安检信息成功");
             result.setCode(200);
             return result;
         } catch (Exception e) {

airport/jeecg-boot-module-system/src/main/resources/application-local.yml

@@ -0,0 +1,397 @@
+server:
+  port: 9999
+  tomcat:
+    max-swallow-size: -1
+  error:
+    include-exception: true
+    include-stacktrace: ALWAYS
+    include-message: ALWAYS
+  servlet:
+#    context-path: /jeecg-boot
+    context-path:
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: metrics,httptrace
+
+airport:
+  mq:
+    msgHandlerEvent: true
+
+spring:
+#  thymeleaf:
+#    cache: false
+#    prefix: classpath:/templates/
+#    suffix: .html
+#    mode: HTML
+#    encoding: UTF-8
+  # 配置RabbitMQ服务器>>>>>>单机配置
+  rabbitmq:
+    host: 120.79.86.50
+    port: 5672
+    username: zl
+    password: 123456
+    virtual-host: /
+    listener: #开启消费者确认机制
+      simple:
+        # 每次从RabbitMQ获取的消息数量
+        prefetch: 1
+        default-requeue-rejected: false
+        # 每个队列启动的消费者数量
+        concurrency: 1
+        # 每个队列最大的消费者数量
+        max-concurrency: 1
+        # 签收模式为手动签收-那么需要在代码中手动ACK，消息确认方式，其有三种配置方式，分别是none、manual(手动ack) 和auto(自动ack) 默认auto
+        acknowledge-mode: manual
+        retry:
+          enabled: true # 消费者是否支持重试
+          max-attempts: 3 #重试最大次数
+          max-interval: 3000ms #最大重试间隔时间
+          initial-interval: 2000ms #重试间隔时间
+    # 配置RabbitMQ服务器>>>>>>集群配置
+    #  rabbitmq:
+    #    addresses: localhost:5671,localhost:5672,localhost:5673
+    #    username: guest
+    #    password: guest
+    #    virtual-host: /
+    #    listener: #开启消费者确认机制
+    #      simple:
+    #        # 每次从RabbitMQ获取的消息数量
+    #        prefetch: 1
+    #        default-requeue-rejected: false
+    #        # 每个队列启动的消费者数量
+    #        concurrency: 1
+    #        # 每个队列最大的消费者数量
+    #        max-concurrency: 1
+    #        # 签收模式为手动签收-那么需要在代码中手动ACK，消息确认方式，其有三种配置方式，分别是none、manual(手动ack) 和auto(自动ack) 默认auto
+    #        acknowledge-mode: manual
+    #        retry:
+    #          enabled: true # 消费者是否支持重试
+    #          max-attempts: 3 #重试最大次数
+    #          max-interval: 3000ms #最大重试间隔时间
+    #          initial-interval: 2000ms #重试间隔时间
+
+
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
+  mail:
+    host: smtp.163.com
+    username: jeecgos@163.com
+    password: ??
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+            required: true
+  ## quartz定时任务,采用数据库方式
+  quartz:
+    job-store-type: jdbc
+    initialize-schema: embedded
+    #定时任务启动开关，true-开  false-关
+    auto-startup: true
+    #启动时更新己存在的Job
+    overwrite-existing-jobs: true
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceName: MyScheduler
+            instanceId: AUTO
+          jobStore:
+            class: org.quartz.impl.jdbcjobstore.JobStoreTX
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            tablePrefix: QRTZ_
+            isClustered: true
+            misfireThreshold: 60000
+            clusterCheckinInterval: 10000
+            selectWithLockSQL: SELECT* FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            threadsInheritContextClassLoaderOfInitializingThread: true
+  #json 时间戳统一转换
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  jpa:
+    open-in-view: false
+  #    database-platform: org.hibernate.dialect.SQLServerDialect
+  activiti:
+    check-process-definitions: false
+    #启用作业执行器
+    async-executor-activate: false
+    #启用异步执行器
+    job-executor-activate: false
+  aop:
+    proxy-target-class: true
+  #配置freemarker
+  freemarker:
+    # 设置模板后缀名
+    suffix: .ftl
+    # 设置文档类型
+    content-type: text/html
+    # 设置页面编码格式
+    charset: UTF-8
+    # 设置页面缓存
+    cache: false
+    prefer-file-system-access: false
+    # 设置ftl文件路径
+    template-loader-path:
+      - classpath:/templates
+  # 设置静态文件路径，js,css等
+  mvc:
+    static-path-pattern: /**
+  resource:
+    static-locations: classpath:/static/,classpath:/public/
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+        allow:
+      web-stat-filter:
+        enabled: false
+    dynamic:
+      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+        # 连接池的配置信息
+        # 初始化大小，最小，最大
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,slf4j
+        #          filters: stat,wall,slf4j
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/airport?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: root
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          # 多数据源配置
+  #        multi-datasource1:
+  #          url: jdbc:mysql://rm-hp3e7229635pu7ktn2o.mysql.huhehaote.rds.aliyuncs.com:3306/javacc?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+  #          username: chuangchi
+  #          password: ChuangChi@2022!@#
+  #          driver-class-name: com.mysql.cj.jdbc.Driver
+  #redis 配置
+  redis:
+    database: 6
+    host: 120.79.86.50
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: 'hdl2022'
+    port: 6379
+#  redis:
+#    database: 0
+#    host: 127.0.0.1
+#    lettuce:
+#      pool:
+#        max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
+#        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+#        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+#        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+#      shutdown-timeout: 100ms
+#    password: '1805845723'
+#    port: 6379
+#mybatis plus 设置
+mybatis-plus:
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
+  global-config:
+    # 关闭MP3.0自带的banner
+    banner: false
+    db-config:
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
+      id-type: ASSIGN_ID
+      # 默认数据库表下划线命名
+      table-underline: true
+  configuration:
+    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 返回类型为Map,显示null对应的字段
+    call-setters-on-nulls: true
+#jeecg专用配置
+minidao:
+  base-package: org.jeecg.modules.jmreport.*
+  #DB类型（mysql | postgresql | oracle | sqlserver| other）
+  db-type: mysql
+jeecg:
+  # 是否启用安全模式
+  safeMode: false
+  # 签名密钥串(前后端要一致，正式发布请自行修改)
+  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
+  # 本地：local\Minio：minio\阿里云：alioss
+  uploadType: local
+  path:
+    #文件上传根目录 设置
+    upload: /usr/java/AJeecgBootFiles
+    #    upload: D:\\AJeecgBootFiles
+    #webapp文件路径
+    webapp: /usr/java/AJeecgBootFiles
+  #    webapp: D:\\AJeecgBootFiles
+  shiro:
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+  #阿里云oss存储和大鱼短信秘钥配置
+  oss:
+    accessKey:
+    secretKey:
+    endpoint:
+    bucketName:
+
+  # ElasticSearch 6设置
+  elasticsearch:
+    cluster-name: jeecg-ES
+    cluster-nodes: 127.0.0.1:9200
+    check-enabled: false
+  # 表单设计器配置
+  desform:
+    # 主题颜色（仅支持 16进制颜色代码）
+    theme-color: "#1890ff"
+    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
+    upload-type: system
+    map:
+      # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
+      baidu: ??
+  # 在线预览文件服务器地址配置
+  file-view-domain: 127.0.0.1:8012
+  # minio文件上传
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: otatest
+  #大屏报表参数设置
+  jmreport:
+    mode: dev
+    #数据字典是否进行saas数据隔离，自己看自己的字典
+    saas: false
+    #是否需要校验token
+    is_verify_token: true
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
+  #Wps在线文档
+  wps:
+    domain: https://wwo.wps.cn/office/
+    appid: ??
+    appsecret: ??
+  #xxl-job配置
+  xxljob:
+    enabled: false
+    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+    appname: ${spring.application.name}
+    accessToken: ''
+    address: 127.0.0.1:30007
+    ip: 127.0.0.1
+    port: 30007
+    logPath: logs/jeecg/job/jobhandler/
+    logRetentionDays: 30
+  route:
+    config:
+      data-id: jeecg-gateway-router
+      group: DEFAULT_GROUP
+      #自定义路由配置 yml nacos database
+      data-type: database
+  #分布式锁配置
+  redisson:
+    address: 127.0.0.1:6379
+    password: '1805845723'
+    type: STANDALONE
+    enabled: true
+#cas单点登录
+cas:
+  prefixUrl: http://cas.example.org:8443/cas
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules.system.mapper: info
+#swagger
+knife4j:
+  #开启增强配置
+  enable: true
+  #开启生产环境屏蔽
+  production: false
+  basic:
+    enable: false
+    username: jeecg
+    password: jeecg1314
+#第三方登录
+justauth:
+  enabled: true
+  type:
+    GITHUB:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
+    WECHAT_ENTERPRISE:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+      agent-id: ??
+    DINGTALK:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
+    WECHAT_OPEN:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
+  cache:
+    type: default
+    prefix: 'demo::'
+    timeout: 1h
+#第三方APP对接
+third-app:
+  enabled: false
+  type:
+    #企业微信
+    WECHAT_ENTERPRISE:
+      enabled: false
+      #CORP_ID
+      client-id: ??
+      #SECRET
+      client-secret: ??
+      #自建应用id
+      agent-id: ??
+      #自建应用秘钥（新版企微需要配置）
+      # agent-app-secret: ??
+    #钉钉
+    DINGTALK:
+      enabled: false
+      # appKey
+      client-id: ??
+      # appSecret
+      client-secret: ??
+      agent-id: ??

airport/pom.xml

@@ -428,5 +428,27 @@
                 <discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
             </properties>
         </profile>
+		<!-- 本地 -->
+		<profile>
+			<id>local</id>
+			<properties>
+				<!--当前环境,生产环境为空-->
+				<profile.name>local</profile.name>
+				<!--配置文件前缀-->
+				<prefix.name>jeecg</prefix.name>
+				<!--Nacos配置中心地址-->
+				<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
+				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
+				<config.namespace></config.namespace>
+				<!--Nacos用户名-->
+				<config.username>nacos</config.username>
+				<!--Nacos密码-->
+				<config.password>nacos</config.password>
+				<!--Nacos配置分组名称-->
+				<config.group>DEFAULT_GROUP</config.group>
+				<!--Nacos服务发现地址-->
+				<discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
+			</properties>
+		</profile>
     </profiles>
 </project>