Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

预留按月补招功能

Browse Source
This commit is contained in:
xuyang
2023-03-28 13:40:02 +08:00
parent 273e301a5b
commit 4f5c0a4a94
22 changed files with 168 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitRateDPO.java
View File

@@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -16,18 +17,21 @@ public class RStatLimitRateDPO {
/**
* 监测点ID合格率的变电站/装置/母线/线路序号
*/
@MppMultiId
@TableField(value = "my_index")
private String lineId;
/**
* 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示ABC三项总和，T’表示总
*/
@MppMultiId
@TableField(value = "phasic_type")
private String phasicType;
/**
* 合格率时间
*/
@MppMultiId
@TableField(value = "time_id")
private Date time;

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatLimitTargetDPO.java
View File

@@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import com.njcn.harmonic.pojo.po.LimitRate;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -17,18 +18,21 @@ public class RStatLimitTargetDPO{
/**
* 监测点ID合格率的变电站/装置/母线/线路序号
*/
@MppMultiId
@TableField(value = "my_index")
private String lineId;
/**
* 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’’M’表示ABC三项总和，T’表示总
*/
@MppMultiId
@TableField(value = "phasic_type")
private String phasicType;
/**
* 合格率时间
*/
@MppMultiId
@TableField(value = "time_id")
private Date time;

36
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
View File

@@ -5,10 +5,7 @@ import cn.hutool.core.date.DateUtil;
import com.njcn.device.pq.constant.Param;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
public class PublicUtil {
@@ -97,4 +94,35 @@ public class PublicUtil {
System.out.println ( PublicUtil.getNowQuarter ("2002-01-07"));
}
/**
* 根据当前年、月获取每一天日期
*/
public static List<String> getDayByMonth(int yearParam, int monthParam){
List<String> list = new ArrayList<>();
Calendar calendar = Calendar.getInstance(Locale.CHINA);
calendar.set(yearParam, monthParam-1, 1);
//年份
int year = calendar.get(Calendar.YEAR);
//月份
int month = calendar.get(Calendar.MONTH) + 1;
int day = calendar.getActualMaximum(Calendar.DATE);
for (int i = 1; i <= day; i++) {
String date=null;
if(month<10 && i<10){
date = year +"-0"+month+"-0"+i;
}
if(month<10 && i>=10){
date = year +"-0"+month+"-"+i;
}
if(month>=10 && i<10){
date = year +"-"+month+"-0"+i;
}
if(month>=10 && i>=10){
date = year +"-"+month+"-"+i;
}
list.add(date);
}
return list;
}
}