pms-parent/pms-global/.gitignore

@@ -1,2 +1,33 @@
HELP.md
target/
/pms-global.iml
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogAspect.java

@@ -48,7 +48,6 @@

    @AfterReturning(pointcut = "@annotation(com.dy.pmsGlobal.aop.Log)", returning = "result")
    public void logAfterReturning(JoinPoint joinPoint, BaseResponse result) {
        log.error(result.toString());
        if(isDevStage != null && !isDevStage.trim().equals("") && isDevStage.trim().equalsIgnoreCase("true")){
            return;
        }
@@ -67,7 +66,7 @@
//                Stream.of(joinPoint.getArgs()).forEach(System.out::println);
//                String args = JSONObject.toJSONString(joinPoint.getArgs());
                //String args1 = Arrays.toString(joinPoint.getArgs());
                logSv.save(user.id,user.name, operationName,ip,result.getCode(),result.getMsg());
                logSv.save(user.id, user.name, operationName,ip, result.getCode(), result.getMsg());
            }
        }catch (Exception e){
            log.error(result.toString());

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoBa/BaUserMapper.java

@@ -1,7 +1,6 @@
package com.dy.pmsGlobal.daoBa;

import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;


 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/QrCodeConstant.java

@@ -12,16 +12,16 @@
    /////////////////////////////////////////////
    //标识编码                                    //
    /////////////////////////////////////////////
    public static final String MarkOk = "102001" ; //确定：执行确定操作，例如提交数据
    public static final String MarkCancel = "102002" ; //取消：取消提交操作
    public static final String MarkRevoke = "102003" ; //撤销：对已提交的设备信息进行撤销
    public static final String MarkUnqualified = "102004" ; //不合格：设备生产过程中发现本工站生产不合格，要求进行维修等处理
    public static final String MarkPreUnqualified = "102005" ; //上位不合格：设备生产过程中发现上位工站生产不合格
    public static final String MarkWaste = "102006" ; //废品：设备生产过程中成为废品，实为废弃了该设备编码和部分配件
    public static final String MarkLogout = "102007" ; //注销：生产作业人员在生产后注销工站绑定
    public static final String MarkQualified = "102008" ; //合格：设备生产过程中本工站生产合格
    public static final String MarkReset = "102009" ; //重置：前端清缓存使用
    public static final String MarkSchedule = "102010" ; //排班表：扫描出排班表
    public static final String MarkOk = TypeMark + "102001" ; //确定：执行确定操作，例如提交数据
    public static final String MarkCancel = TypeMark + "102002" ; //取消：取消提交操作
    public static final String MarkRevoke = TypeMark + "102003" ; //撤销：对已提交的设备信息进行撤销
    public static final String MarkUnqualified = TypeMark + "102004" ; //不合格：设备生产过程中发现本工站生产不合格，要求进行维修等处理
    public static final String MarkPreUnqualified = TypeMark + "102005" ; //上位不合格：设备生产过程中发现上位工站生产不合格
    public static final String MarkWaste = TypeMark + "102006" ; //废品：设备生产过程中成为废品，实为废弃了该设备编码和部分配件
    public static final String MarkLogout = TypeMark + "102007" ; //注销：生产作业人员在生产后注销工站绑定
    public static final String MarkQualified = TypeMark + "102008" ; //合格：设备生产过程中本工站生产合格
    public static final String MarkReset = TypeMark + "102009" ; //重置：前端清缓存使用
    public static final String MarkSchedule = TypeMark + "102010" ; //排班表：扫描出排班表

    public static final int MarkQrCodeWidth = 300 ;
    public static final int MarkQrCodeHeight = 300 ;

 pms-parent/pms-global/src/main/resources/application-global(203·þÎñÆ÷).yml

New file
@@ -0,0 +1,257 @@
pmsGl:
    #本机开发环境：       127.0.0.1:3306
    #测试服务器开发环境：  192.168.40.80:3306
    #云服务203：         127.0.0.1:63306
    mySqlSvUrl: 127.0.0.1:63306
    #本机和测试服务器开发环境：  E:/java/nginx-1.24.0/html/webfiles/
    #云服务203：              D:/apps/pms/nginx-1.24.0/html/webfiles/
    webFileAbsolutePath: D:/apps/pms/nginx-1.24.0/html/webfiles/
    #web文件显示与下载IP
    #本机开发环境：        127.0.0.1
    #测试服务器开发环境：   192.168.40.80
    #云服务203：          8.130.75.203
    webFileIp4Client: 8.130.75.203
    #输出sql日志开关，控制PrintSqlInterceptor拦截器是否加载
    showSqlLog: false
    #是否开发阶段，true或false，开发阶段不进行登录验证及权限验证
    isDev: false
spring:
    devtools:
        livereload:
            enabled: false
        restart:
            enabled: false #禁用热部署
    servlet:
        multipart:
            # å‰ç«¯ä¸Šä¼ æ–‡ä»¶ï¼Œé™åˆ¶å•ä¸ªæ–‡ä»¶çš„大小和限制所有文件的大小
            max-file-size: 500MB
            max-request-size: 5000MB
    main:
        allow-circular-references: true
logging:
    charset:
        console: UTF-8
    config:
        classpath: log4j2.yml
#禁用白标错误页面
server:
    error:
        whitelabel:
            enabled: false
    #servlet配置
    servlet:
        encoding:
            #取消默认的字符集编码
            enabled: true
            #设置强制使用指定字符编码集
            force: true
            #使用的字符编码
            charset: utf-8

#MybatisPlus é…ç½®æ—¥å¿—显示执行SQL
mybatis-plus:
    #匹配sql语句的映射文件的位置，classpath代表在resources下
    mapper-locations: classpath:mapper/*.xml
    #以下两个配置可以省略，在mapper映射文件中配置“@Mapper”也是可以的。
    #使用type-aliases-package中指定entity扫描包路径，让mybatis自动扫描自定义的entity
    #type-aliases-package: com.dy.pmsGlobal.daoBa
    configuration:
        #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #时而输出日志，时而不输出日志
        #log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl ä¸å†åº”用，改为PrintSqlInterceptor拦截器输出sql日志，下面print-sql项配置
        print-sql: ${pmsGl.showSqlLog} # è¾“出sql日志开关，控制PrintSqlInterceptor拦截器是否加载
        #开启驼峰uName自动映射到u_name
        #2023-10-24经实验，下面配置true或false，都能从u_name映射到uName
        #map-underscore-to-camel-case: true
        lazyLoadingEnabled: true # å¼€å¯å»¶æ—¶åŠ è½½å¼€å…³
        aggressiveLazyLoading: false # å°†ç§¯æžåŠ è½½æ”¹ä¸ºæ¶ˆæžåŠ è½½ï¼ˆå³æŒ‰éœ€åŠ è½½ï¼‰ï¼Œé»˜è®¤å€¼æ˜¯false
        lazy-load-trigger-methods: ""  # é˜»æŒ¡ä¸ç›¸å¹²çš„操作触发，实现懒加载
        cache-enabled: true  #打开全局缓存开关（二级环境），默认值是true+
        #default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler

dingtalk:
    robot:
        url: https://oapi.dingtalk.com/robot/send
        access-token: 5004482dce6b24d0e1e655b8e4376a6418cfcebce17ff792d0e68cbb63d6eb5b
        secret: SEC985ad412f35ece68bb239cad88b6fba59b19461dd8d067e80fafa1270d6ab465
    at-all: true
#不进行userToken过滤的URL，@ConfigurationProperties要求tokennofilter中所有字母都小写
tokennofilter:
    urls:
        - /sso/sso
        - /production/schedule/selectAll #查询所有排班,触屏端使用不验证token
pms:
    global:
        dev: ${pmsGl.isDev}   #是否开发阶段，true或false，开发阶段不进行登录验证及权限验证
        ssoUserExpireAfterAccess: 60  #sso登录后，用户在一定时间（ssoUserExpireAfterAccess）（分钟）内未访问系统，系统清除缓存信息，使其重新登录系统
        ssoCacheSizeInit: 10  #sso缓存初始容量
        ssoCacheSizeMax: 10000  #sso缓存最大容量，即支持ssoCacheSizeMax个用户同时登录
    nginx:
        webPort: 8000
    sso:
        checkUrl: http://127.0.0.1:12344/sso/sso/ssoPowerCheck
        curUserUrl: http://127.0.0.1:12344/sso/sso/ssoCurUser
        webPort: 12344
        idSuffix: 1
    base:
        webPort: 12345
        idSuffix: 2
    platform:
        webPort: 12346
        idSuffix: 3
    production:
        webPort: 12347
        idSuffix: 4
    other:
        webPort: 12348
        idSuffix: 5
    station:
        webPort: 12349
        idSuffix: 6
    report:
        webPort: 12350
        idSuffix: 7
    wechat:
        webPort: 12351
        idSuffix: 8
    file:
        idSuffix: 99
    file1:
        webPort: 12380
    file2:
        webPort: 12380
    file3:
        webPort: 12380
    file4:
        webPort: 12380
    file5:
        webPort: 12380
    file6:
        webPort: 12380
    file7:
        webPort: 12380
    file8:
        webPort: 12380
    file9:
        webPort: 12380
    file10:
        webPort: 12380
    file11:
        webPort: 12380
    file12:
        webPort: 12380

#web分布式文件系统
dy:
    webFileAbsolutePath: ${pmsGl.webFileAbsolutePath}
    photoZipWidth: 400 #缩略图尺寸
    webFile:
        fmUrl: http://127.0.0.1:${pms.other.webPort}/other # fm的web上下文 URL
        supportedFileTypes: docx,xlsx,doc,xls,pdf #支持的文档（非媒体文件，如照片、录音、录像）文件类型
        sv1:
            id: dyFile1
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile1
            hashStart: 0
            hashEnd: 5461
            restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file是上下文,ip为局域网ip或本地IP
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file1.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv2:
            id: dyFile2
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile2
            hashStart: 5462
            hashEnd: 10923
            restUrl: http://127.0.0.1:${pms.file2.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file2.webPort}/file/download/down?id=
        sv3:
            id: dyFile3
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile3
            hashStart: 10924
            hashEnd: 16385
            restUrl: http://127.0.0.1:${pms.file3.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file3.webPort}/file/download/down?id=
        sv4:
            id: dyFile4
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile4
            hashStart: 16386
            hashEnd: 21847
            restUrl: http://127.0.0.1:${pms.file4.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file4.webPort}/file/download/down?id=
        sv5:
            id: dyFile5
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile5
            hashStart: 21848
            hashEnd: 27309
            restUrl: http://127.0.0.1:${pms.file5.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file5.webPort}/file/download/down?id=
        sv6:
            id: dyFile6
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile6
            hashStart: 27310
            hashEnd: 32767
            restUrl: http://127.0.0.1:${pms.file6.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file6.webPort}/file/download/down?id=
        sv7:
            id: dyFile7
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile7
            hashStart: 32768
            hashEnd: 38229
            restUrl: http://127.0.0.1:${pms.file7.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file7.webPort}/file/download/down?id=
        sv8:
            id: dyFile8
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile8
            hashStart: 38230
            hashEnd: 43691
            restUrl: http://127.0.0.1:${pms.file8.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file8.webPort}/file/download/down?id=
        sv9:
            id: dyFile9
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile9
            hashStart: 43692
            hashEnd: 49153
            restUrl: http://127.0.0.1:${pms.file9.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file9.webPort}/file/download/down?id=
        sv10:
            id: dyFile10
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile10
            hashStart: 49154
            hashEnd: 54615
            restUrl: http://127.0.0.1:${pms.file10.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file10.webPort}/file/download/down?id=
        sv11:
            id: dyFile11
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile11
            hashStart: 54616
            hashEnd: 60077
            restUrl: http://127.0.0.1:${pms.file11.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file11.webPort}/file/download/down?id=
        sv12:
            id: dyFile12
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile12
            hashStart: 60078
            hashEnd: 65535
            restUrl: http://127.0.0.1:${pms.file12.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file12.webPort}/file/download/down?id=

 pms-parent/pms-global/src/main/resources/application-global(80²âÊÔ·þÎñÆ÷).yml

New file
@@ -0,0 +1,257 @@
pmsGl:
    #本机开发环境：       127.0.0.1:3306
    #测试服务器开发环境：  192.168.40.80:3306
    #云服务203：         127.0.0.1:63306
    mySqlSvUrl: 192.168.40.80:3306
    #本机和测试服务器开发环境：  E:/java/nginx-1.24.0/html/webfiles/
    #云服务203：              D:/apps/pms/nginx-1.24.0/html/webfiles/
    webFileAbsolutePath: E:/java/nginx-1.24.0/html/webfiles/
    #web文件显示与下载IP
    #本机开发环境：        127.0.0.1
    #测试服务器开发环境：   192.168.40.80
    #云服务203：          8.130.75.203
    webFileIp4Client: 192.168.40.80
    #输出sql日志开关，控制PrintSqlInterceptor拦截器是否加载
    showSqlLog: true
    #是否开发阶段，true或false，开发阶段不进行登录验证及权限验证
    isDev: false
spring:
    devtools:
        livereload:
            enabled: false
        restart:
            enabled: false #禁用热部署
    servlet:
        multipart:
            # å‰ç«¯ä¸Šä¼ æ–‡ä»¶ï¼Œé™åˆ¶å•ä¸ªæ–‡ä»¶çš„大小和限制所有文件的大小
            max-file-size: 500MB
            max-request-size: 5000MB
    main:
        allow-circular-references: true
logging:
    charset:
        console: UTF-8
    config:
        classpath: log4j2.yml
#禁用白标错误页面
server:
    error:
        whitelabel:
            enabled: false
    #servlet配置
    servlet:
        encoding:
            #取消默认的字符集编码
            enabled: true
            #设置强制使用指定字符编码集
            force: true
            #使用的字符编码
            charset: utf-8

#MybatisPlus é…ç½®æ—¥å¿—显示执行SQL
mybatis-plus:
    #匹配sql语句的映射文件的位置，classpath代表在resources下
    mapper-locations: classpath:mapper/*.xml
    #以下两个配置可以省略，在mapper映射文件中配置“@Mapper”也是可以的。
    #使用type-aliases-package中指定entity扫描包路径，让mybatis自动扫描自定义的entity
    #type-aliases-package: com.dy.pmsGlobal.daoBa
    configuration:
        #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #时而输出日志，时而不输出日志
        #log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl ä¸å†åº”用，改为PrintSqlInterceptor拦截器输出sql日志，下面print-sql项配置
        print-sql: ${pmsGl.showSqlLog} # è¾“出sql日志开关，控制PrintSqlInterceptor拦截器是否加载
        #开启驼峰uName自动映射到u_name
        #2023-10-24经实验，下面配置true或false，都能从u_name映射到uName
        #map-underscore-to-camel-case: true
        lazyLoadingEnabled: true # å¼€å¯å»¶æ—¶åŠ è½½å¼€å…³
        aggressiveLazyLoading: false # å°†ç§¯æžåŠ è½½æ”¹ä¸ºæ¶ˆæžåŠ è½½ï¼ˆå³æŒ‰éœ€åŠ è½½ï¼‰ï¼Œé»˜è®¤å€¼æ˜¯false
        lazy-load-trigger-methods: ""  # é˜»æŒ¡ä¸ç›¸å¹²çš„操作触发，实现懒加载
        cache-enabled: true  #打开全局缓存开关（二级环境），默认值是true+
        #default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler

dingtalk:
    robot:
        url: https://oapi.dingtalk.com/robot/send
        access-token: 5004482dce6b24d0e1e655b8e4376a6418cfcebce17ff792d0e68cbb63d6eb5b
        secret: SEC985ad412f35ece68bb239cad88b6fba59b19461dd8d067e80fafa1270d6ab465
    at-all: true
#不进行userToken过滤的URL，@ConfigurationProperties要求tokennofilter中所有字母都小写
tokennofilter:
    urls:
        - /sso/sso
        - /production/schedule/selectAll #查询所有排班,触屏端使用不验证token
pms:
    global:
        dev: ${pmsGl.isDev}   #是否开发阶段，true或false，开发阶段不进行登录验证及权限验证
        ssoUserExpireAfterAccess: 60  #sso登录后，用户在一定时间（ssoUserExpireAfterAccess）（分钟）内未访问系统，系统清除缓存信息，使其重新登录系统
        ssoCacheSizeInit: 10  #sso缓存初始容量
        ssoCacheSizeMax: 10000  #sso缓存最大容量，即支持ssoCacheSizeMax个用户同时登录
    nginx:
        webPort: 8000
    sso:
        checkUrl: http://127.0.0.1:12344/sso/sso/ssoPowerCheck
        curUserUrl: http://127.0.0.1:12344/sso/sso/ssoCurUser
        webPort: 12344
        idSuffix: 1
    base:
        webPort: 12345
        idSuffix: 2
    platform:
        webPort: 12346
        idSuffix: 3
    production:
        webPort: 12347
        idSuffix: 4
    other:
        webPort: 12348
        idSuffix: 5
    station:
        webPort: 12349
        idSuffix: 6
    report:
        webPort: 12350
        idSuffix: 7
    wechat:
        webPort: 12351
        idSuffix: 8
    file:
        idSuffix: 99
    file1:
        webPort: 12380
    file2:
        webPort: 12380
    file3:
        webPort: 12380
    file4:
        webPort: 12380
    file5:
        webPort: 12380
    file6:
        webPort: 12380
    file7:
        webPort: 12380
    file8:
        webPort: 12380
    file9:
        webPort: 12380
    file10:
        webPort: 12380
    file11:
        webPort: 12380
    file12:
        webPort: 12380

#web分布式文件系统
dy:
    webFileAbsolutePath: ${pmsGl.webFileAbsolutePath}
    photoZipWidth: 400 #缩略图尺寸
    webFile:
        fmUrl: http://127.0.0.1:${pms.other.webPort}/other # fm的web上下文 URL
        supportedFileTypes: docx,xlsx,doc,xls,pdf #支持的文档（非媒体文件，如照片、录音、录像）文件类型
        sv1:
            id: dyFile1
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile1
            hashStart: 0
            hashEnd: 5461
            restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file是上下文,ip为局域网ip或本地IP
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file1.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv2:
            id: dyFile2
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile2
            hashStart: 5462
            hashEnd: 10923
            restUrl: http://127.0.0.1:${pms.file2.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file2.webPort}/file/download/down?id=
        sv3:
            id: dyFile3
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile3
            hashStart: 10924
            hashEnd: 16385
            restUrl: http://127.0.0.1:${pms.file3.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file3.webPort}/file/download/down?id=
        sv4:
            id: dyFile4
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile4
            hashStart: 16386
            hashEnd: 21847
            restUrl: http://127.0.0.1:${pms.file4.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file4.webPort}/file/download/down?id=
        sv5:
            id: dyFile5
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile5
            hashStart: 21848
            hashEnd: 27309
            restUrl: http://127.0.0.1:${pms.file5.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file5.webPort}/file/download/down?id=
        sv6:
            id: dyFile6
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile6
            hashStart: 27310
            hashEnd: 32767
            restUrl: http://127.0.0.1:${pms.file6.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file6.webPort}/file/download/down?id=
        sv7:
            id: dyFile7
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile7
            hashStart: 32768
            hashEnd: 38229
            restUrl: http://127.0.0.1:${pms.file7.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file7.webPort}/file/download/down?id=
        sv8:
            id: dyFile8
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile8
            hashStart: 38230
            hashEnd: 43691
            restUrl: http://127.0.0.1:${pms.file8.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file8.webPort}/file/download/down?id=
        sv9:
            id: dyFile9
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile9
            hashStart: 43692
            hashEnd: 49153
            restUrl: http://127.0.0.1:${pms.file9.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file9.webPort}/file/download/down?id=
        sv10:
            id: dyFile10
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile10
            hashStart: 49154
            hashEnd: 54615
            restUrl: http://127.0.0.1:${pms.file10.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file10.webPort}/file/download/down?id=
        sv11:
            id: dyFile11
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile11
            hashStart: 54616
            hashEnd: 60077
            restUrl: http://127.0.0.1:${pms.file11.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file11.webPort}/file/download/down?id=
        sv12:
            id: dyFile12
            absolutePath: ${pmsGl.webFileAbsolutePath}
            relativePath: webFile12
            hashStart: 60078
            hashEnd: 65535
            restUrl: http://127.0.0.1:${pms.file12.webPort}/file
            webUrl: http://${pmsGl.webFileIp4Client}:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://${pmsGl.webFileIp4Client}:${pms.file12.webPort}/file/download/down?id=

 pms-parent/pms-global/src/main/resources/application-global.yml

@@ -78,6 +78,7 @@
tokennofilter:
    urls:
        - /sso/sso
        - /production/schedule/selectAll #查询所有排班,触屏端使用不验证token
pms:
    global:
        dev: ${pmsGl.isDev}   #是否开发阶段，true或false，开发阶段不进行登录验证及权限验证

 pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml

@@ -24,18 +24,26 @@
    from ba_log
    where id = #{id,jdbcType=BIGINT}
  </select>
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
  <insert id="insert" parameterType="com.dy.pmsGlobal.pojoBa.BaLog">
    <!--@mbg.generated-->
    insert into ba_log (user_id,user_name, content, ip,code,msg
    insert into ba_log (id, user_id,user_name, content, ip,code,msg
      )
    values (#{userId,jdbcType=BIGINT},#{userName,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
    #{code,jdbcType=VARCHAR},#{msg,jdbcType=VARCHAR}
    values (#{id,jdbcType=BIGINT},
    #{userId,jdbcType=BIGINT},
    #{userName,jdbcType=VARCHAR},
    #{content,jdbcType=VARCHAR},
    #{ip,jdbcType=VARCHAR},
    #{code,jdbcType=VARCHAR},
    #{msg,jdbcType=VARCHAR}
      )
  </insert>
  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
  <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoBa.BaLog">
    <!--@mbg.generated-->
    insert into ba_log
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
        id,
      </if>
      <if test="userId != null">
        user_id,
      </if>
@@ -56,6 +64,9 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="userId != null">
        #{userId,jdbcType=BIGINT},
      </if>

 pms-parent/pms-global/src/main/resources/mapper/MpOpenIdMapper.xml

@@ -39,7 +39,7 @@
        delete from mp_open_id
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoMp.MpOpenId" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoMp.MpOpenId">
        insert into mp_open_id
        ( id,open_id,session_key
        ,nick_name,head_img_url,phone
@@ -50,7 +50,7 @@
        ,#{gender,jdbcType=VARCHAR},#{province,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoMp.MpOpenId" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoMp.MpOpenId">
        insert into mp_open_id
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/OthFileManageMapper.xml

@@ -28,16 +28,19 @@
    delete from oth_file_manage
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoOth.OthFileManage" useGeneratedKeys="true">
  <insert id="insert" parameterType="com.dy.pmsGlobal.pojoOth.OthFileManage">
    <!--@mbg.generated-->
    insert into oth_file_manage (user_id, file_id, deleted, dt)
    values (#{userId,jdbcType=BIGINT}, #{fileId,jdbcType=BIGINT}, #{deleted,jdbcType=TINYINT}, 
    insert into oth_file_manage (id, user_id, file_id, deleted, dt)
    values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT}, #{fileId,jdbcType=BIGINT}, #{deleted,jdbcType=TINYINT},
      #{dt,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoOth.OthFileManage" useGeneratedKeys="true">
  <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoOth.OthFileManage">
    <!--@mbg.generated-->
    insert into oth_file_manage
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
        id,
      </if>
      <if test="userId != null">
        user_id,
      </if>
@@ -52,6 +55,9 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="userId != null">
        #{userId,jdbcType=BIGINT},
      </if>

 pms-parent/pms-global/src/main/resources/mapper/OthStatisticDeviceMapper.xml

@@ -27,17 +27,20 @@
    delete from oth_statistic_device
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoOth.OthStatisticDevice" useGeneratedKeys="true">
  <insert id="insert" parameterType="com.dy.pmsGlobal.pojoOth.OthStatisticDevice">
    <!--@mbg.generated-->
    insert into oth_statistic_device (statistic_date, plan_id, pro_id, 
    insert into oth_statistic_device (id,statistic_date, plan_id, pro_id,
      `number`, dt)
    values (#{statisticDate,jdbcType=VARCHAR}, #{planId,jdbcType=BIGINT}, #{proId,jdbcType=BIGINT}, 
    values (#{id,jdbcType=BIGINT}, #{statisticDate,jdbcType=VARCHAR}, #{planId,jdbcType=BIGINT}, #{proId,jdbcType=BIGINT},
      #{number,jdbcType=INTEGER}, #{dt,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoOth.OthStatisticDevice" useGeneratedKeys="true">
  <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoOth.OthStatisticDevice">
    <!--@mbg.generated-->
    insert into oth_statistic_device
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
        id,
      </if>
      <if test="statisticDate != null">
        statistic_date,
      </if>
@@ -55,6 +58,9 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="statisticDate != null">
        #{statisticDate,jdbcType=VARCHAR},
      </if>

 pms-parent/pms-global/src/main/resources/mapper/OthStatisticWorkloadMapper.xml

@@ -77,7 +77,7 @@
        delete from oth_statistic_workload
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoOth.OthStatisticWorkload" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoOth.OthStatisticWorkload">
        insert into oth_statistic_workload
        ( id,statistic_date,user_id
        ,user_name,type,node_content
@@ -86,7 +86,7 @@
        ,#{userName,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR},#{nodeContent,jdbcType=VARCHAR}
        ,#{number,jdbcType=INTEGER})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoOth.OthStatisticWorkload" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoOth.OthStatisticWorkload">
        insert into oth_statistic_workload
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PltMaterialMapper.xml

@@ -42,7 +42,7 @@
        delete from plt_material
        where  id = #{id,jdbcType=INTEGER} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltMaterial" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPlt.PltMaterial">
        insert into plt_material
        ( id,pro_id,name
        ,type,length,factory
@@ -51,7 +51,7 @@
        ,#{type,jdbcType=VARCHAR},#{length,jdbcType=VARCHAR},#{factory,jdbcType=VARCHAR}
        ,#{deleted,jdbcType=TINYINT},#{remark,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltMaterial" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltMaterial">
        insert into plt_material
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PltProductFileMapper.xml

@@ -36,7 +36,7 @@
      delete from plt_product_file
      where  pro_id = #{proId,jdbcType=BIGINT}
    </delete>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductFile" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductFile">
        insert into plt_product_file
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml

@@ -52,7 +52,7 @@
    where id = #{id,jdbcType=BIGINT}
  </select>

  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProduct" useGeneratedKeys="true">
  <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProduct">
    <!--@mbg.generated-->
    insert into plt_product
    <trim prefix="(" suffix=")" suffixOverrides=",">

 pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml

@@ -36,7 +36,7 @@
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems">
        insert into plt_product_quality_inspection_items
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml

@@ -41,7 +41,7 @@
        where  id = #{id,jdbcType=BIGINT} 
    </delete>

    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
        insert into plt_product_scrapping_reason
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml

@@ -75,7 +75,7 @@
        delete from plt_product_test_inspection_items
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems">
        insert into plt_product_test_inspection_items
        ( id,pro_id,item
        ,deleted,disabled,sort
@@ -84,7 +84,7 @@
        ,#{deleted,jdbcType=TINYINT},#{disabled,jdbcType=TINYINT},#{sort,jdbcType=INTEGER}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems">
        insert into plt_product_test_inspection_items
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml

@@ -28,7 +28,7 @@
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason">
        insert into plt_product_unqualified_reason
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml

@@ -37,7 +37,7 @@
        delete from plt_production_line
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductionLine" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductionLine">
        insert into plt_production_line
        ( id,name,type
        ,factory,director,d_mobile
@@ -48,7 +48,7 @@
        ,#{installTime,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT},#{remark,jdbcType=VARCHAR}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductionLine" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductionLine">
        insert into plt_production_line
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml

@@ -38,7 +38,7 @@
        <include refid="Base_Column_List" />
        from plt_station where name = #{name,jdbcType=VARCHAR} and deleted!=1
    </select>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
        insert into plt_station
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml

@@ -236,8 +236,8 @@
        from pr_assembly_plan
        where id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
            useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
           >
        insert into pr_assembly_plan
        ( id,order_id, pro_id, batch_id
        , process_id, name, number
@@ -251,8 +251,8 @@
               , #{deleted,jdbcType=TINYINT}, #{content,jdbcType=VARCHAR}, #{inputNumber,jdbcType=INTEGER}
               , #{outputNumber,jdbcType=INTEGER})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
            useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan"
           >
        insert into pr_assembly_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml

@@ -33,7 +33,7 @@
        delete from pr_batch_number
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrBatchNumber" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPr.PrBatchNumber">
        insert into pr_batch_number
        ( id,batch_number,pro_id
        ,creator,dt,remark
@@ -42,7 +42,7 @@
        ,#{creator,jdbcType=VARCHAR},#{dt,jdbcType=TIMESTAMP},#{remark,jdbcType=VARCHAR}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrBatchNumber" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrBatchNumber">
        insert into pr_batch_number
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrBillOfMaterialMapper.xml

@@ -44,15 +44,18 @@
      )
    </foreach>
  </insert>
  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrBillOfMaterial" useGeneratedKeys="true">
  <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPr.PrBillOfMaterial">
    <!--@mbg.generated-->
    insert into pr_bill_of_material (node_id, file_id)
    values (#{nodeId,jdbcType=BIGINT}, #{fileId,jdbcType=BIGINT})
    insert into pr_bill_of_material (id, node_id, file_id)
    values (#{id,jdbcType=BIGINT}, #{nodeId,jdbcType=BIGINT}, #{fileId,jdbcType=BIGINT})
  </insert>
  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrBillOfMaterial" useGeneratedKeys="true">
  <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrBillOfMaterial">
    <!--@mbg.generated-->
    insert into pr_bill_of_material
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
        id,
      </if>
      <if test="nodeId != null">
        node_id,
      </if>
@@ -61,6 +64,9 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="nodeId != null">
        #{nodeId,jdbcType=BIGINT},
      </if>

 pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml

@@ -37,7 +37,7 @@
        delete from pr_dev_ops_plan
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevOpsPlan" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPr.PrDevOpsPlan">
        insert into pr_dev_ops_plan
        ( id,name,status,creator,dt
        ,start_date,end_date,deleted
@@ -47,7 +47,7 @@
        ,#{startDate,jdbcType=VARCHAR},#{endDate,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT}
        ,#{content,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevOpsPlan" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrDevOpsPlan">
        insert into pr_dev_ops_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml

@@ -32,14 +32,14 @@
        delete from pr_device
        where  batch_id = #{batchId,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice">
        insert into pr_device
        ( id,pro_id,batch_id
        ,device_no,status)
        values (#{id,jdbcType=BIGINT},#{proId,jdbcType=BIGINT},#{batchId,jdbcType=BIGINT}
        ,#{deviceNo,jdbcType=BIGINT},#{status,jdbcType=TINYINT})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice">
        insert into pr_device
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml

@@ -61,7 +61,7 @@
        #{completeNumber,jdbcType=INTEGER}, #{deleted,jdbcType=TINYINT}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
        insert into pr_order_item
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml

@@ -169,7 +169,7 @@
        update pr_order set deleted = 1
        where id = #{id}
    </update>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder">
        insert into pr_order
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml

@@ -64,7 +64,7 @@
            #{item}
        </foreach>
    </delete>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionNode" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionNode">
        insert into pr_production_node
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml

@@ -75,7 +75,7 @@
        where  id = #{id,jdbcType=BIGINT} 
    </delete>

    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
        insert into pr_production_process
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/PrWorkingInstructionMapper.xml

@@ -38,7 +38,7 @@
            #{item}
        </foreach>
    </delete>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrWorkingInstruction" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrWorkingInstruction">
        insert into pr_working_instruction
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml

@@ -38,7 +38,7 @@
        delete from sta_assembly_work_history
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
        insert into sta_assembly_work_history
        ( id,work_id,user_id,line_id
        ,station_id,plan_id,process_id
@@ -51,7 +51,7 @@
        ,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
        insert into sta_assembly_work_history
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml

@@ -394,8 +394,8 @@
        from sta_assembly_work_last
        where id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast"
            useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast"
           >
        insert into sta_assembly_work_last
        ( id, user_id, line_id
        , station_id, plan_id, process_id
@@ -407,8 +407,8 @@
               , #{status,jdbcType=TINYINT}
               , #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{assistants,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id"
            parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
    <insert id="insertSelective"
            parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
        insert into sta_assembly_work_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml

@@ -28,14 +28,14 @@
        delete from sta_dev_ops_task_claim_info
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
        insert into sta_dev_ops_task_claim_info
        ( id,user_id,plan_id
        ,dt,status)
        values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT}
        ,#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
        insert into sta_dev_ops_task_claim_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml

@@ -67,7 +67,7 @@
        delete from sta_device_last
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
        insert into sta_device_last
        ( id,device_no,work_id
        ,repair_id,plan_id,station_id
@@ -86,7 +86,7 @@
               ,#{inLineTime,jdbcType=TIMESTAMP},#{outLineTime,jdbcType=TIMESTAMP}
               ,#{memo,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
        insert into sta_device_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml

@@ -63,7 +63,7 @@
        delete from sta_device_life_last
        where  id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast">
        insert into sta_device_life_last
        ( id,device_no,work_id
        ,repair_id,plan_id,station_id
@@ -78,7 +78,7 @@
        ,#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT}
        ,#{memo,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast">
        insert into sta_device_life_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml

@@ -64,7 +64,7 @@
        delete from sta_device_life
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
        insert into sta_device_life
        ( id,device_no,work_id
        ,repair_id,plan_id,station_id
@@ -81,7 +81,7 @@
        ,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
        insert into sta_device_life
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml

@@ -122,7 +122,7 @@
        delete from sta_device_production_log
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
        insert into sta_device_production_log
        ( id,device_no,work_id
        ,repair_id,plan_id,station_id
@@ -139,7 +139,7 @@
        ,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}, #{number,jdbcType=INTEGER}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
        insert into sta_device_production_log
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml

@@ -36,7 +36,7 @@
        delete from sta_repair_info
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
        insert into sta_repair_info
        ( id,device_no,work_id
        ,from_node,repair_reason,repair_by
@@ -45,7 +45,7 @@
        ,#{fromNode,jdbcType=BIGINT},#{repairReason,jdbcType=VARCHAR},#{repairBy,jdbcType=BIGINT}
        ,#{repairTime,jdbcType=TIMESTAMP})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
        insert into sta_repair_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml

@@ -42,7 +42,7 @@
        delete from sta_wip_sn_ex
        where  id = #{id,jdbcType=BIGINT} 
    </delete>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
        insert into sta_wip_sn_ex
        ( id,device_no,product_id
        ,product_name,product_no,create_time
@@ -51,7 +51,7 @@
        ,#{productName,jdbcType=VARCHAR},#{productNo,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP}
        ,#{createBy,jdbcType=BIGINT})
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
        insert into sta_wip_sn_ex
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-global/src/main/resources/mapper/TstCommandMapper.xml

@@ -101,7 +101,7 @@
        update tst_command set deleted = 1
        where id = #{id}
    </update>
    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoTst.TstCommand" useGeneratedKeys="true">
    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoTst.TstCommand">
        insert into tst_command
        ( id,pro_id,type
        ,name,value,deleted
@@ -114,7 +114,7 @@
        ,#{dt,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{updatedDate,jdbcType=TIMESTAMP}
        )
    </insert>
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoTst.TstCommand" useGeneratedKeys="true">
    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoTst.TstCommand">
        insert into tst_command
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null">id,</if>

 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java

@@ -267,7 +267,7 @@
                ExcelVo vo = new ExcelVo();
                vo.name = user.name;
                try {
                    vo.qrCode = QrCodeUtil.genQrCode(QrCodeConstant.TypeStation + user.id);
                    vo.qrCode = QrCodeUtil.genQrCode(QrCodeConstant.TypeWorker + user.id);
                } catch (IOException e) {
                    e.printStackTrace();
                } catch (WriterException e) {

 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/config/WebFilterConfiguration.java

@@ -31,6 +31,11 @@
            filterRegistrationBean.setOrder(order_DevStageFilter);//执行次序
        }else{
            filterRegistrationBean.setFilter(new UserTokenFilter());
            filterRegistrationBean.addUrlPatterns("/*");//配置过滤规则
            filterRegistrationBean.setName("UserTokenFilter");//设置过滤器名称
            filterRegistrationBean.setOrder(order_UserTokenFilter);//执行次序
            /*
            filterRegistrationBean.setFilter(new UserTokenFilter());
            filterRegistrationBean.addUrlPatterns("/process/*","/order/*","/assembly/*",
                    "/devOps/*","/workStation/*","/assembly/*",
                    "/schedule/save",
@@ -42,6 +47,7 @@
                    "/schedule/getUserList");//配置过滤规则
            filterRegistrationBean.setName("UserTokenFilter");//设置过滤器名称
            filterRegistrationBean.setOrder(order_UserTokenFilter);//执行次序
            */
        }
        return filterRegistrationBean;
    }

 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java

@@ -72,7 +72,7 @@
     */
    @GetMapping(path="delete")
    @SsoPowerAop(power = "10200009")
    @Log("删除角色信息")
    @Log("删除排班信息")
    public BaseResponse<Boolean> delete(String id){
        long count = sv.delete(Long.parseLong(id));


 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java

@@ -72,7 +72,8 @@
    }
    @Transactional
    public long delete(Long id) {
        return this.scheduleRelDao.deleteByScheduleId(id);
        this.scheduleRelDao.deleteByScheduleId(id);
        return scheduleDao.deleteByPrimaryKey(id);
    }



 pms-parent/pms-web-station/.gitignore

New file
@@ -0,0 +1,33 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/