刘小明
2024-08-09 552463e8591adc13ad6df1f4ab8d2284c7a591aa
mapper 及xml整理
5个文件已修改
67 ■■■■ 已修改文件
pms-parent/pms-global/src/main/resources/application-database.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/application-global.yml 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/privileges-config.xml 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/config/AppStartupRunner.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/application-database.yml
@@ -3,7 +3,7 @@
    datasource: #配置数据源
        type: com.alibaba.druid.pool.DruidDataSource
        driver-class-name: com.mysql.cj.jdbc.Driver
        url: jdbc:mysql://192.168.40.80:3306/pms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
        url: jdbc:mysql://8.130.75.203:3306/pms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
        username: root
        password: dysql,;.abc!@#
        druid:
pms-parent/pms-global/src/main/resources/application-global.yml
@@ -32,8 +32,8 @@
    #使用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
        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #时而输出日志,时而不输出日志
#        log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl
        #开启驼峰uName自动映射到u_name
        #2023-10-24经实验,下面配置true或false,都能从u_name映射到uName
        #map-underscore-to-camel-case: true
@@ -114,7 +114,7 @@
        supportedFileTypes: docx,xlsx,pdf
        sv1:
            id: dyFile1
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile1
            hashStart: 0
            hashEnd: 5461
@@ -123,7 +123,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file1.webPort}/file/download/down?id= #安装部署时IP改成外网IP或域名
        sv2:
            id: dyFile2
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile2
            hashStart: 5462
            hashEnd: 10923
@@ -132,7 +132,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file2.webPort}/file/download/down?id=
        sv3:
            id: dyFile3
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile3
            hashStart: 10924
            hashEnd: 16385
@@ -141,7 +141,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file3.webPort}/file/download/down?id=
        sv4:
            id: dyFile4
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile4
            hashStart: 16386
            hashEnd: 21847
@@ -150,7 +150,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file4.webPort}/file/download/down?id=
        sv5:
            id: dyFile5
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile5
            hashStart: 21848
            hashEnd: 27309
@@ -159,7 +159,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file5.webPort}/file/download/down?id=
        sv6:
            id: dyFile6
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile6
            hashStart: 27310
            hashEnd: 32767
@@ -168,7 +168,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file6.webPort}/file/download/down?id=
        sv7:
            id: dyFile7
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile7
            hashStart: 32768
            hashEnd: 38229
@@ -177,7 +177,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file7.webPort}/file/download/down?id=
        sv8:
            id: dyFile8
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile8
            hashStart: 38230
            hashEnd: 43691
@@ -186,7 +186,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file8.webPort}/file/download/down?id=
        sv9:
            id: dyFile9
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile9
            hashStart: 43692
            hashEnd: 49153
@@ -195,7 +195,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file9.webPort}/file/download/down?id=
        sv10:
            id: dyFile10
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile10
            hashStart: 49154
            hashEnd: 54615
@@ -204,7 +204,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file10.webPort}/file/download/down?id=
        sv11:
            id: dyFile11
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile11
            hashStart: 54616
            hashEnd: 60077
@@ -213,7 +213,7 @@
            webDownloadPath: http://127.0.0.1:${pms.file11.webPort}/file/download/down?id=
        sv12:
            id: dyFile12
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
            relativePath: webFile12
            hashStart: 60078
            hashEnd: 65535
pms-parent/pms-global/src/main/resources/privileges-config.xml
@@ -7,31 +7,16 @@
 -->
    <privileges>
        <!-- 系统管理 -->
        <privilege num="10100000" name="用户查询" type="1010" typeName="系统管理"></privilege>
        <privilege num="10100001" name="用户管理" type="1010" typeName="系统管理"></privilege>
        <privilege num="10100002" name="角色查询" type="1010" typeName="系统管理"></privilege>
        <privilege num="10100003" name="角色管理" type="1010" typeName="系统管理"></privilege>
        <privilege num="10100004" name="权限查询" type="1010" typeName="系统管理"></privilege>
        <privilege num="10100006" name="日志查询" type="1010" typeName="系统管理"></privilege>
        <privilege num="10100007" name="编码查询" type="1010" typeName="系统管理"></privilege>
        <privilege num="10100000" name="系统查询" type="1010" typeName="系统管理"></privilege>
        <privilege num="10100001" name="系统管理" type="1010" typeName="系统管理"></privilege>
        <!-- 生产管理 -->
        <privilege num="10200000" name="生产查询" type="1020" typeName="生产管理"></privilege>
        <privilege num="10200001" name="生产管理" type="1020" typeName="生产管理"></privilege>
        <!-- 平台信息 -->
        <privilege num="10300000" name="产品查询" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300001" name="产品管理" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300002" name="质检项目查询" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300003" name="质检项目管理" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300004" name="生产线查询" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300005" name="生产线管理" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300006" name="工站查询" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300007" name="工站管理" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300008" name="不合格原因查询" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300009" name="不合格原因管理" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300010" name="报废原因查询" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300011" name="报废原因管理" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300000" name="平台信息查询" type="1030" typeName="平台信息"></privilege>
        <privilege num="10300001" name="平台信息管理" type="1030" typeName="平台信息"></privilege>
    </privileges>
</config>
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/config/AppStartupRunner.java
@@ -12,7 +12,7 @@
    public void run(String... args) throws Exception {
//        SchedulerTaskSupport.addDailyJob("assemblyPlanTask", "taskPlan", AssemblyPlanTask.class,
//                null, 11, 2);
        SchedulerTaskSupport.addMinutelyJob("assemblyPlanTask", "taskPlan", AssemblyPlanTask.class,
                null, 20, 5,-1);
//        SchedulerTaskSupport.addMinutelyJob("assemblyPlanTask", "taskPlan", AssemblyPlanTask.class,
//                null, 20, 5,-1);
    }
}
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java
@@ -4,6 +4,7 @@
import cn.hutool.core.date.DateUtil;
import com.dy.common.schedulerTask.TaskJob;
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.util.SysUtil;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoPr.PrDeviceMapper;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
@@ -11,6 +12,7 @@
import lombok.extern.slf4j.Slf4j;
import org.quartz.JobExecutionContext;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
@@ -20,6 +22,7 @@
public class AssemblyPlanTask extends TaskJob {
    @Override
    @Transactional
    public void execute(JobExecutionContext ctx) {
        log.info("开始执行 组装计划任务定时检查");
        try{
@@ -38,8 +41,15 @@
                    assemblyDao.updateByPrimaryKeySelective(plan);
                }
            }
            if(assemblyDao!=null){
                throw new RuntimeException("");
            }
        }catch (Exception e){
            log.error("组装计划任务定时检查异常",e);
            try{
                SysUtil.InfoVo vo = SysUtil.info() ;
                System.out.println(vo.toString());
            }catch (Exception e1){}
        }
        log.info("完成 组装计划任务定时检查");
    }