CX 5 months ago
parent
commit
cf94a07b8a
21 changed files with 24 additions and 18 deletions
  1. 1 1
      src/main/java/com/dashitech/migration/task/call/CallLogTask.java
  2. 1 1
      src/main/java/com/dashitech/migration/task/call/HjzxRecordTask.java
  3. 1 1
      src/main/java/com/dashitech/migration/task/category/IncidentCategoryConfigTask.java
  4. 1 1
      src/main/java/com/dashitech/migration/task/category/IncidentCategoryTask.java
  5. 1 1
      src/main/java/com/dashitech/migration/task/consumable/ConsumableHistoryTask.java
  6. 1 1
      src/main/java/com/dashitech/migration/task/consumable/ConsumableTask.java
  7. 2 0
      src/main/java/com/dashitech/migration/task/consumable/RepairSummaryTask.java
  8. 1 1
      src/main/java/com/dashitech/migration/task/consumable/SummaryConsumableTask.java
  9. 1 1
      src/main/java/com/dashitech/migration/task/incident/IncidentTask.java
  10. 2 0
      src/main/java/com/dashitech/migration/task/other/DictionaryTask.java
  11. 1 1
      src/main/java/com/dashitech/migration/task/solution/SolutionIntroduceTask.java
  12. 1 1
      src/main/java/com/dashitech/migration/task/solution/SolutionTask.java
  13. 1 1
      src/main/java/com/dashitech/migration/task/uc/CompanyTask.java
  14. 1 1
      src/main/java/com/dashitech/migration/task/uc/DepartmentTask.java
  15. 1 1
      src/main/java/com/dashitech/migration/task/uc/GroupTask.java
  16. 1 1
      src/main/java/com/dashitech/migration/task/uc/HospitalConfigTask.java
  17. 1 1
      src/main/java/com/dashitech/migration/task/uc/HospitalTask.java
  18. 1 1
      src/main/java/com/dashitech/migration/task/uc/RoleUserTask.java
  19. 1 1
      src/main/java/com/dashitech/migration/task/uc/UserGroupTask.java
  20. 1 1
      src/main/java/com/dashitech/migration/task/uc/UserTask.java
  21. 2 0
      src/main/java/com/dashitech/migration/task/workhour/WorkHourManagementTask.java

+ 1 - 1
src/main/java/com/dashitech/migration/task/call/CallLogTask.java

