diff --git a/yem-base/yem-base-common/src/main/java/yem/base/common/module/meta/task/FieldKeyStoreUpdateTaskPlugin.java b/yem-base/yem-base-common/src/main/java/yem/base/common/module/meta/task/FieldKeyStoreUpdateTaskPlugin.java index cd8dc32..09c52c9 100644 --- a/yem-base/yem-base-common/src/main/java/yem/base/common/module/meta/task/FieldKeyStoreUpdateTaskPlugin.java +++ b/yem-base/yem-base-common/src/main/java/yem/base/common/module/meta/task/FieldKeyStoreUpdateTaskPlugin.java @@ -5,9 +5,12 @@ import kd.bos.context.RequestContext; import kd.bos.dataentity.OperateOption; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; +import kd.bos.entity.operate.result.OperationResult; import kd.bos.entity.report.FilterInfo; import kd.bos.entity.report.ReportQueryParam; import kd.bos.exception.KDException; +import kd.bos.logging.Log; +import kd.bos.logging.LogFactory; import kd.bos.orm.ORM; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; @@ -37,11 +40,10 @@ public class FieldKeyStoreUpdateTaskPlugin extends AbstractTask implements Plugi String appkeys = (String) map.get("appkeys");// 应用标识拼接 if (YEM.isEmpty(bizcloudkey) || YEM.isEmpty(appkeys))return; String[] appkeyArray = appkeys.split(","); - for (int i = 0; i < appkeyArray.length; i++) { - String appkey = appkeyArray[i]; + for (String appkey : appkeyArray) { // 更新数据 try { - updateFieldKeyStore(bizcloudkey,appkey); + updateFieldKeyStore(bizcloudkey, appkey); } catch (Throwable e) { throw new KDException(e.getMessage()); } @@ -75,6 +77,7 @@ public class FieldKeyStoreUpdateTaskPlugin extends AbstractTask implements Plugi filters.addFilterItem("yem_fapp", appkey); Param.setFilter(filters); DataSet entityList = report.query(Param, null); + entityList = entityList.where(String.format("yem_appkey = '%s'", appkey)); DynamicObjectCollection entityCollection = ORM.create().toPlainDynamicObjectCollection(entityList); for (DynamicObject entity : entityCollection){ String yemEntityid = entity.getString("yem_entityid");// 表单ID @@ -114,11 +117,26 @@ public class FieldKeyStoreUpdateTaskPlugin extends AbstractTask implements Plugi } billIdList.add(yemEntityid); } + Log log = LogFactory.getLog(this.getClass()); // 删除 字段标识库 中的历史数据 - DeleteServiceHelper.delete("yem_base_fieldkeystore", + if (!billIdList.isEmpty()){ + DeleteServiceHelper.delete("yem_base_fieldkeystore", new QFilter[]{new QFilter("yem_entityid", QCP.in, billIdList)}); + log.info("字段标识库定时更新: 历史数据删除成功-"+billIdList.size()+"条"); + } // 保存最新的数据 - SaveServiceHelper.saveOperate("save","yem_base_fieldkeystore", - creatNewList.toArray(new DynamicObject[0]), OperateOption.create()); + if(!creatNewList.isEmpty()){ + OperationResult operationResult = SaveServiceHelper.saveOperate("save", + "yem_base_fieldkeystore", creatNewList.toArray(new DynamicObject[0]), + OperateOption.create()); + if (operationResult.isSuccess()){ + log.info("字段标识库定时更新: 更新数据成功-云标识:"+bizcloudkey+"应用标识:"+appkey+ + "数据:"+creatNewList.size()+"条"); + } else { + log.error("字段标识库定时更新: 更新数据失败-云标识:"+bizcloudkey+"应用标识:"+appkey+ + "数据:"+creatNewList.size()+"条; 失败原因:"+operationResult.getMessage()); + } + } + } } \ No newline at end of file