From 7279b6314b350cc0c865d82dbaa4d0624e4f7b3f Mon Sep 17 00:00:00 2001
From: cheng <1821349743@qq.com>
Date: 星期二, 16 一月 2024 04:21:06 +0800
Subject: [PATCH] commit

---
 product-server-data-center/src/main/java/com/product/data/center/service/CommonService.java       | 1012 +++++++++++++++++++++++++++++++----------------------------
 product-server-data-center/src/main/java/com/product/data/center/controller/CommonController.java |    2 
 2 files changed, 534 insertions(+), 480 deletions(-)

diff --git a/product-server-data-center/src/main/java/com/product/data/center/controller/CommonController.java b/product-server-data-center/src/main/java/com/product/data/center/controller/CommonController.java
index 76e24a7..2ebbfca 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/controller/CommonController.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/controller/CommonController.java
@@ -35,6 +35,8 @@
     @Resource
     SyncDelRecordService syncDelRecordService;
 
+
+
     @PostMapping("/mes-sync/save/{version}")
     @ApiVersion(1)
     public String saveMesSyncDataConfig(HttpServletRequest request) {
diff --git a/product-server-data-center/src/main/java/com/product/data/center/service/CommonService.java b/product-server-data-center/src/main/java/com/product/data/center/service/CommonService.java
index 79bb529..24bd2f2 100644
--- a/product-server-data-center/src/main/java/com/product/data/center/service/CommonService.java
+++ b/product-server-data-center/src/main/java/com/product/data/center/service/CommonService.java
@@ -42,117 +42,170 @@
 @Service("dataCommonService")
 public class CommonService extends AbstractBaseService implements ICommonService {
 
-	@Resource
-	SysJobService sysJobService;
+    @Resource
+    SysJobService sysJobService;
 
-	@Resource
-	PublicService publicService;
+    @Resource
+    PublicService publicService;
 
-	@Resource
-	SyncDelRecordService syncDelRecordService;
+    @Resource
+    SyncDelRecordService syncDelRecordService;
 
-	@Resource
-	MesExternalService mesExternalService;
+    @Resource
+    MesExternalService mesExternalService;
 
-	@Value("${data.system.name}")
-	private String dataSystemName;
+    @Value("${data.system.name}")
+    private String dataSystemName;
 
-	public void deleteCenterLog() {
-		try {
-			//鍦╩ysql鐨刬nformation_schema 琛ㄤ腑鏌ヨ鎸囧畾琛ㄦ槸鍚﹀瓨鍦�
-			String tableName = "da_product_sys_data_center_log";
+    public void deleteCenterLog() {
+        try {
+            //鍦╩ysql鐨刬nformation_schema 琛ㄤ腑鏌ヨ鎸囧畾琛ㄦ槸鍚﹀瓨鍦�
+            String tableName = "da_product_sys_data_center_log";
 
-			//褰掓。7澶╁墠鐨勬暟鎹�
-			//鎴鏃ユ湡
-			Date endTime = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -7);
+            //褰掓。7澶╁墠鐨勬暟鎹�
+            //鎴鏃ユ湡
+            Date endTime = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -7);
 
-			//鏍煎紡鍖栨棩鏈�
-			String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd");
+            //鏍煎紡鍖栨棩鏈�
+            String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd");
 
-			//鏍规嵁鎴鏃ユ湡鏌ヨ琛ㄤ腑鏈�澶с�佹渶灏忕殑鍒涘缓鏃堕棿鏍规嵁鍒涘缓鏃堕棿杩涜鍒嗚〃鎸夋湀鍒嗚〃
-			String sql = "select min(created_utc_datetime) as minTime,max(created_utc_datetime) as maxTime from product_sys_data_center_log where created_utc_datetime <now() + interval -7 day and (result = 1 or ( deal_flag = 1 AND deal_result = 1 ) )";
+            //鏍规嵁鎴鏃ユ湡鏌ヨ琛ㄤ腑鏈�澶с�佹渶灏忕殑鍒涘缓鏃堕棿鏍规嵁鍒涘缓鏃堕棿杩涜鍒嗚〃鎸夋湀鍒嗚〃
+            String sql = "select min(created_utc_datetime) as minTime,max(created_utc_datetime) as maxTime from product_sys_data_center_log where created_utc_datetime <now() + interval -7 day and (result = 1 or ( deal_flag = 1 AND deal_result = 1 ) )";
 
-			FieldSetEntity fs = getBaseDao().getFieldSetEntityBySQL(sql, new Object[]{}, false);
+            FieldSetEntity fs = getBaseDao().getFieldSetEntityBySQL(sql, new Object[]{}, false);
 
-			if (fs == null) {
-				return;
-			}
-			//鏈�灏忔椂闂�
-			Date minTime = fs.getDate("minTime");
+            if (fs == null) {
+                return;
+            }
+            //鏈�灏忔椂闂�
+            Date minTime = fs.getDate("minTime");
 
-			//鏈�澶ф椂闂�
-			Date maxTime = fs.getDate("maxTime");
+            //鏈�澶ф椂闂�
+            Date maxTime = fs.getDate("maxTime");
 
-			//鏍规嵁鏈�灏忔椂闂村拰鏈�澶ф椂闂磋幏鍙栧尯闂村唴锛堝寘鍚渶灏忔椂闂村拰鏈�澶ф椂闂达級鐨勫勾鏈堟棩鏈熸牸寮忎负yyyy-MM
+            //鏍规嵁鏈�灏忔椂闂村拰鏈�澶ф椂闂磋幏鍙栧尯闂村唴锛堝寘鍚渶灏忔椂闂村拰鏈�澶ф椂闂达級鐨勫勾鏈堟棩鏈熸牸寮忎负yyyy-MM
 
-			List<DateTime> tableSuffixList = DateUtil.rangeToList(minTime, maxTime, DateField.MONTH);
+            List<DateTime> tableSuffixList = DateUtil.rangeToList(minTime, maxTime, DateField.MONTH);
 
-			//鏌ヨ鏁版嵁搴撲腑鏄惁瀛樺湪琛�
+            //鏌ヨ鏁版嵁搴撲腑鏄惁瀛樺湪琛�
 
-			Set<String> tableNameSet = tableSuffixList.stream().map(e -> tableName + "_" + DateUtil.format(e, "yyyyMM")).collect(Collectors.toSet());
+            Set<String> tableNameSet = tableSuffixList.stream().map(e -> tableName + "_" + DateUtil.format(e, "yyyyMM")).collect(Collectors.toSet());
 
-			//鏌ヨ鏁版嵁搴撲腑瀛樺湪鐨勮〃
-			String dataBaseName = getBaseDao().getDataBaseName();
-			sql = "select TABLE_NAME table_name from information_schema.tables where table_schema = ? and " + BaseUtil.buildQuestionMarkFilter("TABLE_NAME", tableNameSet.size(), true);
+            //鏌ヨ鏁版嵁搴撲腑瀛樺湪鐨勮〃
+            String dataBaseName = getBaseDao().getDataBaseName();
+            sql = "select TABLE_NAME table_name from information_schema.tables where table_schema = ? and " + BaseUtil.buildQuestionMarkFilter("TABLE_NAME", tableNameSet.size(), true);
 
-			Object[] params = new Object[tableNameSet.size() + 1];
-			params[0] = dataBaseName;
-			int index = 1;
-			for (String tableNameStr : tableNameSet) {
-				params[index] = tableNameStr;
-				index++;
-			}
-			DataTableEntity dataTableEntity = getBaseDao().listTable(sql, params);
+            Object[] params = new Object[tableNameSet.size() + 1];
+            params[0] = dataBaseName;
+            int index = 1;
+            for (String tableNameStr : tableNameSet) {
+                params[index] = tableNameStr;
+                index++;
+            }
+            DataTableEntity dataTableEntity = getBaseDao().listTable(sql, params);
 
-			if (!DataTableEntity.isEmpty(dataTableEntity)) {
-				for (int i = 0; i < dataTableEntity.getRows(); i++) {
-					String tableNameStr = dataTableEntity.getString(i, "table_name");
-					tableNameSet.remove(tableNameStr);
-				}
-			}
-			//鍒涘缓涓嶅瓨鍦ㄧ殑琛紝琛ㄧ粨鏋勪笌鍘熻〃涓�鑷�
-			for (String tableNameStr : tableNameSet) {
-				String createTableSql = "create table " + tableNameStr + " like product_sys_data_center_log";
-				getBaseDao().executeUpdate(createTableSql, new Object[]{});
-			}
-			//鎻掑叆鏁版嵁鏍规嵁鍒涘缓鏃堕棿鐨勫勾鏈堝垎鍒彃鍏ュ埌瀵瑰簲鐨勮〃涓�
-			for (DateTime dateTime : tableSuffixList) {
-				String insertSql = "insert into " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " select * from product_sys_data_center_log where created_utc_datetime >= str_to_date(concat(?, '-01 00:00:00'), '%Y-%m-%d %H:%i:%s') and created_utc_datetime < str_to_date(concat(?, '-01 00:00:00'), '%Y-%m-%d %H:%i:%s') + interval 1 month" +
-						" and id >(select ifnull(max(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) and (result = 1 or ( deal_flag = 1 AND deal_result = 1 ) )";
-				getBaseDao().executeUpdate(insertSql, new Object[]{DateUtil.format(dateTime, "yyyy-MM"), DateUtil.format(dateTime, "yyyy-MM")});
-				//鍒犻櫎鏁版嵁宸叉彃鍏ョ殑鏁版嵁
-				StringBuilder deleteSql = new StringBuilder();
-				deleteSql.append(" DELETE FROM product_sys_data_center_log a INNER JOIN ");
-				deleteSql.append(" product_sys_data_center_log b on a.id=b.pre_step_uuid and a.type=1 and b.type=2 ");
-				deleteSql.append(" where ");
-				deleteSql.append(" a.id>= (select ifnull(min(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
-				deleteSql.append(" and a.id <= (select ifnull(max(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
-				deleteSql.append(" (a.result = 1 or ( a.deal_flag = 1 AND a.deal_result = 1 ) ) ");
-				deleteSql.append(" a.type=1 ");
-				//鍏堝垹闄ら噰闆嗘棩蹇楁暟鎹�
-				getBaseDao().executeUpdate(deleteSql.toString(), new Object[]{});
+            if (!DataTableEntity.isEmpty(dataTableEntity)) {
+                for (int i = 0; i < dataTableEntity.getRows(); i++) {
+                    String tableNameStr = dataTableEntity.getString(i, "table_name");
+                    tableNameSet.remove(tableNameStr);
+                }
+            }
+            //鍒涘缓涓嶅瓨鍦ㄧ殑琛紝琛ㄧ粨鏋勪笌鍘熻〃涓�鑷�
+            for (String tableNameStr : tableNameSet) {
+                String createTableSql = "create table " + tableNameStr + " like product_sys_data_center_log";
+                getBaseDao().executeUpdate(createTableSql, new Object[]{});
+            }
+            //鏌ヨ鍚勭被鍨嬮厤缃渶鍚庝竴娆℃垚鍔熺殑鏁版嵁
+            String sqlFilter = "SELECT * FROM (SELECT uuid\n" +
+                    "FROM product_sys_data_center_log\n" +
+                    "WHERE uuid IN (\n" +
+                    "\tSELECT uuid\n" +
+                    "\tFROM product_sys_data_center_log\n" +
+                    "\tWHERE id IN (\n" +
+                    "\t\tSELECT max(a.id)\n" +
+                    "\t\tFROM product_sys_data_center_log a\n" +
+                    "\t\t\tJOIN product_sys_data_center_log b ON a.uuid = b.pre_step_uuid\n" +
+                    "\t\tWHERE a.type = 1\n" +
+                    "\t\t\tAND b.type = 2\n" +
+                    "\t\t\tAND (a.result = 1\n" +
+                    "\t\t\t\tOR (a.deal_flag = 1\n" +
+                    "\t\t\t\t\tAND a.deal_result = 1))\n" +
+                    "\t\t\tAND (b.result = 1\n" +
+                    "\t\t\t\tOR (b.deal_flag = 1\n" +
+                    "\t\t\t\t\tAND b.deal_result = 1))\n" +
+                    "\t\tGROUP BY a.config_uuid\n" +
+                    "\t)\n" +
+                    "\tUNION ALL\n" +
+                    "\tSELECT aa.uuid\n" +
+                    "\tFROM product_sys_data_center_log aa\n" +
+                    "\t\tJOIN product_sys_data_center_log bb ON aa.pre_step_uuid = bb.uuid\n" +
+                    "\tWHERE aa.type = 2\n" +
+                    "\t\tAND bb.type = 1\n" +
+                    "\t\tAND bb.id IN (\n" +
+                    "\t\t\tSELECT max(a.id)\n" +
+                    "\t\t\tFROM product_sys_data_center_log a\n" +
+                    "\t\t\t\tJOIN product_sys_data_center_log b ON a.uuid = b.pre_step_uuid\n" +
+                    "\t\t\tWHERE a.type = 1\n" +
+                    "\t\t\t\tAND b.type = 2\n" +
+                    "\t\t\t\tAND (a.result = 1\n" +
+                    "\t\t\t\t\tOR (a.deal_flag = 1\n" +
+                    "\t\t\t\t\t\tAND a.deal_result = 1))\n" +
+                    "\t\t\t\tAND (b.result = 1\n" +
+                    "\t\t\t\t\tOR (b.deal_flag = 1\n" +
+                    "\t\t\t\t\t\tAND b.deal_result = 1))\n" +
+                    "\t\t\tGROUP BY a.config_uuid\n" +
+                    "\t\t)\n" +
+                    "\tUNION ALL\n" +
+                    "\tSELECT uuid\n" +
+                    "\tFROM product_sys_data_center_log a\n" +
+                    "\tWHERE a.type = 5\n" +
+                    "\t\tAND detail != 3\n" +
+                    "\t\tAND (a.result = 1\n" +
+                    "\t\t\tOR (a.deal_flag = 1\n" +
+                    "\t\t\t\tAND a.deal_result = 1))\n" +
+                    ")) ddd";
+            //鎻掑叆鏁版嵁鏍规嵁鍒涘缓鏃堕棿鐨勫勾鏈堝垎鍒彃鍏ュ埌瀵瑰簲鐨勮〃涓�
+            for (DateTime dateTime : tableSuffixList) {
+                String insertSql = "insert into " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " select * from product_sys_data_center_log where created_utc_datetime >= str_to_date(concat(?, '-01 00:00:00'), '%Y-%m-%d %H:%i:%s') and created_utc_datetime < str_to_date(concat(?, '-01 00:00:00'), '%Y-%m-%d %H:%i:%s') + interval 1 month" +
+                        " and id >(select ifnull(max(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) and (result = 1 or ( deal_flag = 1 AND deal_result = 1 ) ) and created_utc_datetime <now() + interval -7 day";
+                getBaseDao().executeUpdate(insertSql, new Object[]{DateUtil.format(dateTime, "yyyy-MM"), DateUtil.format(dateTime, "yyyy-MM")});
+//                //鍒犻櫎鏁版嵁宸叉彃鍏ョ殑鏁版嵁
+                StringBuilder deleteSql = new StringBuilder();
+                deleteSql.append(" DELETE a FROM product_sys_data_center_log a INNER JOIN ");
+                deleteSql.append(" product_sys_data_center_log b on a.uuid=b.pre_step_uuid and a.type=1 and b.type=2 ");
+                deleteSql.append(" where ");
+                deleteSql.append(" a.id>= (select ifnull(min(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
+                deleteSql.append(" and a.id <= (select ifnull(max(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
+                deleteSql.append(" and (a.result = 1 or ( a.deal_flag = 1 AND a.deal_result = 1 ) ) ");
+                deleteSql.append(" and a.type=1 ");
+                deleteSql.append(" and a.uuid not in (").append(sqlFilter).append(") ");
+                //鍏堝垹闄ら噰闆嗘棩蹇楁暟鎹�
+                getBaseDao().executeUpdate(deleteSql.toString(), new Object[]{});
 
-				deleteSql.setLength(0);
-				//鍐嶅垹闄ゆ彁鍙栨棩蹇楁暟鎹�
-				deleteSql.append(" DELETE FROM product_sys_data_center_log a LEFT JOIN ");
-				deleteSql.append(" product_sys_data_center_log b on b.id=a.pre_step_uuid and b.type=1 and a.type=2 ");
-				deleteSql.append(" where ");
-				deleteSql.append(" a.id>= (select ifnull(min(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
-				deleteSql.append(" and a.id <= (select ifnull(max(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
-				deleteSql.append(" (a.result = 1 or ( a.deal_flag = 1 AND a.deal_result = 1 ) ) ");
-				deleteSql.append(" a.type=2 and b.id is null  ");
+                deleteSql.setLength(0);
+                //鍐嶅垹闄ゆ彁鍙栨棩蹇楁暟鎹�
+                deleteSql.append(" DELETE a FROM product_sys_data_center_log a LEFT JOIN ");
+                deleteSql.append(" product_sys_data_center_log b on b.uuid=a.pre_step_uuid and b.type=1 and a.type=2 ");
+                deleteSql.append(" where ");
+                deleteSql.append(" a.id>= (select ifnull(min(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
+                deleteSql.append(" and a.id <= (select ifnull(max(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
+                deleteSql.append(" and (a.result = 1 or ( a.deal_flag = 1 AND a.deal_result = 1 ) ) ");
+                deleteSql.append(" and a.type=2 and b.id is null  ");
+                deleteSql.append(" and a.uuid not in (").append(sqlFilter).append(") ");
 
-				getBaseDao().executeUpdate(deleteSql.toString(), new Object[]{});
+                getBaseDao().executeUpdate(deleteSql.toString(), new Object[]{});
 
-				//鍐嶅垹闄ゅ叾浠栨棩蹇楁暟鎹�
-				deleteSql.append(" DELETE FROM product_sys_data_center_log a  ");
-				deleteSql.append(" where ");
-				deleteSql.append(" a.id>= (select ifnull(min(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
-				deleteSql.append(" and a.id <= (select ifnull(max(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
-				deleteSql.append(" (a.result = 1 or ( a.deal_flag = 1 AND a.deal_result = 1 ) ) ");
-				deleteSql.append(" a.type>2 ");
-				getBaseDao().executeUpdate(deleteSql.toString());
-			}
+                deleteSql.setLength(0);
+                //鍐嶅垹闄ゅ叾浠栨棩蹇楁暟鎹�
+                deleteSql.append(" DELETE FROM product_sys_data_center_log a  ");
+                deleteSql.append(" where ");
+                deleteSql.append(" a.id>= (select ifnull(min(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
+                deleteSql.append(" and a.id <= (select ifnull(max(id),0) from " + tableName + "_" + DateUtil.format(dateTime, "yyyyMM") + " ) ");
+                deleteSql.append(" and (a.result = 1 or ( a.deal_flag = 1 AND a.deal_result = 1 ) ) ");
+                deleteSql.append(" and a.type>2 ");
+                deleteSql.append(" and a.uuid not in (").append(sqlFilter).append(") ");
+                getBaseDao().executeUpdate(deleteSql.toString());
+            }
 
 //			fs = null;
 //			do {
@@ -162,420 +215,419 @@
 //				//妫�鏌ユ槸鍚﹁繕鏈夋暟鎹�
 //				fs = getBaseDao().getFieldSetEntityBySQL(sql, new Object[]{}, false);
 //			} while (fs != null && fs.getInteger("del_count") != null && fs.getInteger("del_count") > 0);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    /**
+     * 鍒涘缓瀹氭椂浠诲姟
+     *
+     * @param taskName          浠诲姟鍚嶇О
+     * @param isUsed            鏄惁鍚敤
+     * @param corn              鎵ц鏃堕棿
+     * @param executeExpression 鎵ц琛ㄨ揪寮忥紙bean.method)
+     */
+    private String createTimeTask(String timeTaskUuid, String taskName, boolean isUsed, String corn, String executeExpression) {
+        FieldSetEntity fse = new FieldSetEntity();
+        try {
+            fse.setTableName("product_sys_timed_task");
+            fse.setValue("uuid", timeTaskUuid);
+            fse.setValue("job_name", taskName);//浠诲姟鍚嶇О
+            fse.setValue("job_group", "system");//鍒嗙粍
+            fse.setValue("invoke_target", executeExpression);//璋冪敤鐩爣瀛楃涓�
+            fse.setValue("cron_expression", corn);//cron琛ㄨ揪寮�
+            fse.setValue("misfire_policy", "3");//閿欒鎵ц绛栫暐  鍙墽琛屼竴娆�
+            fse.setValue("concurrent", 0);//涓嶅厑璁稿苟鍙戞墽琛�
+            fse.setValue("remark", taskName);
+            fse.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
+            fse.setValue("created_utc_datetime", new Date());
+            fse.setValue("status", isUsed ? 1 : 0);
+            fse.setValue("is_conceal", 1);
+
+            if (!StringUtils.isEmpty(timeTaskUuid)) {
+                BaseUtil.createCreatorAndCreationTime(fse);
+                sysJobService.updateJob(fse);
+            } else {
+                sysJobService.insertJob(fse);
+            }
+            return fse.getUUID();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BaseException(ErrorCode.CRATED_TIMED_TASK_FAIL);
+        }
+    }
+
+    /**
+     * 閫氱敤淇濆瓨
+     *
+     * @param fse
+     * @param t
+     */
+    private void commonSave(FieldSetEntity fse, CallBackReturnValue<String, FieldSetEntity> t) {
+        boolean isAdd = false;
+        BaseUtil.createCreatorAndCreationTime(fse);
+        if (StringUtils.isEmpty(fse.getUUID())) {
+            fse.setValue(CmnConst.UUID, IdUtil.randomUUID());
+            isAdd = true;
+        } else if (!StringUtils.isEmpty(fse.getUUID()) && "add".equals(fse.getString(CoreConst.SYSTEM_DATA_OPERATE_TYPE))) {
+            isAdd = true;
+        }
+        String timeTasksUid = t.invokeMethod(fse);
+        fse.setValue(CmnConst.TIME_TASK_UUID, timeTasksUid);
+        if (isAdd) {
+            getBaseDao().add(fse);
+        } else {
+            getBaseDao().update(fse);
+        }
+    }
 
 
-	/**
-	 * 鍒涘缓瀹氭椂浠诲姟
-	 *
-	 * @param taskName          浠诲姟鍚嶇О
-	 * @param isUsed            鏄惁鍚敤
-	 * @param corn              鎵ц鏃堕棿
-	 * @param executeExpression 鎵ц琛ㄨ揪寮忥紙bean.method)
-	 */
-	private String createTimeTask(String timeTaskUuid, String taskName, boolean isUsed, String corn, String executeExpression) {
-		FieldSetEntity fse = new FieldSetEntity();
-		try {
-			fse.setTableName("product_sys_timed_task");
-			fse.setValue("uuid", timeTaskUuid);
-			fse.setValue("job_name", taskName);//浠诲姟鍚嶇О
-			fse.setValue("job_group", "system");//鍒嗙粍
-			fse.setValue("invoke_target", executeExpression);//璋冪敤鐩爣瀛楃涓�
-			fse.setValue("cron_expression", corn);//cron琛ㄨ揪寮�
-			fse.setValue("misfire_policy", "3");//閿欒鎵ц绛栫暐  鍙墽琛屼竴娆�
-			fse.setValue("concurrent", 0);//涓嶅厑璁稿苟鍙戞墽琛�
-			fse.setValue("remark", taskName);
-			fse.setValue("created_by", SpringMVCContextHolder.getCurrentUser().getUser_id());
-			fse.setValue("created_utc_datetime", new Date());
-			fse.setValue("status", isUsed ? 1 : 0);
-			fse.setValue("is_conceal", 1);
-
-			if (!StringUtils.isEmpty(timeTaskUuid)) {
-				BaseUtil.createCreatorAndCreationTime(fse);
-				sysJobService.updateJob(fse);
-			} else {
-				sysJobService.insertJob(fse);
-			}
-			return fse.getUUID();
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new BaseException(ErrorCode.CRATED_TIMED_TASK_FAIL);
-		}
-	}
-
-	/**
-	 * 閫氱敤淇濆瓨
-	 *
-	 * @param fse
-	 * @param t
-	 */
-	private void commonSave(FieldSetEntity fse, CallBackReturnValue<String, FieldSetEntity> t) {
-		boolean isAdd = false;
-		BaseUtil.createCreatorAndCreationTime(fse);
-		if (StringUtils.isEmpty(fse.getUUID())) {
-			fse.setValue(CmnConst.UUID, IdUtil.randomUUID());
-			isAdd = true;
-		} else if (!StringUtils.isEmpty(fse.getUUID()) && "add".equals(fse.getString(CoreConst.SYSTEM_DATA_OPERATE_TYPE))) {
-			isAdd = true;
-		}
-		String timeTasksUid = t.invokeMethod(fse);
-		fse.setValue(CmnConst.TIME_TASK_UUID, timeTasksUid);
-		if (isAdd) {
-			getBaseDao().add(fse);
-		} else {
-			getBaseDao().update(fse);
-		}
-	}
-
-
-	/**
-	 * 淇濆瓨MES鏁版嵁鍚屾閰嶇疆
-	 *
-	 * @param fse
-	 * @return
-	 * @throws BaseException
-	 */
-	@Transactional
-	@Override
-	public String saveMesSyncDataConfig(FieldSetEntity fse) throws BaseException {
-		DataTableEntity subDt = fse.getSubDataTable("product_sys_data_sync_mes_sub");
-		//鍥哄畾uuid
-		fse.setValue("uuid", 1);
-		DataTableEntity dt = getBaseDao().listTable(CmnConst.PRODUCT_MES_DEL_RECORD_CONFIG, "del_type=1");
-		DataTableEntity subDataTable = null;
-		if (!DataTableEntity.isEmpty(subDt)) {
-			subDataTable = subDt.clones();
-			int b = 0;
-			for (int i = 0; i < subDt.getRows(); i++) {
-				FieldSetEntity subFse = subDt.getFieldSetEntity(i);
-				String dataType = subFse.getString("~type~");
-				String uuid = subFse.getString(CmnConst.UUID);
-				if ("del".equals(dataType)) {
-					String timeTaskUid = subFse.getString(CmnConst.TIME_TASK_UUID);
-					FieldSetEntity task = getBaseDao().getFieldSetEntity("product_sys_timed_task", timeTaskUid, false);
-					if (task != null) {
-						cancelTimeTask(task);
-					}
-					subDataTable.setFieldValue(b, "config_uuid", subFse.getUUID());
-				} else {
-					subFse.setValue("master_uuid", fse.getUUID());
-					commonSave(subFse, fs -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "SYNC:" + fs.getString("table_name"), fs.getBoolean(CmnConst.IS_USED), fs.getString("execution_time"), "dataSyncService.runTimeTask('" + fs.getUUID() + "')"));
-					subDt.removeFieldSetEntity(i);
-					subDataTable.setFieldValue(b, "uuid", subFse.getUUID());
-					i--;
-				}
-				b++;
-			}
-			if (!DataTableEntity.isEmpty(subDt)) {
-				Object[] objects = subDt.getData().stream().map(item -> item.getUUID()).toArray();
-				getBaseDao().delete("product_sys_data_sync_mes_sub", objects);
-			}
-		}
-		fse.removeSubData("product_sys_data_sync_mes_sub");
-		getBaseDao().saveFieldSetEntity(fse);
-		//鍒涘缓瑙﹀彂鍣�
+    /**
+     * 淇濆瓨MES鏁版嵁鍚屾閰嶇疆
+     *
+     * @param fse
+     * @return
+     * @throws BaseException
+     */
+    @Transactional
+    @Override
+    public String saveMesSyncDataConfig(FieldSetEntity fse) throws BaseException {
+        DataTableEntity subDt = fse.getSubDataTable("product_sys_data_sync_mes_sub");
+        //鍥哄畾uuid
+        fse.setValue("uuid", 1);
+        DataTableEntity dt = getBaseDao().listTable(CmnConst.PRODUCT_MES_DEL_RECORD_CONFIG, "del_type=1");
+        DataTableEntity subDataTable = null;
+        if (!DataTableEntity.isEmpty(subDt)) {
+            subDataTable = subDt.clones();
+            int b = 0;
+            for (int i = 0; i < subDt.getRows(); i++) {
+                FieldSetEntity subFse = subDt.getFieldSetEntity(i);
+                String dataType = subFse.getString("~type~");
+                String uuid = subFse.getString(CmnConst.UUID);
+                if ("del".equals(dataType)) {
+                    String timeTaskUid = subFse.getString(CmnConst.TIME_TASK_UUID);
+                    FieldSetEntity task = getBaseDao().getFieldSetEntity("product_sys_timed_task", timeTaskUid, false);
+                    if (task != null) {
+                        cancelTimeTask(task);
+                    }
+                    subDataTable.setFieldValue(b, "config_uuid", subFse.getUUID());
+                } else {
+                    subFse.setValue("master_uuid", fse.getUUID());
+                    commonSave(subFse, fs -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "SYNC:" + fs.getString("table_name"), fs.getBoolean(CmnConst.IS_USED), fs.getString("execution_time"), "dataSyncService.runTimeTask('" + fs.getUUID() + "')"));
+                    subDt.removeFieldSetEntity(i);
+                    subDataTable.setFieldValue(b, "uuid", subFse.getUUID());
+                    i--;
+                }
+                b++;
+            }
+            if (!DataTableEntity.isEmpty(subDt)) {
+                Object[] objects = subDt.getData().stream().map(item -> item.getUUID()).toArray();
+                getBaseDao().delete("product_sys_data_sync_mes_sub", objects);
+            }
+        }
+        fse.removeSubData("product_sys_data_sync_mes_sub");
+        getBaseDao().saveFieldSetEntity(fse);
+        //鍒涘缓瑙﹀彂鍣�
 //           //1 涓诲簱鍒犻櫎鍚庡悓姝ュ垹闄ゅ瓙搴�
-		syncDelRecordService.createTrigger(subDataTable, fse.getString("data_source"), fse.getString("target_data_source"));
-		return fse.getUUID();
-	}
+        syncDelRecordService.createTrigger(subDataTable, fse.getString("data_source"), fse.getString("target_data_source"));
+        return fse.getUUID();
+    }
 
-	/**
-	 * 鍙栨秷瀹氭椂浠诲姟
-	 *
-	 * @param fse
-	 * @throws BaseException
-	 */
-	private void cancelTimeTask(FieldSetEntity fse) throws BaseException {
-		try {
-			this.sysJobService.deleteJob(fse);
-		} catch (Exception e) {
-			e.printStackTrace();
-			SpringMVCContextHolder.getSystemLogger().error(e);
-			throw new BaseException(ErrorCode.CANCEL_TIME_TASK_FAIL);
-		}
-	}
+    /**
+     * 鍙栨秷瀹氭椂浠诲姟
+     *
+     * @param fse
+     * @throws BaseException
+     */
+    private void cancelTimeTask(FieldSetEntity fse) throws BaseException {
+        try {
+            this.sysJobService.deleteJob(fse);
+        } catch (Exception e) {
+            e.printStackTrace();
+            SpringMVCContextHolder.getSystemLogger().error(e);
+            throw new BaseException(ErrorCode.CANCEL_TIME_TASK_FAIL);
+        }
+    }
 
-	/**
-	 * 閲囬泦閰嶇疆淇濆瓨
-	 *
-	 * @param fse
-	 * @return
-	 */
-	@Override
-	@Transactional
-	public synchronized String saveCollectConfig(FieldSetEntity fse) throws BaseException {
-		boolean isAdd = false;
-		if (StringUtils.isEmpty(fse.getUUID())) {
-			if (StringUtils.isEmpty(dataSystemName)) {
-				//鏁版嵁鏉ユ簮绯荤粺鍚嶇О涓嶈兘涓虹┖
-				throw new BaseException(ErrorCode.DATA_SYSTEM_NAME_CAN_NOT_EMPTY);
-			}
-			Pattern r = Pattern.compile("^[A-Za-z-]+$");
-			Matcher m = r.matcher(dataSystemName);
-			if (!m.matches()) {
-				//鏁版嵁鏉ユ簮绯荤粺鍚嶇О鏍煎紡涓嶇
-				throw new BaseException(ErrorCode.DATA_SYSTEM_NAME_FORMAT_UNQUALIFIED);
-			}
-			//鏂板
-			FieldSetEntity fs = getBaseDao().getFieldSetEntityBySQL("SELECT\n" + "\t ifnull(MAX( id ),0)+1 id " + "FROM\n" + "\t( SELECT CONVERT(REPLACE ( id, ?, '' ),UNSIGNED int) id FROM product_sys_data_collect WHERE id LIKE concat(?,'%') ) a", new Object[]{dataSystemName, dataSystemName}, false);
-			if (!FieldSetEntity.isEmpty(fs) && !StringUtils.isEmpty(fs.getString("id"))) {
-				String id = fs.getString("id");
-				DecimalFormat decimalFormat = new DecimalFormat("000000");
-				id = decimalFormat.format(Integer.valueOf(id));
-				fse.setValue("id", dataSystemName + id);
-			} else {
-				throw new BaseException(ErrorCode.UNIQUE_COLLECT_CREATE_FAIL);
-			}
-			isAdd = true;
-		}
+    /**
+     * 閲囬泦閰嶇疆淇濆瓨
+     *
+     * @param fse
+     * @return
+     */
+    @Override
+    @Transactional
+    public synchronized String saveCollectConfig(FieldSetEntity fse) throws BaseException {
+        boolean isAdd = false;
+        if (StringUtils.isEmpty(fse.getUUID())) {
+            if (StringUtils.isEmpty(dataSystemName)) {
+                //鏁版嵁鏉ユ簮绯荤粺鍚嶇О涓嶈兘涓虹┖
+                throw new BaseException(ErrorCode.DATA_SYSTEM_NAME_CAN_NOT_EMPTY);
+            }
+            Pattern r = Pattern.compile("^[A-Za-z-]+$");
+            Matcher m = r.matcher(dataSystemName);
+            if (!m.matches()) {
+                //鏁版嵁鏉ユ簮绯荤粺鍚嶇О鏍煎紡涓嶇
+                throw new BaseException(ErrorCode.DATA_SYSTEM_NAME_FORMAT_UNQUALIFIED);
+            }
+            //鏂板
+            FieldSetEntity fs = getBaseDao().getFieldSetEntityBySQL("SELECT\n" + "\t ifnull(MAX( id ),0)+1 id " + "FROM\n" + "\t( SELECT CONVERT(REPLACE ( id, ?, '' ),UNSIGNED int) id FROM product_sys_data_collect WHERE id LIKE concat(?,'%') ) a", new Object[]{dataSystemName, dataSystemName}, false);
+            if (!FieldSetEntity.isEmpty(fs) && !StringUtils.isEmpty(fs.getString("id"))) {
+                String id = fs.getString("id");
+                DecimalFormat decimalFormat = new DecimalFormat("000000");
+                id = decimalFormat.format(Integer.valueOf(id));
+                fse.setValue("id", dataSystemName + id);
+            } else {
+                throw new BaseException(ErrorCode.UNIQUE_COLLECT_CREATE_FAIL);
+            }
+            isAdd = true;
+        }
 
-		commonSave(fse, (fs) -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "DC:" + fs.getString("name"), fs.getBoolean(CmnConst.IS_USED), fs.getString("frequency"), "dataCollectService.dataCollect('" + fs.getUUID() + "')"));
-		saveDelRecordConfig(1, fse.getUUID());
-		if (!"ch-kt".equals(dataSystemName)) {
-			//瀛愬簱淇濆瓨鍚庡彂閫佸埌涓绘湇鍔�
-			fse.setValue(CoreConst.SYSTEM_DATA_OPERATE_TYPE, isAdd ? "add" : "update");
-			mesExternalService.remoteSaveCollectConfig(fse);
-		}
-		return fse.getUUID();
-	}
+        commonSave(fse, (fs) -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "DC:" + fs.getString("name"), fs.getBoolean(CmnConst.IS_USED), fs.getString("frequency"), "dataCollectService.dataCollect('" + fs.getUUID() + "')"));
+        saveDelRecordConfig(1, fse.getUUID());
+        if (!"ch-kt".equals(dataSystemName)) {
+            //瀛愬簱淇濆瓨鍚庡彂閫佸埌涓绘湇鍔�
+            fse.setValue(CoreConst.SYSTEM_DATA_OPERATE_TYPE, isAdd ? "add" : "update");
+            mesExternalService.remoteSaveCollectConfig(fse);
+        }
+        return fse.getUUID();
+    }
 
-	/**
-	 * 閲囬泦閰嶇疆璇︽儏
-	 *
-	 * @param fse
-	 * @return
-	 */
-	@Override
-	public FieldSetEntity findCollectConfig(FieldSetEntity fse) throws BaseException {
-		return publicService.getFieldSetEntity(fse, false);
-	}
+    /**
+     * 閲囬泦閰嶇疆璇︽儏
+     *
+     * @param fse
+     * @return
+     */
+    @Override
+    public FieldSetEntity findCollectConfig(FieldSetEntity fse) throws BaseException {
+        return publicService.getFieldSetEntity(fse, false);
+    }
 
-	/**
-	 * 閲囬泦閰嶇疆鍒犻櫎
-	 *
-	 * @param fse
-	 */
-	@Override
-	@Transactional
-	public void delCollectConfig(FieldSetEntity fse) throws BaseException {
-		String uuids = fse.getUUID();
-		String[] split = uuids.split(",");
-		DataTableEntity dt = getBaseDao().listTable("product_sys_timed_task", "uuid in " + "(SELECT time_task_uuid FROM  product_sys_data_collect WHERE " + BaseUtil.buildQuestionMarkFilter("uuid", split, true) + ")");
-		if (!DataTableEntity.isEmpty(dt)) {
-			for (int i = 0; i < dt.getRows(); i++) {
-				cancelTimeTask(dt.getFieldSetEntity(i));
-			}
-		}
-		for (String s : split) {
-			cancelDelRecordConfig(1, s);
-		}
-		publicService.delete(fse);
-	}
+    /**
+     * 閲囬泦閰嶇疆鍒犻櫎
+     *
+     * @param fse
+     */
+    @Override
+    @Transactional
+    public void delCollectConfig(FieldSetEntity fse) throws BaseException {
+        String uuids = fse.getUUID();
+        String[] split = uuids.split(",");
+        DataTableEntity dt = getBaseDao().listTable("product_sys_timed_task", "uuid in " + "(SELECT time_task_uuid FROM  product_sys_data_collect WHERE " + BaseUtil.buildQuestionMarkFilter("uuid", split, true) + ")");
+        if (!DataTableEntity.isEmpty(dt)) {
+            for (int i = 0; i < dt.getRows(); i++) {
+                cancelTimeTask(dt.getFieldSetEntity(i));
+            }
+        }
+        for (String s : split) {
+            cancelDelRecordConfig(1, s);
+        }
+        publicService.delete(fse);
+    }
 
-	/**
-	 * 鎻愬彇閰嶇疆淇濆瓨
-	 *
-	 * @param fse
-	 * @return
-	 */
-	@Override
-	@Transactional
-	public String saveExtractConfig(FieldSetEntity fse) throws BaseException {
-		boolean isAdd = !StringUtils.isEmpty(fse.getUUID());
-		commonSave(fse, (fs) -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "DE:" + fs.getString("extract_name"), fs.getBoolean(CmnConst.IS_USED), fs.getString("extract_time"), "dataExtractService.startExtractData('" + fs.getUUID() + "')"));
-		saveDelRecordConfig(2, fse.getUUID());
-		if ("ch-kt".equals(dataSystemName)) {
-			//涓绘湇鍔′繚瀛樺悗鍒嗗彂鍒板瓙鏈嶅姟涓�
-			fse.setValue(CoreConst.SYSTEM_DATA_OPERATE_TYPE, isAdd ? "add" : "update");
-			mesExternalService.remoteSaveExtractConfig(fse);
-		}
-		return fse.getUUID();
-	}
+    /**
+     * 鎻愬彇閰嶇疆淇濆瓨
+     *
+     * @param fse
+     * @return
+     */
+    @Override
+    @Transactional
+    public String saveExtractConfig(FieldSetEntity fse) throws BaseException {
+        boolean isAdd = !StringUtils.isEmpty(fse.getUUID());
+        commonSave(fse, (fs) -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "DE:" + fs.getString("extract_name"), fs.getBoolean(CmnConst.IS_USED), fs.getString("extract_time"), "dataExtractService.startExtractData('" + fs.getUUID() + "')"));
+        saveDelRecordConfig(2, fse.getUUID());
+        if ("ch-kt".equals(dataSystemName)) {
+            //涓绘湇鍔′繚瀛樺悗鍒嗗彂鍒板瓙鏈嶅姟涓�
+            fse.setValue(CoreConst.SYSTEM_DATA_OPERATE_TYPE, isAdd ? "add" : "update");
+            mesExternalService.remoteSaveExtractConfig(fse);
+        }
+        return fse.getUUID();
+    }
 
-	/**
-	 * 鎻愬彇閰嶇疆鏌ヨ
-	 *
-	 * @param fse
-	 * @return
-	 */
-	@Override
-	public FieldSetEntity findExtractConfig(FieldSetEntity fse) throws BaseException {
-		return publicService.getFieldSetEntity(fse, true);
-	}
+    /**
+     * 鎻愬彇閰嶇疆鏌ヨ
+     *
+     * @param fse
+     * @return
+     */
+    @Override
+    public FieldSetEntity findExtractConfig(FieldSetEntity fse) throws BaseException {
+        return publicService.getFieldSetEntity(fse, true);
+    }
 
-	/**
-	 * 鎻愬彇閰嶇疆鍒犻櫎
-	 *
-	 * @param fse
-	 */
-	@Override
-	@Transactional
-	public void delExtractConfig(FieldSetEntity fse) throws BaseException {
-		String uuids = fse.getUUID();
-		String[] split = uuids.split(",");
-		DataTableEntity dt = getBaseDao().listTable("product_sys_timed_task", "uuid in " + "(SELECT time_task_uuid FROM  product_sys_data_extract_config WHERE " + BaseUtil.buildQuestionMarkFilter("uuid", split, true) + ")");
-		if (!DataTableEntity.isEmpty(dt)) {
-			for (int i = 0; i < dt.getRows(); i++) {
-				cancelTimeTask(dt.getFieldSetEntity(i));
-			}
-		}
-		for (String s : split) {
-			cancelDelRecordConfig(2, s);
-		}
-		publicService.delete(fse);
-	}
+    /**
+     * 鎻愬彇閰嶇疆鍒犻櫎
+     *
+     * @param fse
+     */
+    @Override
+    @Transactional
+    public void delExtractConfig(FieldSetEntity fse) throws BaseException {
+        String uuids = fse.getUUID();
+        String[] split = uuids.split(",");
+        DataTableEntity dt = getBaseDao().listTable("product_sys_timed_task", "uuid in " + "(SELECT time_task_uuid FROM  product_sys_data_extract_config WHERE " + BaseUtil.buildQuestionMarkFilter("uuid", split, true) + ")");
+        if (!DataTableEntity.isEmpty(dt)) {
+            for (int i = 0; i < dt.getRows(); i++) {
+                cancelTimeTask(dt.getFieldSetEntity(i));
+            }
+        }
+        for (String s : split) {
+            cancelDelRecordConfig(2, s);
+        }
+        publicService.delete(fse);
+    }
 
-	/**
-	 * 褰掓。閰嶇疆淇濆瓨
-	 *
-	 * @param fse
-	 * @return
-	 */
-	@Override
-	@Transactional
-	public String saveArchivingConfig(FieldSetEntity fse) throws BaseException {
-		String sourceDataSource = fse.getString("source_data_source");
-		String targetDataSource = fse.getString("target_data_source");
-		String[] dataSource = (sourceDataSource + "," + targetDataSource).split(",");
-		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT db_type num FROM product_sys_data_sync_manager WHERE ");
-		sql.append(BaseUtil.buildQuestionMarkFilter("uuid", dataSource.length, true));
-		sql.append(" GROUP BY db_type ");
-		DataTableEntity dt = getBaseDao().listTable(sql.toString(), dataSource);
-		if (DataTableEntity.isEmpty(dt)) {
-			throw new BaseException(ErrorCode.VERIFY_DATA_SOURCE_TYPE_FAIL);
-		}
+    /**
+     * 褰掓。閰嶇疆淇濆瓨
+     *
+     * @param fse
+     * @return
+     */
+    @Override
+    @Transactional
+    public String saveArchivingConfig(FieldSetEntity fse) throws BaseException {
+        String sourceDataSource = fse.getString("source_data_source");
+        String targetDataSource = fse.getString("target_data_source");
+        String[] dataSource = (sourceDataSource + "," + targetDataSource).split(",");
+        StringBuilder sql = new StringBuilder();
+        sql.append("SELECT db_type num FROM product_sys_data_sync_manager WHERE ");
+        sql.append(BaseUtil.buildQuestionMarkFilter("uuid", dataSource.length, true));
+        sql.append(" GROUP BY db_type ");
+        DataTableEntity dt = getBaseDao().listTable(sql.toString(), dataSource);
+        if (DataTableEntity.isEmpty(dt)) {
+            throw new BaseException(ErrorCode.VERIFY_DATA_SOURCE_TYPE_FAIL);
+        }
         /* 2022骞�10鏈�10鏃� 15:33:47 6c 闇�瑕佽兘澶熸敮鎸佷笉鍚屾暟鎹簱闂寸殑褰掓。
         if (dt.getRows() != 1) {
             throw new BaseException(ErrorCode.DATA_SOURCE_INCONFORMITY);
         }*/
-		if (StringUtils.equalsAny(dt.getString(0, "num"), "0", "1", "5")) {
-			boolean isAdd = !StringUtils.isEmpty(fse.getUUID());
-			commonSave(fse, (fs) -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "DA:" + fs.getString("name"), fs.getBoolean(CmnConst.IS_USED), fs.getString("execute_time"), "dataArchivingService.dataArchivingEntry('" + fs.getUUID() + "')"));
-			if ("ch-kt".equals(dataSystemName)) {
-				//涓绘湇鍔′繚瀛樺悗鍒嗗彂鍒板瓙鏈嶅姟涓�
-				fse.setValue(CoreConst.SYSTEM_DATA_OPERATE_TYPE, isAdd ? "add" : "update");
-				mesExternalService.remoteSaveArchiveConfig(fse);
-			}
-		}
+        if (StringUtils.equalsAny(dt.getString(0, "num"), "0", "1", "5")) {
+            boolean isAdd = !StringUtils.isEmpty(fse.getUUID());
+            commonSave(fse, (fs) -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "DA:" + fs.getString("name"), fs.getBoolean(CmnConst.IS_USED), fs.getString("execute_time"), "dataArchivingService.dataArchivingEntry('" + fs.getUUID() + "')"));
+            if ("ch-kt".equals(dataSystemName)) {
+                //涓绘湇鍔′繚瀛樺悗鍒嗗彂鍒板瓙鏈嶅姟涓�
+                fse.setValue(CoreConst.SYSTEM_DATA_OPERATE_TYPE, isAdd ? "add" : "update");
+                mesExternalService.remoteSaveArchiveConfig(fse);
+            }
+        }
 
-		return fse.getUUID();
-	}
+        return fse.getUUID();
+    }
 
-	/**
-	 * 褰掓。閰嶇疆璇︽儏
-	 *
-	 * @param fse
-	 * @return
-	 */
-	@Override
-	public FieldSetEntity findArchivingConfig(FieldSetEntity fse) throws BaseException {
-		return publicService.getFieldSetEntity(fse, false);
-	}
+    /**
+     * 褰掓。閰嶇疆璇︽儏
+     *
+     * @param fse
+     * @return
+     */
+    @Override
+    public FieldSetEntity findArchivingConfig(FieldSetEntity fse) throws BaseException {
+        return publicService.getFieldSetEntity(fse, false);
+    }
 
-	/**
-	 * 褰掓。閰嶇疆鍒犻櫎
-	 *
-	 * @param fse
-	 */
-	@Override
-	@Transactional
-	public void delArchivingConfig(FieldSetEntity fse) throws BaseException {
-		String uuids = fse.getUUID();
-		String[] split = uuids.split(",");
-		DataTableEntity dt = getBaseDao().listTable("product_sys_timed_task", "uuid in " + "(SELECT time_task_uuid FROM  product_sys_data_archiving_config WHERE " + BaseUtil.buildQuestionMarkFilter("uuid", split, true) + ")");
-		if (!DataTableEntity.isEmpty(dt)) {
-			for (int i = 0; i < dt.getRows(); i++) {
-				cancelTimeTask(dt.getFieldSetEntity(i));
-			}
-		}
-		publicService.delete(fse);
-	}
+    /**
+     * 褰掓。閰嶇疆鍒犻櫎
+     *
+     * @param fse
+     */
+    @Override
+    @Transactional
+    public void delArchivingConfig(FieldSetEntity fse) throws BaseException {
+        String uuids = fse.getUUID();
+        String[] split = uuids.split(",");
+        DataTableEntity dt = getBaseDao().listTable("product_sys_timed_task", "uuid in " + "(SELECT time_task_uuid FROM  product_sys_data_archiving_config WHERE " + BaseUtil.buildQuestionMarkFilter("uuid", split, true) + ")");
+        if (!DataTableEntity.isEmpty(dt)) {
+            for (int i = 0; i < dt.getRows(); i++) {
+                cancelTimeTask(dt.getFieldSetEntity(i));
+            }
+        }
+        publicService.delete(fse);
+    }
 
-	/**
-	 * 璁㈠崟鏁版嵁楠岃瘉閰嶇疆淇濆瓨
-	 *
-	 * @param fse
-	 * @return
-	 */
-	@Transactional
-	@Override
-	public String saveOrderDataVerification(FieldSetEntity fse) {
-		fse.setValue(CmnConst.UUID, "1");
-		commonSave(fse, fs -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "璁㈠崟鏁版嵁鍚屾楠岃瘉", fs.getBoolean(CmnConst.IS_USED), fs.getString("frequency_verification"), "orderDataValidationService.verificationEntryPoint"));
-		return fse.getUUID();
-	}
+    /**
+     * 璁㈠崟鏁版嵁楠岃瘉閰嶇疆淇濆瓨
+     *
+     * @param fse
+     * @return
+     */
+    @Transactional
+    @Override
+    public String saveOrderDataVerification(FieldSetEntity fse) {
+        fse.setValue(CmnConst.UUID, "1");
+        commonSave(fse, fs -> createTimeTask(fs.getString(CmnConst.TIME_TASK_UUID), "璁㈠崟鏁版嵁鍚屾楠岃瘉", fs.getBoolean(CmnConst.IS_USED), fs.getString("frequency_verification"), "orderDataValidationService.verificationEntryPoint"));
+        return fse.getUUID();
+    }
 
-	/**
-	 * 淇濆瓨鍒犻櫎璁板綍閰嶇疆
-	 *
-	 * @param type
-	 * @param uuid
-	 */
-	public void saveDelRecordConfig(int type, String uuid) {
-		String sql = getDelRecordSql(type);
+    /**
+     * 淇濆瓨鍒犻櫎璁板綍閰嶇疆
+     *
+     * @param type
+     * @param uuid
+     */
+    public void saveDelRecordConfig(int type, String uuid) {
+        String sql = getDelRecordSql(type);
 
-		DataTableEntity dt = getBaseDao().listTable(sql, new Object[]{uuid, dataSystemName});
-		for (int i = 0; i < dt.getRows(); i++) {
-			FieldSetEntity fse = dt.getFieldSetEntity(i);
-			fse.setTableName(CmnConst.PRODUCT_MES_DEL_RECORD_CONFIG);
-			fse.setValue("delete_sync_content", 1);
-			syncDelRecordService.createTrigger(fse);
-		}
+        DataTableEntity dt = getBaseDao().listTable(sql, new Object[]{uuid, dataSystemName});
+        for (int i = 0; i < dt.getRows(); i++) {
+            FieldSetEntity fse = dt.getFieldSetEntity(i);
+            fse.setTableName(CmnConst.PRODUCT_MES_DEL_RECORD_CONFIG);
+            fse.setValue("delete_sync_content", 1);
+            syncDelRecordService.createTrigger(fse);
+        }
 
-	}
+    }
 
-	private String getDelRecordSql(int type) {
-		StringBuffer sql = new StringBuffer();
-		sql.append("\n SELECT ");
-		sql.append("\n c.uuid, ");
-		sql.append("\n c.random_suffix,");
-		sql.append("\n collect.uuid config_uuid, ");
-		sql.append("\n collect.data_source, ");
-		sql.append("\n extract.extract_target_source target_data_source, ");
-		sql.append("\n collect.auto_field master_key_field, ");
-		sql.append("\n collect.source_table table_name, ");
-		sql.append("\n collect.id collect_id,2 del_type, ");
-		sql.append("\n extract.collect_source_field collect_field,");
-		sql.append("\n extract.extract_unique_field pre_master_field");
-		sql.append("\n FROM ");
-		sql.append("\n product_sys_data_collect collect ");
-		sql.append("\n JOIN product_sys_data_extract_config extract ON upper( case when length(collect.target_table)>0 then collect.target_table else collect.source_table end ) = upper( extract.extract_source_table ) ");
-		sql.append("\n LEFT JOIN product_mes_del_record_config c ON collect.uuid=c.config_uuid and c.del_type=2 ");
-		sql.append(" WHERE ");
-		if (1 == type) {
-			//閲囬泦
-			sql.append("\n collect.uuid=? ");
-		} else {
-			//鎻愬彇
-			sql.append("\n extract.uuid=? ");
-		}
-		sql.append(" and  collect.id like concat(?,'%')");
-		return sql.toString();
-	}
+    private String getDelRecordSql(int type) {
+        StringBuffer sql = new StringBuffer();
+        sql.append("\n SELECT ");
+        sql.append("\n c.uuid, ");
+        sql.append("\n c.random_suffix,");
+        sql.append("\n collect.uuid config_uuid, ");
+        sql.append("\n collect.data_source, ");
+        sql.append("\n extract.extract_target_source target_data_source, ");
+        sql.append("\n collect.auto_field master_key_field, ");
+        sql.append("\n collect.source_table table_name, ");
+        sql.append("\n collect.id collect_id,2 del_type, ");
+        sql.append("\n extract.collect_source_field collect_field,");
+        sql.append("\n extract.extract_unique_field pre_master_field");
+        sql.append("\n FROM ");
+        sql.append("\n product_sys_data_collect collect ");
+        sql.append("\n JOIN product_sys_data_extract_config extract ON upper( case when length(collect.target_table)>0 then collect.target_table else collect.source_table end ) = upper( extract.extract_source_table ) ");
+        sql.append("\n LEFT JOIN product_mes_del_record_config c ON collect.uuid=c.config_uuid and c.del_type=2 ");
+        sql.append(" WHERE ");
+        if (1 == type) {
+            //閲囬泦
+            sql.append("\n collect.uuid=? ");
+        } else {
+            //鎻愬彇
+            sql.append("\n extract.uuid=? ");
+        }
+        sql.append(" and  collect.id like concat(?,'%')");
+        return sql.toString();
+    }
 
-	public void cancelDelRecordConfig(int type, String uuid) {
-		FieldSetEntity fieldSetEntity = new FieldSetEntity();
-		fieldSetEntity.setTableName("temp");
-		if (type == 1) {
-			fieldSetEntity.setValue("uuid", uuid);
-			syncDelRecordService.deleteTrigger(fieldSetEntity);
-		} else {
-			//鎻愬彇
-			DataTableEntity dt = getBaseDao().listTable(CmnConst.PRODUCT_SYS_DATA_COLLECT, "UPPER(source_table) in (select upper(extract_source_table) from product_sys_data_extract_config where uuid =?) ", new Object[]{uuid});
-			if (DataTableEntity.isEmpty(dt)) {
-				return;
-			}
-			Object[] uuids = dt.getUuids();
-			for (Object o : uuids) {
-				fieldSetEntity.setValue("uuid", o);
-				syncDelRecordService.deleteTrigger(fieldSetEntity);
-			}
-		}
+    public void cancelDelRecordConfig(int type, String uuid) {
+        FieldSetEntity fieldSetEntity = new FieldSetEntity();
+        fieldSetEntity.setTableName("temp");
+        if (type == 1) {
+            fieldSetEntity.setValue("uuid", uuid);
+            syncDelRecordService.deleteTrigger(fieldSetEntity);
+        } else {
+            //鎻愬彇
+            DataTableEntity dt = getBaseDao().listTable(CmnConst.PRODUCT_SYS_DATA_COLLECT, "UPPER(source_table) in (select upper(extract_source_table) from product_sys_data_extract_config where uuid =?) ", new Object[]{uuid});
+            if (DataTableEntity.isEmpty(dt)) {
+                return;
+            }
+            Object[] uuids = dt.getUuids();
+            for (Object o : uuids) {
+                fieldSetEntity.setValue("uuid", o);
+                syncDelRecordService.deleteTrigger(fieldSetEntity);
+            }
+        }
 
-	}
+    }
 }

--
Gitblit v1.9.2