shaohongbo 3 gadi atpakaļ
vecāks
revīzija
3ec141696c

+ 1 - 1
src/main/java/com/persagy/apm/diagnose/feign/client/AlarmServiceClient.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 
-@FeignClient(name = "energy-alarm-service")
+@FeignClient(name = "energy_alarm_service")
 public interface AlarmServiceClient {
 
     @PostMapping("/projectAlarmRuleObjRels/query")

+ 5 - 2
src/main/java/com/persagy/apm/diagnose/indicatorrecord/service/impl/MonitorIndicatorRecordServiceImpl.java

@@ -354,6 +354,9 @@ public class MonitorIndicatorRecordServiceImpl extends ServiceImpl<MonitorIndica
                 }
 
                 Date lastComputeTime = objId_indicatorIdAndComputeTIme.get(infocode);
+                if(lastComputeTime==null){
+                    lastComputeTime=DateUtils.str2Date("2021-09-02 00:00:00",DateUtils.SDF_SECOND);
+                }
                 Date computeEndTime = DateUtils.addDays(lastComputeTime, roundDays);
 
                 String indicatorId = getIndicatorIdFromInfocode(infocode);
@@ -411,7 +414,6 @@ public class MonitorIndicatorRecordServiceImpl extends ServiceImpl<MonitorIndica
                 continue;
             }
 
-
             Map<Date, List<MonitorIndicatorRecord>> timeAndIndicatorDataList = list.stream().collect(Collectors.groupingBy(MonitorIndicatorRecord::getDate, Collectors.toList()));
             for (Map.Entry<Date, List<MonitorIndicatorRecord>> dateListEntry : timeAndIndicatorDataList.entrySet()) {
                 List<MonitorIndicatorRecord> value = dateListEntry.getValue();
@@ -469,7 +471,8 @@ public class MonitorIndicatorRecordServiceImpl extends ServiceImpl<MonitorIndica
         ConfigItemDataSendTimeDTO sendTimeDTO = (ConfigItemDataSendTimeDTO) redisUtil.hget(RedisUtil.PROJECT_ITEM_SEND_TIME + ":" + projectDTO.getProjectId(), alarmConfigItem.getId());
         if (sendTimeDTO == null) {
             //第一次发送
-            sendTimeDTO = ConfigItemDataSendTimeDTO.builder().objId(alarmConfigItem.getObjId()).configItemid(alarmConfigItem.getId()).lastSendTime(DateUtils.getStartTimeOfDay(new Date())).build();
+//            sendTimeDTO = ConfigItemDataSendTimeDTO.builder().objId(alarmConfigItem.getObjId()).configItemid(alarmConfigItem.getId()).lastSendTime(DateUtils.getStartTimeOfDay(new Date())).build();
+            sendTimeDTO = ConfigItemDataSendTimeDTO.builder().objId(alarmConfigItem.getObjId()).configItemid(alarmConfigItem.getId()).lastSendTime(DateUtils.str2Date("2021-09-02 00:00:00",DateUtils.SDF_SECOND)).build();
         }
         return sendTimeDTO;
     }

+ 2 - 2
src/main/java/com/persagy/apm/diagnose/timerecord/model/CalculateTimeRecord.java

@@ -13,10 +13,10 @@ import java.util.Date;
  * @author lixing
  * @version V1.0 2021-09-10 00:13:10
  */
-@EqualsAndHashCode(callSuper = true)
+
 @Data
 @ApiModel(description = "监测指标计算时间")
-public class CalculateTimeRecord extends AuditableEntity<CalculateTimeRecord> implements Serializable {
+public class CalculateTimeRecord  implements Serializable {
     private static final long serialVersionUID = -77453694266690779L;
 
     @ApiModelProperty("项目id")

+ 8 - 8
src/main/java/com/persagy/apm/diagnose/timerecord/service/impl/CalculateTimeRecordServiceImpl.java

@@ -39,7 +39,7 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
         // 设置默认值
         setDefaultValue(calculateTimeRecord);
         save(calculateTimeRecord);
-        return calculateTimeRecord.getId();
+        return null;
     }
     
     /**
@@ -50,7 +50,7 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
      * @version V1.0 2021/3/12 12:29 下午
      */
     private void setDefaultValue(CalculateTimeRecord calculateTimeRecord) {
-        calculateTimeRecord.setCreator(AppContext.getContext().getAccountId());
+//        calculateTimeRecord.setCreator(AppContext.getContext().getAccountId());
         // todo 其他默认的属性
         
     }
@@ -80,7 +80,7 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
     public void updateCalculateTimeRecord(UpdateCalculateTimeRecordDTO updateCalculateTimeRecordDTO) {
         CalculateTimeRecord calculateTimeRecord = getById(updateCalculateTimeRecordDTO.getId());
         calculateTimeRecord = ConvertCalculateTimeRecordTool.INSTANCE.convertUpdateDto2Entity(calculateTimeRecord, updateCalculateTimeRecordDTO);
-        calculateTimeRecord.setModifier(AppContext.getContext().getAccountId());
+//        calculateTimeRecord.setModifier(AppContext.getContext().getAccountId());
         updateById(calculateTimeRecord);
     }
     
@@ -117,7 +117,7 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
         // 校验是否可删除
         CalculateTimeRecord calculateTimeRecord = checkDeletable(id);
 
-        calculateTimeRecord.setValid(ValidEnum.FALSE.getType());
+//        calculateTimeRecord.setValid(ValidEnum.FALSE.getType());
         updateById(calculateTimeRecord);
     }
     
@@ -130,9 +130,9 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
     @Override
     public List<CalculateTimeRecord> queryCalculateTimeRecordList(QueryCalculateTimeRecordDTO queryCalculateTimeRecordDTO) {
         QueryWrapper<CalculateTimeRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(CalculateTimeRecord.PROP_VALID, ValidEnum.TRUE.getType());
+//        queryWrapper.eq(CalculateTimeRecord.PROP_VALID, ValidEnum.TRUE.getType());
         // 默认按创建时间倒序排序
-        queryWrapper.orderBy(true, false, CalculateTimeRecord.PROP_CREATIONTIME);
+//        queryWrapper.orderBy(true, false, CalculateTimeRecord.PROP_CREATIONTIME);
         
         if (queryCalculateTimeRecordDTO != null) {
                                 
@@ -164,13 +164,13 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
     @Override
     public IPage<CalculateTimeRecord> pageQueryCalculateTimeRecord(PageQueryCalculateTimeRecordDTO pageQueryCalculateTimeRecordDTO) {
         QueryWrapper<CalculateTimeRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(CalculateTimeRecord.PROP_VALID, ValidEnum.TRUE.getType());
+//        queryWrapper.eq(CalculateTimeRecord.PROP_VALID, ValidEnum.TRUE.getType());
         // 这里认为pageQueryDTO是经过校验的,肯定包含分页信息
         IPage<CalculateTimeRecord> pageParam = new Page<>(pageQueryCalculateTimeRecordDTO.getPage(), pageQueryCalculateTimeRecordDTO.getSize(),true);
         // 排序信息
         if(CollectionUtils.isEmpty(pageQueryCalculateTimeRecordDTO.getOrders())){
             // 默认按创建时间倒序排序
-            queryWrapper.orderBy(true, false, CalculateTimeRecord.PROP_CREATIONTIME);
+//            queryWrapper.orderBy(true, false, CalculateTimeRecord.PROP_CREATIONTIME);
         }else {
             List<Sort> orders = pageQueryCalculateTimeRecordDTO.getOrders();
             for(Sort sort: orders) {