最新版本541200007

doum

2025-09-11 7298d5354963a88643a543b51b90192dc9fc934c

最新版本541200007

 pda/package.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
{
  "dependencies": {
    "dayjs": "^1.11.13"
  }
}

 server/doc/ÔĄ̂×Ô¶¯¼ÓºÅÊý¾Ý¿â±ä¶¯½Å±¾.md

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@

ALTER TABLE `antaiwuliu`.`platform_group`
MODIFY COLUMN `START_TIME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工作开始时间（HH:mm）' AFTER `SORTNUM`,
MODIFY COLUMN `END_TIME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工作结束时间（HH:mm）' AFTER `START_TIME`,
ADD COLUMN `AUTO_CALL` int NULL COMMENT '是否自动叫号 0否 1是' AFTER `WAIT_CALL_TIME`,
ADD COLUMN `IS_VIRTUAL` int NULL COMMENT '是否虚拟月台 0否 1是' AFTER `AUTO_CALL`,
ADD COLUMN `AUTO_CALL_START_TIME` varchar(100) NULL COMMENT '自动叫号截止时间（HH:mm）' AFTER `IS_VIRTUAL`,
ADD COLUMN `AUTO_CALL_END_TIME` varchar(100) NULL COMMENT '自动叫号截止时间（HH:mm）' AFTER `AUTO_CALL_START_TIME`;

ALTER TABLE `antaiwuliu`.`platform`
ADD COLUMN `TYPE` int NULL COMMENT '类型  0整托盘 1散件' AFTER `LED_CONTENT`;
 

