From 552463e8591adc13ad6df1f4ab8d2284c7a591aa Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 09 八月 2024 17:19:55 +0800
Subject: [PATCH] mapper 及xml整理
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java | 10 +++++
pms-parent/pms-global/src/main/resources/application-database.yml | 2
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/config/AppStartupRunner.java | 4 +-
pms-parent/pms-global/src/main/resources/application-global.yml | 28 +++++++-------
pms-parent/pms-global/src/main/resources/privileges-config.xml | 23 ++---------
5 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/application-database.yml b/pms-parent/pms-global/src/main/resources/application-database.yml
index 81fbe3b..49bd024 100644
--- a/pms-parent/pms-global/src/main/resources/application-database.yml
+++ b/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:
diff --git a/pms-parent/pms-global/src/main/resources/application-global.yml b/pms-parent/pms-global/src/main/resources/application-global.yml
index 82b38df..f2dcd80 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -32,8 +32,8 @@
#浣跨敤type-aliases-package涓寚瀹歟ntity鎵弿鍖呰矾寰勶紝璁﹎ybatis鑷姩鎵弿鑷畾涔夌殑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
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#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= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉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
diff --git a/pms-parent/pms-global/src/main/resources/privileges-config.xml b/pms-parent/pms-global/src/main/resources/privileges-config.xml
index 52b3a00..c344caa 100644
--- a/pms-parent/pms-global/src/main/resources/privileges-config.xml
+++ b/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>
\ No newline at end of file
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/config/AppStartupRunner.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/config/AppStartupRunner.java
index 4715311..5136b48 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/config/AppStartupRunner.java
+++ b/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);
}
}
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java
index 553b033..0dc7f57 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblyPlanTask.java
+++ b/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("瀹屾垚 缁勮璁″垝浠诲姟瀹氭椂妫�鏌�");
}
--
Gitblit v1.8.0