修改周期报表运行时，数据没生成问题，修改查询方案和用户id关联

industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/entity/DataScheme.java

@@ -11,6 +11,8 @@ public class DataScheme implements Serializable {
 
     //id
     private Integer id;
+    //用户id
+    private String userId;
     //方案名称
     private String schemeName;
     //趋势类型

industry-system/industry-da/src/main/java/com/example/opc_da/dao/DataSchemeDao.java

@@ -8,11 +8,11 @@ import java.util.List;
 @Repository
 public interface DataSchemeDao {
 
-    DataScheme getDataSchemeByName(String schemeName);
+    DataScheme getDataSchemeByName(String userId, String schemeName);
 
     Integer saveDataScheme(DataScheme dataScheme);
 
-    List<DataScheme> getAllDataScheme();
+    List<DataScheme> getAllDataScheme(String userId);
 
     DataScheme getDataSchemeById(Integer id);
 

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/ItemGroupServiceImpl.java

@@ -424,11 +424,12 @@ public class ItemGroupServiceImpl implements ItemGroupService {
 
     @Override
     public synchronized Result saveDataScheme(DataScheme dataScheme) {
+        String currentUserId = userUtil.getCurrentUserId();
         List<Integer> idList = dataScheme.getIdList();
         if (Blank.isEmpty(idList)) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "请选择数据项");
         }
-        DataScheme oldDataScheme = dataSchemeDao.getDataSchemeByName(dataScheme.getSchemeName());
+        DataScheme oldDataScheme = dataSchemeDao.getDataSchemeByName(currentUserId, dataScheme.getSchemeName());
         if (Blank.isNotEmpty(oldDataScheme)) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "已经存在此方案名了，请更换名称");
         }
@@ -441,7 +442,7 @@ public class ItemGroupServiceImpl implements ItemGroupService {
 
     @Override
     public Result getAllDataScheme() {
-        return Result.ok(dataSchemeDao.getAllDataScheme());
+        return Result.ok(dataSchemeDao.getAllDataScheme(userUtil.getCurrentUserId()));
     }
 
     @Override

industry-system/industry-da/src/main/java/com/example/opc_da/task/AutoTableQuartzTask.java

@@ -26,6 +26,8 @@ public class AutoTableQuartzTask extends QuartzJobBean {
         JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
         ReportTable reportTable = (ReportTable) jobDataMap.get("reportTable");
         log.info("自动报表,{},执行开始，时间为{}", reportTable, DateUtil.dateChangeStrYmdhmss(new Date()));
+        //这里需要将报表设置为运行状态
+        reportTable.setRunState(ConstantStr.START_UP);
         //生成一张新的子报表，并添加相应的日志，以及用户组授权
         String id = IdUtil.createSnowflake(1, 1).nextId() + "";
         asyncTask.addHaveKeyChReport(reportTable.getId(), id, ConstantStr.AUTOMATIC_GENERATE_REPORT,

industry-system/industry-da/src/main/java/com/example/opc_da/task/AutoTableTimerTask.java

@@ -23,6 +23,8 @@ public class AutoTableTimerTask extends PeriodTimerTask {
     protected void runInit(Map<String, Object> map) {
         ReportTable reportTable = (ReportTable) map.get("reportTable");
         log.info("自动报表,{},执行开始，时间为{}", reportTable.getId(), DateUtil.dateChangeStrYmdhmss(new Date()));
+        //这里需要将报表设置为运行状态
+        reportTable.setRunState(ConstantStr.START_UP);
         //生成一张新的子报表，并添加相应的日志，以及用户组授权
         String id = IdUtil.createSnowflake(1, 1).nextId() + "";
         asyncTask.addHaveKeyChReport(reportTable.getId(), id, ConstantStr.AUTOMATIC_GENERATE_REPORT,

industry-system/industry-da/src/main/resources/mapper/DataSchemeDao.xml

@@ -4,14 +4,14 @@
 
     <sql id="dataScheme">
         id
-        , scheme_name, trend_type, frequency_value, frequency_type, time_value, time_type, start_time, end_time, create_time
+        , user_id, scheme_name, trend_type, frequency_value, frequency_type, time_value, time_type, start_time, end_time, create_time
     </sql>
 
     <insert id="saveDataScheme" parameterType="com.example.opc_common.entity.DataScheme" useGeneratedKeys="true"
             keyProperty="id">
-        insert into t_data_scheme(scheme_name, trend_type, frequency_value, frequency_type, time_value,
+        insert into t_data_scheme(user_id, scheme_name, trend_type, frequency_value, frequency_type, time_value,
                                   time_type, start_time, end_time, create_time)
-            value (#{schemeName},#{trendType},#{frequencyValue},#{frequencyType},#{timeValue},
+            value (#{user_id},#{schemeName},#{trendType},#{frequencyValue},#{frequencyType},#{timeValue},
             #{timeType},#{startTime},#{endTime},now())
     </insert>
 
@@ -39,13 +39,15 @@
         select
         <include refid="dataScheme"/>
         from t_data_scheme
-        where scheme_name=#{schemeName}
+        where user_id=#{userId}
+        AND scheme_name=#{schemeName}
     </select>
 
     <select id="getAllDataScheme" resultType="com.example.opc_common.entity.DataScheme">
         select
         <include refid="dataScheme"/>
         from t_data_scheme
+        where user_id=#{userId}
         order by create_time desc
     </select>