@@ -21,7 +21,7 @@ public class CallLogTask extends BaseTask {
21 21
     public static Log log = LogFactory.getLog(CallLogTask.class);
22 22
 
23 23
     @Override
24
-    @Transactional
24
+    @Transactional(rollbackFor = Exception.class)
25 25
     public void start() {
26 26
         log.info("通话记录callLog转换开始");
27 27
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/call/HjzxRecordTask.java

@@ -21,7 +21,7 @@ public class HjzxRecordTask extends BaseTask {
21 21
 
22 22
     public static Log log = LogFactory.getLog(HjzxRecordTask.class);
23 23
     @Override
24
-    @Transactional
24
+    @Transactional(rollbackFor = Exception.class)
25 25
     public void start() {
26 26
         log.info("呼叫中心HjzxRecord转换开始");
27 27
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/category/IncidentCategoryConfigTask.java

@@ -21,7 +21,7 @@ public class IncidentCategoryConfigTask extends BaseTask {
21 21
 
22 22
     public static Log log = LogFactory.getLog(IncidentCategoryConfigTask.class);
23 23
     @Override
24
-    @Transactional
24
+    @Transactional(rollbackFor = Exception.class)
25 25
     public void start() {
26 26
         StringBuffer sql = new StringBuffer("SELECT a.version,a.category_id,b._priority as priority,a.duty_id,a.branch_user_group_type as user_group,a.group_id,");
27 27
         sql.append("a.user_id,NOW() as add_time,a.branch_id as hos_id FROM itsm_incident_category_usergroup a ");

+ 1 - 1
src/main/java/com/dashitech/migration/task/category/IncidentCategoryTask.java

@@ -20,7 +20,7 @@ public class IncidentCategoryTask extends BaseTask {
20 20
 
21 21
     public static Log log = LogFactory.getLog(IncidentCategoryTask.class);
22 22
     @Override
23
-    @Transactional
23
+    @Transactional(rollbackFor = Exception.class)
24 24
     public void start() {
25 25
         StringBuffer sql = new StringBuffer("SELECT id,version,category,parentid as parent,delete_flag,quanPinyin as qp,suoPinyin as jp,now() as add_time,");
26 26
         sql.append("hierarchy,muti_category,muti_suoPinyin as muti_jp,muti_quanPinyin as muti_qp,IFNULL(branch_id,1) as hos_id ");

+ 1 - 1
src/main/java/com/dashitech/migration/task/consumable/ConsumableHistoryTask.java

@@ -35,7 +35,7 @@ public class ConsumableHistoryTask extends BaseTask {
35 35
     private DepartmentTask departmentTask;
36 36
 
37 37
     @Override
38
-    @Transactional
38
+    @Transactional(rollbackFor = Exception.class)
39 39
     public void start() {
40 40
         log.info("耗材日志ConsumableHistoryTask转换开始");
41 41
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/consumable/ConsumableTask.java

@@ -30,7 +30,7 @@ public class ConsumableTask extends BaseTask {
30 30
     private CompanyTask companyTask;
31 31
 
32 32
     @Override
33
-    @Transactional
33
+    @Transactional(rollbackFor = Exception.class)
34 34
     public void start() {
35 35
         log.info("耗材ConsumableTask转换开始");
36 36
         StringBuffer sql = new StringBuffer("SELECT id,version,NAME,brand_model as model,inventory_num as stock,start_price as price,company_ids as supplier_id,");

+ 2 - 0
src/main/java/com/dashitech/migration/task/consumable/RepairSummaryTask.java

@@ -6,6 +6,7 @@ import com.dashitech.migration.util.JdbcUtil;
6 6
 import org.apache.commons.logging.Log;
7 7
 import org.apache.commons.logging.LogFactory;
8 8
 import org.springframework.stereotype.Component;
9
+import org.springframework.transaction.annotation.Transactional;
9 10
 
10 11
 import java.util.List;
11 12
 import java.util.Map;
@@ -19,6 +20,7 @@ public class RepairSummaryTask extends BaseTask {
19 20
 
20 21
     public static Log log = LogFactory.getLog(RepairSummaryTask.class);
21 22
     @Override
23
+    @Transactional(rollbackFor = Exception.class)
22 24
     public void start() {
23 25
         log.info("汇总单数据RepairSummaryTask开始转换");
24 26
         StringBuffer sql = new StringBuffer("select * from itsm_repair_summary");

+ 1 - 1
src/main/java/com/dashitech/migration/task/consumable/SummaryConsumableTask.java

@@ -20,7 +20,7 @@ public class SummaryConsumableTask extends BaseTask {
20 20
 
21 21
     public static Log log = LogFactory.getLog(SummaryConsumableTask.class);
22 22
     @Override
23
-    @Transactional
23
+    @Transactional(rollbackFor = Exception.class)
24 24
     public void start() {
25 25
         log.info("汇总单耗材数据SummaryConsumableTask转换开始");
26 26
         StringBuffer sql = new StringBuffer("SELECT * from itsm_summary_consumables");

+ 1 - 1
src/main/java/com/dashitech/migration/task/incident/IncidentTask.java

@@ -32,7 +32,7 @@ public class IncidentTask extends BaseTask {
32 32
     public static Log log = LogFactory.getLog(IncidentTask.class);
33 33
 
34 34
     @Override
35
-    @Transactional
35
+    @Transactional(rollbackFor = Exception.class)
36 36
     public void start() {
37 37
         log.info(" *** DepartmentTask start 开始 *** ");
38 38
 

+ 2 - 0
src/main/java/com/dashitech/migration/task/other/DictionaryTask.java

@@ -5,6 +5,7 @@ import com.dashitech.migration.core.FieldMapper;
5 5
 import org.apache.commons.logging.Log;
6 6
 import org.apache.commons.logging.LogFactory;
7 7
 import org.springframework.stereotype.Component;
8
+import org.springframework.transaction.annotation.Transactional;
8 9
 
9 10
 import java.util.HashMap;
10 11
 import java.util.Map;
@@ -19,6 +20,7 @@ public class DictionaryTask extends BaseTask {
19 20
 
20 21
     public static Log log = LogFactory.getLog(DictionaryTask.class);
21 22
     @Override
23
+    @Transactional(rollbackFor = Exception.class)
22 24
     public void start() {
23 25
 
24 26
     }

+ 1 - 1
src/main/java/com/dashitech/migration/task/solution/SolutionIntroduceTask.java

@@ -26,7 +26,7 @@ public class SolutionIntroduceTask extends BaseTask {
26 26
     private UserTask userTask;
27 27
 
28 28
     @Override
29
-    @Transactional
29
+    @Transactional(rollbackFor = Exception.class)
30 30
     public void start() {
31 31
         log.info("知识库引用数据SolutionIntroduceTask转换开始");
32 32
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/solution/SolutionTask.java

@@ -30,7 +30,7 @@ public class SolutionTask extends BaseTask {
30 30
     DictionaryTask dictionaryTask;
31 31
 
32 32
     @Override
33
-    @Transactional
33
+    @Transactional(rollbackFor = Exception.class)
34 34
     public void start() {
35 35
         log.info("知识库数据SolutionTask转换开始");
36 36
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/uc/CompanyTask.java

@@ -32,7 +32,7 @@ public class CompanyTask extends BaseTask {
32 32
 
33 33
 
34 34
     @Override
35
-    @Transactional
35
+    @Transactional(rollbackFor = Exception.class)
36 36
     public void start() {
37 37
         log.info(" *** 三方公司CompanyTask转换开始 *** ");
38 38
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/uc/DepartmentTask.java

@@ -25,7 +25,7 @@ public class DepartmentTask extends BaseTask {
25 25
     public static Log log = LogFactory.getLog(DepartmentTask.class);
26 26
 
27 27
     @Override
28
-    @Transactional
28
+    @Transactional(rollbackFor = Exception.class)
29 29
     public void start() {
30 30
         log.info(" *** DepartmentTask start 开始 *** ");
31 31
         StringBuffer sql = new StringBuffer("SELECT dept,CODE,parentId,email,delete_flag,address as _address,place_id as floor_id,area_id as building_id,pinyin,");

+ 1 - 1
src/main/java/com/dashitech/migration/task/uc/GroupTask.java

@@ -28,7 +28,7 @@ public class GroupTask extends BaseTask {
28 28
     SqlTask hospitalTask;
29 29
 
30 30
     @Override
31
-    @Transactional
31
+    @Transactional(rollbackFor = Exception.class)
32 32
     public void start() {
33 33
         log.info(" *** 工作组group转换开始 *** ");
34 34
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/uc/HospitalConfigTask.java

@@ -24,7 +24,7 @@ public class HospitalConfigTask extends BaseTask {
24 24
     public static Log log = LogFactory.getLog(HospitalConfigTask.class);
25 25
 
26 26
     @Override
27
-    @Transactional
27
+    @Transactional(rollbackFor = Exception.class)
28 28
     public void start() {
29 29
         log.info(" *** HospitalConfigTask start开始 *** ");
30 30
         FieldMapper mapper = new FieldMapper();

+ 1 - 1
src/main/java/com/dashitech/migration/task/uc/HospitalTask.java

@@ -24,7 +24,7 @@ public class HospitalTask extends BaseTask {
24 24
     public static Log log = LogFactory.getLog(HospitalTask.class);
25 25
 
26 26
     @Override
27
-    @Transactional
27
+    @Transactional(rollbackFor = Exception.class)
28 28
     public void start() {
29 29
         log.info(" *** HospitalTask start开始 *** ");
30 30
         if ("xiangyang".equals(appName)) {

+ 1 - 1
src/main/java/com/dashitech/migration/task/uc/RoleUserTask.java

@@ -26,7 +26,7 @@ public class RoleUserTask extends BaseTask {
26 26
     SqlTask userTask;
27 27
 
28 28
     @Override
29
-    @Transactional
29
+    @Transactional(rollbackFor = Exception.class)
30 30
     public void start() {
31 31
         log.info(" *** start RoleUserTask缓存 *** ");
32 32
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/uc/UserGroupTask.java

@@ -29,7 +29,7 @@ public class UserGroupTask extends BaseTask {
29 29
     public static Log log = LogFactory.getLog(UserGroupTask.class);
30 30
 
31 31
     @Override
32
-    @Transactional
32
+    @Transactional(rollbackFor = Exception.class)
33 33
     public void start() {
34 34
         log.info(" *** UserGroupTask 转换 开始 *** ");
35 35
 

+ 1 - 1
src/main/java/com/dashitech/migration/task/uc/UserTask.java

@@ -32,7 +32,7 @@ public class UserTask extends BaseTask {
32 32
     public static Log log = LogFactory.getLog(UserTask.class);
33 33
 
34 34
     @Override
35
-    @Transactional
35
+    @Transactional(rollbackFor = Exception.class)
36 36
     public void start() {
37 37
         log.info(" *** 用户user转换开始 *** ");
38 38
 

+ 2 - 0
src/main/java/com/dashitech/migration/task/workhour/WorkHourManagementTask.java

@@ -6,6 +6,7 @@ import com.dashitech.migration.task.uc.HospitalTask;
6 6
 import com.dashitech.migration.util.JdbcUtil;
7 7
 import org.springframework.beans.factory.annotation.Autowired;
8 8
 import org.springframework.stereotype.Component;
9
+import org.springframework.transaction.annotation.Transactional;
9 10
 
10 11
 import java.util.List;
11 12
 import java.util.Map;
@@ -21,6 +22,7 @@ public class WorkHourManagementTask extends BaseTask {
21 22
     private HospitalTask hospitalTask;
22 23
 
23 24
     @Override
25
+    @Transactional(rollbackFor = Exception.class)
24 26
     public void start() {
25 27
         StringBuffer sql = new StringBuffer("SELECT id,version,work_unit,work_name,tree_level,parent,wage,");
26 28
         sql.append("work_hour_num as work_hour,duty as hos_id,delete_flag FROM itsm_work_hour_management ");