|
@@ -22,10 +22,11 @@ import com.example.opc_da.timer.QuartzTimerFactory;
|
|
|
import com.example.opc_da.util.InFluxDBServiceUtil;
|
|
|
import com.example.opc_da.util.QueryServiceUtil;
|
|
|
import com.example.opc_da.util.RedisUtil;
|
|
|
+import com.example.opc_da.util.UserUtil;
|
|
|
import com.example.opc_da.util.bucketType.BucketTypeFactory;
|
|
|
import com.example.opc_da.util.calculate.CalculateDataFactory;
|
|
|
import com.example.opc_da.validate.reportDataPolicy.ReportDataPolicyValidateFactory;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import lombok.AllArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
@@ -35,43 +36,39 @@ import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
@Transactional
|
|
|
+@AllArgsConstructor
|
|
|
public class ReportDataPolicyServiceImpl implements ReportDataPolicyService {
|
|
|
|
|
|
private final String timePattern = "yyyy-MM-dd HH:mm:ss";
|
|
|
private final String timeStampPattern = "yyyy-MM-dd HH:mm:ss.SSS";
|
|
|
|
|
|
- @Autowired
|
|
|
- private ReportDataPolicyDao reportDataPolicyDao;
|
|
|
+ private final ReportDataPolicyDao reportDataPolicyDao;
|
|
|
|
|
|
- @Autowired
|
|
|
- private QueryServiceUtil queryServiceUtil;
|
|
|
+ private final QueryServiceUtil queryServiceUtil;
|
|
|
|
|
|
- @Autowired
|
|
|
- private InFluxDBServiceUtil inFluxDBServiceUtil;
|
|
|
+ private final InFluxDBServiceUtil inFluxDBServiceUtil;
|
|
|
|
|
|
- @Autowired
|
|
|
- private ReportTableDao reportTableDao;
|
|
|
+ private final ReportTableDao reportTableDao;
|
|
|
|
|
|
- @Autowired
|
|
|
- private RedisUtil redisUtil;
|
|
|
+ private final RedisUtil redisUtil;
|
|
|
|
|
|
- @Autowired
|
|
|
- private FreReportDataPolicyTaskRegister freReportDataPolicyTaskRegister;
|
|
|
+ private final UserUtil userUtil;
|
|
|
|
|
|
- @Autowired
|
|
|
- private ChangeReportDataPolicyTaskRegister changeReportDataPolicyTaskRegister;
|
|
|
+ private final FreReportDataPolicyTaskRegister freReportDataPolicyTaskRegister;
|
|
|
|
|
|
- @Autowired
|
|
|
- private EventReportDataPolicyTaskRegister eventReportDataPolicyTaskRegister;
|
|
|
+ private final ChangeReportDataPolicyTaskRegister changeReportDataPolicyTaskRegister;
|
|
|
+
|
|
|
+ private final EventReportDataPolicyTaskRegister eventReportDataPolicyTaskRegister;
|
|
|
|
|
|
@Override
|
|
|
public synchronized Result addReportDataPolicy(ReportDataPolicy reportDataPolicy) {
|
|
|
- ReportDataPolicy oldReportDataPolicy = reportDataPolicyDao.getReportDataPolicyByName(reportDataPolicy.getReportDataPolicyName());
|
|
|
+ String currentUserId = userUtil.getCurrentUserId();
|
|
|
+ ReportDataPolicy oldReportDataPolicy = reportDataPolicyDao.getReportDataPolicyByName(currentUserId, reportDataPolicy.getReportDataPolicyName());
|
|
|
|
|
|
Integer readMode = reportDataPolicy.getReadMode();
|
|
|
//使用策略模式加工厂模式,验证传入的报表策略是否正确
|
|
|
ReportDataPolicyValidateFactory.getReportDataPolicyValidate(readMode).Validate(reportDataPolicy);
|
|
|
-
|
|
|
+ reportDataPolicy.setUserId(currentUserId);
|
|
|
if (Blank.isNotEmpty(oldReportDataPolicy)) {
|
|
|
return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已经存在策略名称了,请更改名称");
|
|
|
}
|
|
@@ -121,8 +118,9 @@ public class ReportDataPolicyServiceImpl implements ReportDataPolicyService {
|
|
|
if (reportDataPolicy1.getRunState() == ConstantStr.START_UP) {
|
|
|
return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "此报表数据策略现在处于运行中,不允许修改");
|
|
|
}
|
|
|
+ String currentUserId = userUtil.getCurrentUserId();
|
|
|
ReportDataPolicy oldReportDataPolicy = reportDataPolicyDao.getReportDataPolicyByNameNoId(
|
|
|
- reportDataPolicy.getId(), reportDataPolicy.getReportDataPolicyName());
|
|
|
+ reportDataPolicy.getId(), currentUserId, reportDataPolicy.getReportDataPolicyName());
|
|
|
|
|
|
ReportDataPolicyValidateFactory.getReportDataPolicyValidate(reportDataPolicy.getReadMode()).Validate(reportDataPolicy);
|
|
|
if (Blank.isNotEmpty(oldReportDataPolicy)) {
|
|
@@ -167,9 +165,10 @@ public class ReportDataPolicyServiceImpl implements ReportDataPolicyService {
|
|
|
@Override
|
|
|
public Result getReportDataPolicyPage(Integer page, Integer limit) {
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
- Integer count = reportDataPolicyDao.getReportDataPolicyCount();
|
|
|
+ String currentUserId = userUtil.getCurrentUserId();
|
|
|
+ Integer count = reportDataPolicyDao.getReportDataPolicyCount(currentUserId);
|
|
|
Integer statNum = (page - 1) * limit;
|
|
|
- List<ReportDataPolicy> reportDataPolicyList = reportDataPolicyDao.getReportDataPolicyPage(statNum, limit);
|
|
|
+ List<ReportDataPolicy> reportDataPolicyList = reportDataPolicyDao.getReportDataPolicyPage(currentUserId, statNum, limit);
|
|
|
jsonObject.put("count", count);
|
|
|
jsonObject.put("reportDataPolicyList", reportDataPolicyList);
|
|
|
return Result.ok(jsonObject);
|