Merge remote-tracking branch 'origin/master'

许鹏程

2024-08-01 e6b95596eefeadf0fac3a8029af17e95e4f14c58

 src/main/java/com/product/administration/service/EarlyWarningManagerService.java

@@ -27,6 +27,7 @@
import com.product.org.admin.service.StaffManagerService;
import com.product.quartz.service.impl.SysJobService;
import com.product.util.BaseUtil;
import com.product.util.SystemParamReplace;
import org.apache.commons.codec.binary.Base64;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -225,10 +226,6 @@
         fseJob.setValue("status", 1);
         sysJobService.resumeJob(fse.getString("time_task_uuid"));
      }
      if (StringUtils.isEmpty(fse.getString("time_task_uuid"))) {
         sysJobService.insertJob(fseJob);
         fse.setValue("time_task_uuid", fseJob.getUUID());
      }
      fseJob.setValue("is_conceal", 1);
      fseJob.setValue("uuid", fse.getString("time_task_uuid"));
      sysJobService.updateJob(fseJob);
@@ -255,7 +252,6 @@

   /**
    * 批量修改预警时间
    *
    * @param fse
    * @return
    * @throws SchedulerException
@@ -309,12 +305,15 @@
      Map<String, String> fieldReference = new HashMap<>();    //组合相关字段的参照,tableName1fieldName-->referenceName
      StringBuilder concatField = new StringBuilder();        //组合相关字段,tableName1.fieldName tableName1fieldName
      earlyWarningServer.parseWarningContent(warnCondition, concatField, tableNameAndAlias, fieldAndAlias, fieldReference);
        // 替换系统参数
        warnCondition = SystemParamReplace.systemParamsReplace(warnCondition);

      //生成主子表关联SQL
      String relationSQL = earlyWarningServer.createTableRelation(tableNameAndAlias, mainTableName);

      StringBuilder serviceSQL = new StringBuilder();
      serviceSQL.append(" SELECT ");
      serviceSQL.append(concatField.subSequence(1, concatField.length()));
        serviceSQL.append(StringUtils.isEmpty(concatField) ? "*" : concatField.subSequence(1, concatField.length()));
      serviceSQL.append(" FROM ");
      serviceSQL.append(relationSQL);
      serviceSQL.append(" WHERE ");
@@ -382,7 +381,6 @@

   /**
    * 获取消息接收人
    *
    * @param parent_uuid
    * @return
    */
@@ -462,7 +460,6 @@

   /**
    * 预警反馈-列表
    *
    * @param fse
    * @return
    */