ALTER TABLE `antaiwuliu`.`platform_job`
ADD COLUMN `TAG_VIRTUAL` int NULL COMMENT '是否标记虚拟月台组 0否 1是' AFTER `ORIGIN`,
ADD COLUMN `TAG_VIRTUAL_TIME` datetime NULL COMMENT '标记虚拟月台组时间' AFTER `TAG_VIRTUAL`,
ADD COLUMN `TAG_VIRTUAL_USER` int NULL COMMENT '标记虚拟月台组人员编码' AFTER `TAG_VIRTUAL_TIME`,
ADD COLUMN `CALL_WAY` int NULL COMMENT '叫号方式  0手动叫号 1自动叫号' AFTER `TAG_VIRTUAL_USER`,
ADD COLUMN `URGE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '加急时间' AFTER `CALL_WAY`,
ADD COLUMN `URGE_USER` int NULL DEFAULT NULL COMMENT '加急人员编码' AFTER `URGE_TIME`;

update platform_group set IS_VIRTUAL=0;
update platform_job  set CALL_WAY=0 where CALL_DATE is not null;

 server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      config:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_dev
#        namespace: dev_renkang
        username: nacos
@@ -23,7 +23,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dev_renkang
        namespace: dmvisit
        username: nacos

 server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml

@@ -14,7 +14,7 @@
      username: nacos
      password: Atwl@2024
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.212:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos

 server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      config:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_dev
#        namespace: dev_renkang
        username: nacos
@@ -23,7 +23,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dev_renkang
        namespace: dmvisit_dev
        username: nacos

 server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      config:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_test
        username: nacos
        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_test
        username: nacos
        password: nacos

 server/system_gateway/src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@
#    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
#    username: doumee
#    password: rtjgfEr@&0c0m
    url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.0.211:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Atwl@2024
    password: Doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource


 server/system_gateway/src/main/resources/bootstrap-dev.yml

@@ -1,11 +1,11 @@
spring:
  cloud:
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit_dev
        username: nacos

 server/system_gateway/src/main/resources/bootstrap-self.yml

@@ -1,11 +1,11 @@
spring:
  cloud:
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit_dev
        username: nacos

 server/system_gateway/src/main/resources/bootstrap-test.yml

@@ -1,11 +1,11 @@
spring:
  cloud:
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_test
#        namespace: dev_renkang
        username: nacos

 server/system_gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: system_gateway
  # å®‰å…¨é…ç½®

 server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java

@@ -229,7 +229,7 @@
        try {
            String userInfo = (String) redisTemplate.opsForValue().get(Constants.REDIS_TOKEN_KEY+token);
            claims = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),LoginUserInfo.class);
            refreshToken(token);
            refreshTokenTime(token);
        } catch (Exception e) {
            claims = null;
        }

 server/system_timer/src/main/resources/bootstrap-dev.yml

@@ -12,11 +12,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.212:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
@@ -24,7 +24,7 @@
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_dev
        username: nacos
        password: nacos

 server/system_timer/src/main/resources/bootstrap-pro.yml

@@ -16,7 +16,7 @@
      username: nacos
      password: Atwl@2024
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.212:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos

 server/system_timer/src/main/resources/bootstrap-self.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.212:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
@@ -22,7 +22,7 @@
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_dev
        username: nacos
        password: nacos

 server/system_timer/src/main/resources/bootstrap-test.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.212:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
@@ -22,7 +22,7 @@
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_test
        username: nacos
        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap-dev.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit
        username: nacos
        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap-pro.yml

@@ -14,7 +14,7 @@
      username: nacos
      password: Atwl@2024
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.212:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap-self.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit
        username: nacos
        password: nacos

 server/visits/admin_timer/src/main/resources/bootstrap-test.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_test
        username: nacos
        password: nacos

 server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml

@@ -10,19 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
#        file-extension: yaml
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit_dev
        username: nacos
@@ -32,42 +24,4 @@
  basic:
    enable: true
    username: admin
    password: 111111
# swagger配置
#knife4j:
#  # å¼€å¯å¢žå¼ºé…ç½®
#  enable: true
#  # å¼€å¯ç”Ÿäº§çŽ¯å¢ƒå±è”½
#  # production: true
#  setting:
#    language: zh_cn
#  # è´¦æˆ·å¯†ç 
#  basic:
#    enable: true
#    username: abc
#    password: abc
#
## Api文档信息
## springdoc-openapi é¡¹ç›®é…ç½®
#springdoc:
#  swagger-ui:
#    path: /doc.html
#    tags-sorter: alpha
#    operations-sorter: alpha
#  api-docs:
#    path: /v3/api-docs
#  group-configs:
#    - group: 'default'
#      paths-to-match: '/**'
#  info:
#    title: ${spring.application.name} - API
#    version: 3.0.0
#    description: æŽ¥å£æ–‡æ¡£
#    contact:
#      name: 1
#      url: 1
#      email: 1
#    license:
#      name: Apache 2.0
#      url: https://www.apache.org/licenses/LICENSE-2.0.html

    password: 111111

 server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml

@@ -14,7 +14,7 @@
      username: nacos
      password: Atwl@2024
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos

 server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit_dev
        username: nacos

 server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml

@@ -10,11 +10,11 @@
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.212:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.212:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.212:8848 #配置Nacos地址
        namespace: dmvisit_test
        username: nacos
        password: nacos

 server/visits/dmvisit_admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: visitsAdmin
    # å®‰å…¨é…ç½®

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java

@@ -71,6 +71,9 @@
    @ApiModelProperty(value = "状态 0正常 1禁用", example = "1")
    @ExcelColumn(name="状态 0正常 1禁用")
    private Integer status;
    @ApiModelProperty(value = "类型  0整托盘 1散件", example = "1")
    @ExcelColumn(name="类型  0整托盘 1散件")
    private Integer type;
    @ApiModelProperty(value = "月台状态 0-无车 1-有车 2-超时停靠 3-错误停靠", example = "1")
    @ExcelColumn(name="月台状态 0-无车 1-有车 2-超时停靠 3-错误停靠")
    private Integer platformStatus;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java

@@ -79,6 +79,19 @@
    @ExcelColumn(name="排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "是否自动叫号 0否 1是", example = "1")
    @ExcelColumn(name="是否自动叫号 0否 1是")
    private Integer autoCall;

    @ApiModelProperty(value = "是否虚拟月台 0否 1是", example = "1")
    @ExcelColumn(name="是否虚拟月台 0否 1是")
    private Integer isVirtual;
    @ApiModelProperty(value = "自动叫号截止时间（HH:mm）", example = "1")
    @ExcelColumn(name="自动叫号截止时间（HH:mm）")
    private String autoCallStartTime;
    @ApiModelProperty(value = "自动叫号截止时间（HH:mm）", example = "1")
    @ExcelColumn(name="自动叫号截止时间（HH:mm）")
    private String autoCallEndTime;
    @ApiModelProperty(value = "月台组下的月台")
    @TableField(exist = false)
    private List<Platform> platformList;
@@ -89,6 +102,8 @@
    @ApiModelProperty(value = "作业未完成微信通知接收人员主键多个以,分割")
    private String unFinishNoticeUsers;



    @ApiModelProperty(value = "作业中排队车辆", example = "1")
    @TableField(exist = false)
    private List<PlatformJob> workJobList;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java

@@ -245,6 +245,20 @@
    @ApiModelProperty(value = "签到序号", example = "1")
    private Integer signNum;

    @ApiModelProperty(value = "是否标记虚拟月台组 0否 1是", example = "1")
    private Integer  tagVirtual;
    @ApiModelProperty(value = "标记虚拟月台组时间", example = "1")
    private Date  tagVirtualTime;
    @ApiModelProperty(value = "标记虚拟月台组人员编码", example = "1")
    private Integer  tagVirtualUser;
    @ApiModelProperty(value = "叫号方式  0手动叫号 1自动叫号", example = "1")
    private Integer  callWay;
    @ApiModelProperty(value = "加急时间", example = "1")
    private Date urgeTime;
    @ApiModelProperty(value = "加急人员编码", example = "1")
    private Integer   urgeUser;


    @ApiModelProperty(value = "最新叫号时间")
    @TableField(exist = false)
    private Date newCallDate;

 server/visits/dmvisit_service/src/main/resources/application-dev.yml

@@ -1,12 +1,9 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
#    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
#    username: doumee
#    password: rtjgfEr@&0c0m
    url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.0.211:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Atwl@2024
    password: Doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis: