Browse Source

Merge remote-tracking branch 'origin/master'

zhongwei
yang_shj 1 year ago
parent
commit
5d9dcac540
  1. 38
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/CheckChartVo.java
  2. 43
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/MonPowerPercentageVo.java
  3. 26
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/TicketChartCell.java
  4. 22
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/TicketChartVo.java
  5. 648
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/constants/TicketConstants.java
  6. 8
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/ITicketInfoClient.java
  7. 5
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/TicketInfoClientFallback.java
  8. 6
      hzims-service/operational/pom.xml
  9. 3
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
  10. 19
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java
  11. 3
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IAreaMonthReportService.java
  12. 2389
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java
  13. 835
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/JFreeUtil.java
  14. 121
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/TimeUtils.java
  15. 15
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/feign/TicketInfoClient.java

38
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/CheckChartVo.java

@ -0,0 +1,38 @@
package com.hnac.hzims.operational.report.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author hx
*/
@Data
@ApiModel("缺陷统计表")
public class CheckChartVo {
@ApiModelProperty(value = "场站名称")
private String deptName;
@ApiModelProperty(value = "缺陷分类")
private String checkLevel;
@ApiModelProperty(value = "本月-发现缺陷")
private Integer findShortagesMon;
@ApiModelProperty(value = "本月-消缺数")
private Integer shortagesMon;
@ApiModelProperty(value = "本年-发现缺陷")
private Integer findShortagesYear;
@ApiModelProperty(value = "本年-消缺数")
private Integer shortagesYear;
@ApiModelProperty(value = "本年-消缺率")
private Double shortagesRate;
public CheckChartVo(String deptName, String checkLevel, Integer findShortagesMon, Integer shortagesMon, Integer findShortagesYear, Integer shortagesYear, Double shortagesRate) {
this.deptName=deptName;
this.checkLevel=checkLevel;
this.findShortagesMon=findShortagesMon;
this.shortagesMon=shortagesMon;
this.findShortagesYear=findShortagesYear;
this.shortagesYear=shortagesYear;
this.shortagesRate=shortagesRate;
}
}

43
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/MonPowerPercentageVo.java

@ -0,0 +1,43 @@
package com.hnac.hzims.operational.report.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author ysj
*/
@Data
@ApiModel(value = "水电站发电量同比数据对象")
public class MonPowerPercentageVo {
@ApiModelProperty(value = "机构Id")
private long deptId;
@ApiModelProperty(value = "机构名称")
private String deptName;
@ApiModelProperty(value = "设备名称")
private String deviceName;
@ApiModelProperty(value = "年计划发电量")
private double planPower;
@ApiModelProperty(value = "今年发电量")
private double powerYear;
@ApiModelProperty(value = "去年发电量")
private double powerYearBefore;
@ApiModelProperty(value = "当月发电量")
private double powerMon;
@ApiModelProperty(value = "上个月发电量")
private double powerMonBefore;
@ApiModelProperty(value = "去年当月发电量")
private double powerMonYearBefore;
@ApiModelProperty(value = "两年间:年发电量环比")
private double powerYearPercentage;
@ApiModelProperty(value = "两年间:月发电量环比")
private double powerMonPercentage;
@ApiModelProperty(value = "年计划完成率")
private double planPercentage;
}

26
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/TicketChartCell.java

@ -0,0 +1,26 @@
package com.hnac.hzims.operational.report.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author hx
*/
@Data
@ApiModel("两票统计单元格")
public class TicketChartCell {
@ApiModelProperty(value = "票的种类")
// 操作票:3:倒闸 4:开机 5:停机
// 工作票:6:第一种 7:第二种 8水力机械票
private String ticketType;
private String ticketName;
@ApiModelProperty(value = "本月数量")
private int ticketMon;
@ApiModelProperty(value = "本月合格率")
private double ticketMonPerc;
@ApiModelProperty(value = "本年数量")
private int ticketYear;
@ApiModelProperty(value = "本年合格率")
private double ticketYeaPercr;
}

22
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/TicketChartVo.java

@ -0,0 +1,22 @@
package com.hnac.hzims.operational.report.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author hx
*/
@Data
@ApiModel("两票统计表")
public class TicketChartVo {
@ApiModelProperty(value = "场站名称")
private String deptName;
@ApiModelProperty(value = "数量和合格率")
private List<TicketChartCell> chartCells;
}

648
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/constants/TicketConstants.java

@ -10,302 +10,354 @@ import java.util.Optional;
* @author hx
*/
public interface TicketConstants {
String APP_NAME = "hzims-ticket";
String TICKET_DATE_PATTERN = "yyyy年MM月dd日 HH时mm分";
Integer MATTER_FINISH_STATUS = 2;
String MEASURE_TYPE_ONE = "1";
String MEASURE_TYPE_TWO = "2";
String MEASURE_TYPE_THREE = "3";
String SIGNER_ROLE = "signer";
String LICENSOR_ROLE = "licensor";
/**工作票安措新增类型**/
String DUTY_PATTERN = "1";
String LICENSE_PATTERN = "2";
int MEASURE_NOT_EXECUTE = 1;
int MEASURE_EXECUTE = 2;
int MEASURE_NOT_COMPLETE = 3;
int MEASURE_COMPLETE = 4;
/**开票任务类型**/
enum TaskTypeEnum {
RCWH("1","日常维护"),
JXRW("2","检修任务"),
JXJH("3","检修计划")
;
@Getter
private String type;
@Getter
private String typeName;
TaskTypeEnum(String type, String typeName) {
this.type = type;
this.typeName = typeName;
}
}
/**
* 工作票流程环节
*/
enum WorkTicketFlowEnum {
/**开票**/
START("1","startEvent1","开票"),
/**签发人签发**/
SIGN("1","sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A","签发人签发"),
/**运行人员接收**/
RECEIVE("2","sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1","运行人员接收"),
/**运行人员布置安全措施**/
FIX_UP("3","sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708","运行人员布置安全措施"),
/**工作负责人确认安全措施**/
PRINCIPAL_CONFIRM_MEASURE("4","sid-5476EB52-438F-4C74-94FB-88A6EA6625EA","工作负责人确认安全措施"),
/**许可人许可**/
LICENCE("5","sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22","许可人许可"),
/**工作负责人确认工作内容执行**/
PRINCIPAL_CONFIRM_CONTENT("6","sid-5476EB52-438F-4C74-94FB-88A6EA6625EA","工作负责人确认工作内容执行"),
/**工作负责人确认工作票结束**/
PRINCIPAL_CONFIRM_END("7","sid-5476EB52-438F-4C74-94FB-88A6EA6625EA","工作负责人确认工作票结束、终结"),
/**工作负责人确认工作票结束**/
LICENSE_CONFIRM_END("8","sid-5476EB52-438F-4C74-94FB-88A6EA6625EA","工作负责人确认工作票结束、终结"),
/**签发人审核**/
SIGN_CONFIRM_DELAY("9","sid-5476EB52-438F-4C74-94FB-88A6EA6625EA","签发人审核"),
;
@Getter
private String status;
@Getter
private String flowId;
@Getter
private String segment;
WorkTicketFlowEnum(String status, String flowId, String segment) {
this.status = status;
this.flowId = flowId;
this.segment = segment;
}
public static WorkTicketFlowEnum getEnumByFlowId(String flowId) {
Optional<WorkTicketFlowEnum> workTicketFlowEnum = Arrays.stream(WorkTicketFlowEnum.class.getEnumConstants()).filter(flowEnum -> flowId.equals(flowEnum.flowId)).findFirst();
return workTicketFlowEnum.orElse(null);
}
}
enum WordFileNameEnum {
OPERATE("1","操作票"),
WORK("2","工作票"),
SWITCH_OFF("3","大隆水电站倒闸操作票模板"),
BOOT_UP("4","大隆水电站倒闸操作票模板"),
DOWNTIME("5","大隆水电站倒闸操作票模板"),
FIRST_WORK("6","大隆水电站电气第一种工作票模板"),
SECOND_WORK("7","大隆水电站电气第二种工作票模板"),
MECHANICAL_WORK("8","大隆水电站水力机械工作票模板"),
EMERGENCY_REPAIR("9","大隆水电站事故应急抢修单模板"),
NEW_FIRST_WORK("10","新电气第一种工作票模板"),
NEW_FIRST_WORK1("11","第一种工作票"),
;
@Getter
private String type;
@Getter
private String fileName;
WordFileNameEnum(String type, String fileName) {
this.type = type;
this.fileName = fileName;
}
public static String getFileNameByType(String type) {
Optional<WordFileNameEnum> optional = Arrays.stream(WordFileNameEnum.values()).filter(e->type.equals(e.getType())).findFirst();
return optional.map(e->e.fileName).orElse(null);
}
}
/**
* 工作票安全注意事项类型
*/
enum MeasureTypeEnum {
INIT_MEASURE("1","开票时的安全措施"),
SIGN_MEASURE("2","签发补充安全措施"),
LICENSE_MEASURE("3","许可人补充安全措施")
;
@Getter
private String type;
@Getter
private String describe;
MeasureTypeEnum(String type, String describe) {
this.type = type;
this.describe = describe;
}
}
@AllArgsConstructor
enum TicketCodePreEnum {
DQ_WORK("6","S-DQ","电气工作票","workTicketInfoService"),
DQ_OPERATE("3","YX-DQ","电气标准票","standardTicketInfoService")
;
@Getter
private String type;
@Getter
private String prefix;
@Getter
private String describe;
@Getter
private String service;
}
enum DelayStatusEnum {
PRINCIPAL_INITIATE(1,"负责人发起"),
LICENSOR_CONFIRM(2,"许可人确认"),
PRINCIPAL_CONFIRM(3,"负责人确认")
;
@Getter
private int status;
@Getter
private String describe;
DelayStatusEnum(int status, String describe) {
this.status = status;
this.describe = describe;
}
}
/**
* 安全措施/注意事项
*/
@AllArgsConstructor
enum SafetyMeasureStatusEnum{
NO_EXECUTE(1,"未执行"),
EXECUTED(2,"执行中"),
NO_FINISH(4,"执行中"),
FINISH(3,"已执行")
;
@Getter
private Integer status;
@Getter
private String describe;
/**根据status获取describe**/
public static String getDescribeByStatus(Integer status){
Optional<SafetyMeasureStatusEnum> optional = Arrays.stream(SafetyMeasureStatusEnum.values())
.filter(p -> status.equals(p.getStatus())).findFirst();
String describe = optional.isPresent() ? optional.get().getDescribe() : status.toString();
return describe;
}
}
/**
* 工作票处理流程
*/
enum FirstWorkTicketFlowEnum {
SIGN("sign","签发"),
LICENSE("license","许可人确认安全事项"),
RECEIVE("receive","负责人确认收到工作票"),
CONFIRM_MEASURE_PRINCIPAL("principalConfirm","负责人确认安全事项"),
CONFIRM_MEASURE_MEMBERS("membersConfirm","工作组员确认安全事项"),
FINISH("finish","工作票结束"),
END("end","工作票终结"),
PRINCIPAL_DELAY("principalDelay","负责人发起工作票延期"),
LICENSOR_DELAY("licensorDelay","许可人确认工作票延期"),
;
@Getter
private String code;
@Getter
private String describe;
FirstWorkTicketFlowEnum(String code, String describe) {
this.code = code;
this.describe = describe;
}
}
/**
* 标准票处理流程
*/
enum StandardTicketStatusEnum{
GUARDIAN_CONFIRM(1,"待监护人确认"),
PRINCIPAL_CONFIRM(2,"待值班负责人确认"),
END(3,"结束"),
TERMINATION(4,"终止")
;
@Getter
private Integer status;
@Getter
private String describe;
StandardTicketStatusEnum(Integer status, String describe) {
this.status = status;
this.describe = describe;
}
}
/**
* 工作票处理流程
*/
@AllArgsConstructor
enum FirstWorkTicketFlowStatusEnum {
SIGN(1,"待签发"),
RECEIVE(2,"待确认收到工作票"),
LICENSE(3,"待许可"),
CONFIRM_MEASURE_PRINCIPAL(4,"待负责人确认安全措施"),
CONFIRM_MEASURE_MEMBERS(5,"待班组成员确认安全措施"),
CONFIRM_OPERATION_SITUATION(6,"待确认执行情况"),
COMPLETE_PRINCIPAL_CONTENT(7,"待工作成员完成任务"),
CONFIRM_PRINCIPAL_CONTENT(8,"待负责人确认完成工作"),
CONFIRM_WORK_FINISH(9,"待确认工作结束"),
END(10,"待终结"),
FINISH(11,"完成"),
LICENSOR_DELAY(12,"待许可人确认工作票延期"),
PRINCIPAL_DELAY(13,"待负责人确认工作票延期"),
INVALID(14,"作废"),
OFFLINE(15,"线下开票"),
TERMINATION(16,"终止"),
UNDONE(17,"逾期未完成"),
OFFLINE_OPERATE(18,"线下执行任务"),
OFFLINE_LICENSE(19,"线下许可人许可"),
OFFLINE_END(20,"线下结束")
;
@Getter
private Integer status;
@Getter
private String describe;
/**
* 根据status获取对应枚举类
* @param status
* @return
*/
public static FirstWorkTicketFlowStatusEnum getFlowEnumByStatus(Integer status) {
Optional<FirstWorkTicketFlowStatusEnum> result = Arrays.stream(FirstWorkTicketFlowStatusEnum.class.getEnumConstants()).filter(
e -> status.equals(e.getStatus())
).findAny();
if(result.isPresent()){
return result.get();
}
return null;
}
}
/**
* 票据合格
*/
enum TicketQualifiedEnum{
Qualified(1,"合格"),
No_Qualified(2,"不合格");
@Getter
private Integer code;
@Getter
private String msg;
TicketQualifiedEnum(Integer code, String msg) {
this.code = code;
this.msg = msg;
}
}
String APP_NAME = "hzims-ticket";
String TICKET_DATE_PATTERN = "yyyy年MM月dd日 HH时mm分";
Integer MATTER_FINISH_STATUS = 2;
String MEASURE_TYPE_ONE = "1";
String MEASURE_TYPE_TWO = "2";
String MEASURE_TYPE_THREE = "3";
String SIGNER_ROLE = "signer";
String LICENSOR_ROLE = "licensor";
/**
* 工作票安措新增类型
**/
String DUTY_PATTERN = "1";
String LICENSE_PATTERN = "2";
int MEASURE_NOT_EXECUTE = 1;
int MEASURE_EXECUTE = 2;
int MEASURE_NOT_COMPLETE = 3;
int MEASURE_COMPLETE = 4;
/**
* 开票任务类型
**/
enum TaskTypeEnum {
RCWH("1", "日常维护"),
JXRW("2", "检修任务"),
JXJH("3", "检修计划");
@Getter
private String type;
@Getter
private String typeName;
TaskTypeEnum(String type, String typeName) {
this.type = type;
this.typeName = typeName;
}
}
/**
* 工作票流程环节
*/
enum WorkTicketFlowEnum {
/**
* 开票
**/
START("1", "startEvent1", "开票"),
/**
* 签发人签发
**/
SIGN("1", "sid-5E7013A9-385A-4EE4-91B6-FD5328D05E2A", "签发人签发"),
/**
* 运行人员接收
**/
RECEIVE("2", "sid-355DB6EC-7D54-4537-B80F-C26CD716ADA1", "运行人员接收"),
/**
* 运行人员布置安全措施
**/
FIX_UP("3", "sid-F35C4A79-53AF-40B8-AFBD-AF7283CC5708", "运行人员布置安全措施"),
/**
* 工作负责人确认安全措施
**/
PRINCIPAL_CONFIRM_MEASURE("4", "sid-5476EB52-438F-4C74-94FB-88A6EA6625EA", "工作负责人确认安全措施"),
/**
* 许可人许可
**/
LICENCE("5", "sid-0CB1456A-D85C-4473-A032-FAEF62EFBF22", "许可人许可"),
/**
* 工作负责人确认工作内容执行
**/
PRINCIPAL_CONFIRM_CONTENT("6", "sid-5476EB52-438F-4C74-94FB-88A6EA6625EA", "工作负责人确认工作内容执行"),
/**
* 工作负责人确认工作票结束
**/
PRINCIPAL_CONFIRM_END("7", "sid-5476EB52-438F-4C74-94FB-88A6EA6625EA", "工作负责人确认工作票结束、终结"),
/**
* 工作负责人确认工作票结束
**/
LICENSE_CONFIRM_END("8", "sid-5476EB52-438F-4C74-94FB-88A6EA6625EA", "工作负责人确认工作票结束、终结"),
/**
* 签发人审核
**/
SIGN_CONFIRM_DELAY("9", "sid-5476EB52-438F-4C74-94FB-88A6EA6625EA", "签发人审核"),
;
@Getter
private String status;
@Getter
private String flowId;
@Getter
private String segment;
WorkTicketFlowEnum(String status, String flowId, String segment) {
this.status = status;
this.flowId = flowId;
this.segment = segment;
}
public static WorkTicketFlowEnum getEnumByFlowId(String flowId) {
Optional<WorkTicketFlowEnum> workTicketFlowEnum = Arrays.stream(WorkTicketFlowEnum.class.getEnumConstants()).filter(flowEnum -> flowId.equals(flowEnum.flowId)).findFirst();
return workTicketFlowEnum.orElse(null);
}
}
enum WordFileNameEnum {
OPERATE("1", "操作票"),
WORK("2", "工作票"),
SWITCH_OFF("3", "大隆水电站倒闸操作票模板"),
BOOT_UP("4", "大隆水电站倒闸操作票模板"),
DOWNTIME("5", "大隆水电站倒闸操作票模板"),
FIRST_WORK("6", "大隆水电站电气第一种工作票模板"),
SECOND_WORK("7", "大隆水电站电气第二种工作票模板"),
MECHANICAL_WORK("8", "大隆水电站水力机械工作票模板"),
EMERGENCY_REPAIR("9", "大隆水电站事故应急抢修单模板"),
NEW_FIRST_WORK("10", "新电气第一种工作票模板"),
NEW_FIRST_WORK1("11", "第一种工作票"),
;
@Getter
private String type;
@Getter
private String fileName;
WordFileNameEnum(String type, String fileName) {
this.type = type;
this.fileName = fileName;
}
public static String getFileNameByType(String type) {
Optional<WordFileNameEnum> optional = Arrays.stream(WordFileNameEnum.values()).filter(e -> type.equals(e.getType())).findFirst();
return optional.map(e -> e.fileName).orElse(null);
}
}
// 两票类型枚举类
enum TicketTypeNameEnum {
SWITCH_OFF("3", "倒闸操作票",1),
BOOT_UP("4", "开机操作票",1),
DOWNTIME("5", "停机操作票",1),
FIRST_WORK("6", "第一种工作票",2),
SECOND_WORK("7", "第二种工作票",2),
MECHANICAL_WORK("8", "水力机械工作票",2),
;
@Getter
private String type;
@Getter
private String fileName;
@Getter
private Integer ticketType;
TicketTypeNameEnum(String type, String fileName, Integer ticketType) {
this.type = type;
this.fileName = fileName;
this.ticketType = ticketType;
}
public static String getTicketNameByType(String type) {
Optional<WordFileNameEnum> optional = Arrays.stream(WordFileNameEnum.values()).filter(e -> type.equals(e.getType())).findFirst();
return optional.map(e -> e.fileName).orElse(null);
}
}
/**
* 工作票安全注意事项类型
*/
enum MeasureTypeEnum {
INIT_MEASURE("1", "开票时的安全措施"),
SIGN_MEASURE("2", "签发补充安全措施"),
LICENSE_MEASURE("3", "许可人补充安全措施");
@Getter
private String type;
@Getter
private String describe;
MeasureTypeEnum(String type, String describe) {
this.type = type;
this.describe = describe;
}
}
@AllArgsConstructor
enum TicketCodePreEnum {
DQ_WORK("6", "S-DQ", "电气工作票", "workTicketInfoService"),
DQ_OPERATE("3", "YX-DQ", "电气标准票", "standardTicketInfoService");
@Getter
private String type;
@Getter
private String prefix;
@Getter
private String describe;
@Getter
private String service;
}
enum DelayStatusEnum {
PRINCIPAL_INITIATE(1, "负责人发起"),
LICENSOR_CONFIRM(2, "许可人确认"),
PRINCIPAL_CONFIRM(3, "负责人确认");
@Getter
private int status;
@Getter
private String describe;
DelayStatusEnum(int status, String describe) {
this.status = status;
this.describe = describe;
}
}
/**
* 安全措施/注意事项
*/
@AllArgsConstructor
enum SafetyMeasureStatusEnum {
NO_EXECUTE(1, "未执行"),
EXECUTED(2, "执行中"),
NO_FINISH(4, "执行中"),
FINISH(3, "已执行");
@Getter
private Integer status;
@Getter
private String describe;
/**
* 根据status获取describe
**/
public static String getDescribeByStatus(Integer status) {
Optional<SafetyMeasureStatusEnum> optional = Arrays.stream(SafetyMeasureStatusEnum.values())
.filter(p -> status.equals(p.getStatus())).findFirst();
String describe = optional.isPresent() ? optional.get().getDescribe() : status.toString();
return describe;
}
}
/**
* 工作票处理流程
*/
enum FirstWorkTicketFlowEnum {
SIGN("sign", "签发"),
LICENSE("license", "许可人确认安全事项"),
RECEIVE("receive", "负责人确认收到工作票"),
CONFIRM_MEASURE_PRINCIPAL("principalConfirm", "负责人确认安全事项"),
CONFIRM_MEASURE_MEMBERS("membersConfirm", "工作组员确认安全事项"),
FINISH("finish", "工作票结束"),
END("end", "工作票终结"),
PRINCIPAL_DELAY("principalDelay", "负责人发起工作票延期"),
LICENSOR_DELAY("licensorDelay", "许可人确认工作票延期"),
;
@Getter
private String code;
@Getter
private String describe;
FirstWorkTicketFlowEnum(String code, String describe) {
this.code = code;
this.describe = describe;
}
}
/**
* 标准票处理流程
*/
enum StandardTicketStatusEnum {
GUARDIAN_CONFIRM(1, "待监护人确认"),
PRINCIPAL_CONFIRM(2, "待值班负责人确认"),
END(3, "结束"),
TERMINATION(4, "终止");
@Getter
private Integer status;
@Getter
private String describe;
StandardTicketStatusEnum(Integer status, String describe) {
this.status = status;
this.describe = describe;
}
}
/**
* 工作票处理流程
*/
@AllArgsConstructor
enum FirstWorkTicketFlowStatusEnum {
SIGN(1, "待签发"),
RECEIVE(2, "待确认收到工作票"),
LICENSE(3, "待许可"),
CONFIRM_MEASURE_PRINCIPAL(4, "待负责人确认安全措施"),
CONFIRM_MEASURE_MEMBERS(5, "待班组成员确认安全措施"),
CONFIRM_OPERATION_SITUATION(6, "待确认执行情况"),
COMPLETE_PRINCIPAL_CONTENT(7, "待工作成员完成任务"),
CONFIRM_PRINCIPAL_CONTENT(8, "待负责人确认完成工作"),
CONFIRM_WORK_FINISH(9, "待确认工作结束"),
END(10, "待终结"),
FINISH(11, "完成"),
LICENSOR_DELAY(12, "待许可人确认工作票延期"),
PRINCIPAL_DELAY(13, "待负责人确认工作票延期"),
INVALID(14, "作废"),
OFFLINE(15, "线下开票"),
TERMINATION(16, "终止"),
UNDONE(17, "逾期未完成"),
OFFLINE_OPERATE(18, "线下执行任务"),
OFFLINE_LICENSE(19, "线下许可人许可"),
OFFLINE_END(20, "线下结束");
@Getter
private Integer status;
@Getter
private String describe;
/**
* 根据status获取对应枚举类
*
* @param status
* @return
*/
public static FirstWorkTicketFlowStatusEnum getFlowEnumByStatus(Integer status) {
Optional<FirstWorkTicketFlowStatusEnum> result = Arrays.stream(FirstWorkTicketFlowStatusEnum.class.getEnumConstants()).filter(
e -> status.equals(e.getStatus())
).findAny();
if (result.isPresent()) {
return result.get();
}
return null;
}
}
/**
* 票据合格
*/
enum TicketQualifiedEnum {
Qualified(1, "合格"),
No_Qualified(2, "不合格");
@Getter
private Integer code;
@Getter
private String msg;
TicketQualifiedEnum(Integer code, String msg) {
this.code = code;
this.msg = msg;
}
}
}

8
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/ITicketInfoClient.java

@ -29,6 +29,7 @@ public interface ITicketInfoClient {
String UPDATE_UNDONE_STATUS = API_PREFIX + "/updateUndoneStatus";
String GET_WORK_TICKET_BY_TIME = API_PREFIX + "/getWorkTicketByTime";
String GET_OPERATE_TICKET_BY_TIME = API_PREFIX + "/getOperateTicketByTime";
String GET_TICKET_PASS_BY_IDS = API_PREFIX + "/getTicketPassByIds";
String GET_WORK_TICKET_TRANSFER = API_PREFIX + "/getWorkTicketTransfer";
String GET_WORK_TICKET_STATISTIC = API_PREFIX + "/getWorkTicketStatistic";
String GET_OPERATE_TICKET_STATISTIC = API_PREFIX + "/getOperateTicketStatistic";
@ -61,6 +62,13 @@ public interface ITicketInfoClient {
@GetMapping(GET_OPERATE_TICKET_BY_TIME)
R<List<StandardTicketInfoEntity>> getOperateTicketByTime(@RequestParam String startDate, @RequestParam String endDate);
/**
* 获取操作票的合格率
* @param ticekeIds
* @return
*/
@GetMapping(GET_TICKET_PASS_BY_IDS)
R<Long> getTicketPassByIds(@RequestParam List<Long> ticekeIds);
/***
* 根据时间段获取工作票变更负责人列表
* @param startDate

5
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/feign/TicketInfoClientFallback.java

@ -8,6 +8,7 @@ import com.hnac.hzims.ticket.workTicket.vo.WorkTicketStatisticVO;
import com.hnac.hzims.vo.SafeCheckStatisticVO;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
@ -33,6 +34,10 @@ public class TicketInfoClientFallback implements ITicketInfoClient {
}
@Override
public R<Long> getTicketPassByIds(@RequestParam List<Long> ticekeIds) {
return R.fail("查询失败!");
}
@Override
public R<List<WorkTicketPrincipalChangeEntity>> getWorkTicketTransfer(String startDate, String endDate) {
return R.fail("查询失败!");
}

6
hzims-service/operational/pom.xml

@ -74,6 +74,12 @@
<artifactId>poi-ooxml-schemas</artifactId>
<version>3.15</version>
</dependency>
<!-- 由于poi使用的poi-ooxml-schemas是ooxml-schemas的精简版,所以在was服务器上导出Excel可能会报错-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>ooxml-schemas</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jcommon</artifactId>

3
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java

@ -80,6 +80,9 @@ public class ImsDutyEmergencyServiceImpl extends BaseServiceImpl<ImsDutyEmergenc
if (CollectionUtils.isNotEmpty(records)){
collect= records.stream().map(sig -> {
R<User> user = userClient.userInfoById(sig.getRegistrant());
if (!user.isSuccess()&&ObjectUtils.isNotEmpty(user)){
}
sig.setRegistrantName(user.getData().getName());
R<User> userR = userClient.userInfoById(sig.getChargePerson());
sig.setChargePersonName(userR.getData().getName());

19
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/AreaMonthReportController.java

@ -38,6 +38,7 @@ public class AreaMonthReportController extends BladeController {
@NotNull
private final IAreaMonthReportService service;
private final static String load_hydropower_unit_real_key = "hzims:operation:loadhydropowerunit:real:key";
@ApiLog
@ApiOperationSupport(order = 1)
@ -85,7 +86,7 @@ public class AreaMonthReportController extends BladeController {
//模拟柱状图图数据
String[] monthArray = {"一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月"};
double[] value = {20, 30, 25, 50, 40, 25, 50, 40};
ImageEntity lineEntity = JFreeUtil.lineChart("测试111", monthArray, value,300, 200);
ImageEntity lineEntity = JFreeUtil.lineChartV1("测试111", monthArray, value,300, 200);
map.put("lineEntity", lineEntity);
//模拟其它普通数据
@ -113,5 +114,21 @@ public class AreaMonthReportController extends BladeController {
WordUtils.exportWord("template/demo2.docx", "F:/", "生成文件.docx", map);
return R.success("测试成功");
}
@ApiLog
@ApiOperationSupport(order = 3)
@ApiOperation("导出水电站月报")
@GetMapping("/exportHydropowerStationMonthReport")
public R exportHydropowerStationMonthReport(HttpServletResponse response, @ApiParam(value = "日期-年", required = true) Integer year,@ApiParam(value = "日期-月", required = true) Integer month,
@ApiParam(value = "日期-日", required = true) Integer date,@ApiParam(value = "站点Id", required = true) Long stationId,@ApiParam(value = "月报类型", required = true) Long type) {
if (type==1){
HashMap<String, Object> map = new HashMap<>();
service.exportHydropowerStationMonthReport(response, map,year,month,date,stationId);
WordUtils.exportWord("template/waterMonV3.docx", "F:/", "生成月报.docx", map);
//word模板相对路径、word生成路径、word生成的文件名称、数据源
}
return R.success("测试成功");
}
}

3
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IAreaMonthReportService.java

@ -4,6 +4,7 @@ import com.hnac.hzims.operational.main.vo.AreaMonthReportVo;
import org.springblade.core.tool.api.R;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
/**
@ -16,4 +17,6 @@ public interface IAreaMonthReportService {
R<List<AreaMonthReportVo>> getReport(String date);
R export(HttpServletResponse response, String date);
R exportHydropowerStationMonthReport(HttpServletResponse response, HashMap<String, Object> map, Integer year, Integer month, Integer date,Long stationId);
}

2389
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java

File diff suppressed because it is too large Load Diff

835
hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/JFreeUtil.java

@ -3,26 +3,37 @@ package com.hnac.hzims.operational.util;
import cn.afterturn.easypoi.entity.ImageEntity;
import cn.hutool.core.lang.Assert;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xwpf.usermodel.XWPFTable;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.ChartUtils;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.StandardChartTheme;
import org.jfree.chart.axis.CategoryAxis;
import org.jfree.chart.axis.CategoryLabelPositions;
import org.jfree.chart.axis.NumberAxis;
import org.jfree.chart.axis.ValueAxis;
import org.jfree.chart.labels.StandardCategoryItemLabelGenerator;
import org.jfree.chart.labels.StandardCategoryToolTipGenerator;
import org.jfree.chart.labels.StandardPieSectionLabelGenerator;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.DatasetRenderingOrder;
import org.jfree.chart.plot.PiePlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.renderer.category.BarRenderer;
import org.jfree.chart.renderer.category.CategoryItemRenderer;
import org.jfree.chart.renderer.category.LineAndShapeRenderer;
import org.jfree.chart.renderer.category.StandardBarPainter;
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.general.DefaultPieDataset;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVMerge;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import java.awt.*;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.Map;
@Slf4j
@ -57,6 +68,44 @@ public class JFreeUtil {
file.delete();
return buffer;
}
public static ImageEntity pieChartByDouble(String title, Map<String, Double> datas, int width, int height) {
//创建主题样式
StandardChartTheme standardChartTheme = new StandardChartTheme("CN");
//设置标题字体
standardChartTheme.setExtraLargeFont(new Font("宋体", Font.BOLD, 20));
//设置图例的字体
standardChartTheme.setRegularFont(new Font("宋体", Font.PLAIN, 15));
//设置轴向的字体
standardChartTheme.setLargeFont(new Font("宋体", Font.PLAIN, 15));
//设置主题样式
ChartFactory.setChartTheme(standardChartTheme);
//根据jfree生成一个本地饼状图
DefaultPieDataset pds = new DefaultPieDataset();
datas.forEach(pds::setValue);
//图标标题、数据集合、是否显示图例标识、是否显示tooltips、是否支持超链接
JFreeChart chart = ChartFactory.createPieChart(title, pds, true, false, false);
//设置抗锯齿
chart.setTextAntiAlias(false);
PiePlot plot = (PiePlot) chart.getPlot();
plot.setNoDataMessage("暂无数据");
//忽略无值的分类
plot.setIgnoreNullValues(true);
plot.setBackgroundAlpha(0f);
//设置标签阴影颜色
plot.setShadowPaint(new Color(255, 255, 255));
//设置标签生成器(默认{0})
plot.setLabelGenerator(new StandardPieSectionLabelGenerator("{0}({1})/{2}"));
try {
ChartUtils.saveChartAsJPEG(new File(tempImgPath), chart, width, height);
} catch (IOException e1) {
log.error("生成饼状图失败!");
}
ImageEntity imageEntity = new ImageEntity(imgToByte(tempImgPath), width, height);
Assert.notNull(imageEntity.getData(), "生成饼状图对象失败!");
return imageEntity;
}
public static ImageEntity pieChart(String title, Map<String, Integer> datas, int width, int height) {
@ -96,7 +145,8 @@ public class JFreeUtil {
Assert.notNull(imageEntity.getData(), "生成饼状图对象失败!");
return imageEntity;
}
// public static ImageEntity lineChart(String title, Map<String, Integer> datas, int width, int height) {
// public static ImageEntity lineChart(String title, Map<String, Integer> datas, int width, int height) {
//
// //创建主题样式
// StandardChartTheme standardChartTheme = new StandardChartTheme("CN");
@ -137,8 +187,40 @@ public class JFreeUtil {
// Assert.notNull(imageEntity.getData(),"生成饼状图对象失败!");
// return imageEntity;
// }
public static ImageEntity lineChart(String title, DefaultCategoryDataset dataset, double[] value, int width, int height) {
// 创建CategoryPlot对象
CategoryPlot plot = new CategoryPlot();
// 添加第一个数据集并渲染为line
CategoryItemRenderer lineRenderer = new LineAndShapeRenderer();
plot.setDataset(0, dataset);
plot.setRenderer(0, lineRenderer);
public static ImageEntity lineChart( String title,String[] monthArray,double[] value,int width, int height) {
// 添加第二个数据集并渲染为线条bar
CategoryItemRenderer baRenderer = new BarRenderer();
plot.setDataset(1, dataset);
plot.setRenderer(1, baRenderer);
// 设置坐标轴
plot.setDomainAxis(new CategoryAxis("数量"));
plot.setRangeAxis(new NumberAxis("票据类型"));
// 创建JFreeChart对象
JFreeChart chart = new JFreeChart(plot);
// todo 标题验证
chart.setTitle(title);
try {
ChartUtils.saveChartAsJPEG(new File(tempImgPath2), chart, width, height);
} catch (IOException e) {
e.printStackTrace();
}
ImageEntity imageEntity = new ImageEntity(imgToByte(tempImgPath2), width, height);
Assert.notNull(imageEntity.getData(), "生成柱状图对象失败!");
return imageEntity;
}
public static ImageEntity lineChartV1(String title, String[] monthArray, double[] value, int width, int height) {
// 创建数据
DefaultCategoryDataset dataset = new DefaultCategoryDataset();
dataset.addValue(1.0, "A", "Ⅰ");
@ -176,537 +258,224 @@ public class JFreeUtil {
e.printStackTrace();
}
ImageEntity imageEntity = new ImageEntity(imgToByte(tempImgPath2), width, height);
Assert.notNull(imageEntity.getData(),"生成饼状图对象失败!");
Assert.notNull(imageEntity.getData(), "生成饼状图对象失败!");
return imageEntity;
}
// public static ImageEntity lineChart( String title,String[] monthArray,double[] value,int width, int height) {
// //如果不使用Font,中文将显示不出来
// Font font = new Font("新宋体", Font.BOLD, 15);
// // 创建数据
// Map<String, Map<String, Double>> datas = new HashMap<String, Map<String, Double>>();
// for (int i = 0; i < monthArray.length; i++) {
// Map<String, Double> map = new HashMap<String, Double>();
// map.put("故障数量", value[i]);
// datas.put(monthArray[i], map);
// }
// JFreeChart chart = createLineChart(title, datas, "月份", "故障次数(次)", font);
// try {
// ChartUtils.saveChartAsJPEG(new File(tempImgPath), chart, 800, 600);
// } catch (IOException e) {
// e.printStackTrace();
// }
// ImageEntity imageEntity = new ImageEntity(imgToByte(), 800, 600);
// Assert.notNull(imageEntity.getData(),"生成饼状图对象失败!");
// return imageEntity;
// }
//
// public static JFreeChart createLineChart(String title, Map<String, Map<String, Double>> data, String type, String unit, Font font) {
// try {
// DefaultCategoryDataset ds = new DefaultCategoryDataset();
// Set<Map.Entry<String, Map<String, Double>>> set1 = data.entrySet();
// Iterator iterator1 = set1.iterator();
// Iterator iterator2;
// HashMap<String, Double> map;
// Set<Map.Entry<String, Double>> set2;
// Map.Entry entry1;
// Map.Entry entry2;
// while (iterator1.hasNext()) {
// entry1 = (Map.Entry) iterator1.next();
// map = (HashMap<String, Double>) entry1.getValue();
// set2 = map.entrySet();
// iterator2 = set2.iterator();
// while (iterator2.hasNext()) {
// entry2 = (Map.Entry) iterator2.next();
// ds.setValue(Double.parseDouble(entry2.getValue().toString()), entry2.getKey().toString(), entry1.getKey().toString());
// }
// }
//
// //创建折线图,折线图分水平显示和垂直显示两种
// // //2D折线图
// JFreeChart chart = ChartFactory.createLineChart(title, type, unit, ds, PlotOrientation.VERTICAL, true, true, true);
// // //3D折线图
//// JFreeChart chart2 = ChartFactory.createLineChart3D(title, type, unit, ds, PlotOrientation.VERTICAL, true, true, false);
//
// //设置整个图片的标题字体
// chart.getTitle().setFont(font);
//
// //设置提示条字体
// font = new Font("宋体", Font.BOLD, 15);
// chart.getLegend().setItemFont(font);
//
// //得到绘图区
// CategoryPlot plot = (CategoryPlot) chart.getPlot();
// //得到绘图区的域轴(横轴),设置标签的字体
// plot.getDomainAxis().setLabelFont(font);
//
// // 设置背景透明度
// plot.setBackgroundAlpha(0.1f);
// // 设置网格横线颜色
// plot.setRangeGridlinePaint(Color.gray);
// // 设置网格横线大小
// plot.setDomainGridlineStroke(new BasicStroke(0.2F));
// plot.setRangeGridlineStroke(new BasicStroke(0.2F));
//
// //设置横轴标签项字体
// plot.getDomainAxis().setTickLabelFont(font);
//
// // 生成折线图上的数字
// //绘图区域(红色矩形框的部分)
// LineAndShapeRenderer lineAndShapeRenderer = (LineAndShapeRenderer) plot.getRenderer();
// lineAndShapeRenderer.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator());
// //设置图表上的数字可见
// lineAndShapeRenderer.setBaseItemLabelsVisible(true);
// //设置图表上的数字字体
// lineAndShapeRenderer.setBaseItemLabelFont(new Font("宋体", Font.BOLD, 15));
//
// //设置折线图拐角上的正方形
// //创建一个正方形
// Rectangle shape = new Rectangle(4, 4);
// lineAndShapeRenderer.setSeriesShape(0, shape);
// //设置拐角上图形可见
// lineAndShapeRenderer.setSeriesShapesVisible(0, true);
//
// /*// 获取显示线条的对象
// LineAndShapeRenderer lasp = (LineAndShapeRenderer) plot.getRenderer();
// // 设置拐点是否可见/是否显示拐点
// lasp.setBaseShapesVisible(true);
// // 设置拐点不同用不同的形状
// lasp.setDrawOutlines(true);
// // 设置线条是否被显示填充颜色
// lasp.setUseFillPaint(true);
// // 设置拐点颜色
// lasp.setBaseFillPaint(Color.blue);//蓝色*/
// //设置范围轴(纵轴)字体
// font = new Font("宋体", Font.BOLD, 18);
// plot.getRangeAxis().setLabelFont(font);
//// plot.setForegroundAlpha(1.0f);
// return chart;
// } catch (Exception e) {
// e.printStackTrace();
// return null;
// }
// }
//
// /**
// * 生成折线图
// * 1.解析数据<br>
// * 2.迭代数据,产出图片数据流,并添加到List<br>
// *
// * @throws IOException
// */
// public ArrayList createLineAndShapeChart(double[][] data, String[] rowKeys, String[] columnKeys, ChartEntity entity) throws IOException {
// ArrayList list = new ArrayList();
// byte[] bytes = new byte[]{};
// // 解析数据
// Map map = this.parseDataForBarPage(data, rowKeys, columnKeys);
// int pageNum = Integer.parseInt("" + map.get("pageNum"));
// // 迭代,产生图片数据流
// for (int i = 0; i < pageNum; i++) {
// bytes = createSingleLineAndShapeChart((double[][]) (map.get("data" + i)), (String[]) (map.get("rowKeys" + i)),
// (String[]) (map.get("columnKeys" + i)), entity);
// list.add(bytes);
// }
// return list;
// }
//
// /**
// * 生成单个折线图数据流
// *
// * @param data
// * @param rowKeys
// * @param columnKeys
// * @param entity
// * @return
// * @throws IOException
// */
// public byte[] createSingleLineAndShapeChart(double[][] data, String[] rowKeys, String[] columnKeys, ChartEntity entity) throws IOException {
// CategoryDataset dataset = getBarData(data, rowKeys, columnKeys);
// JFreeChart chart = createTimeXYChar(dataset, entity);
// byte[] bytes = this.createImage(chart, entity);
// return bytes;
// }
//
//
// /**
// * 生成柱状图<br>
// * 1.解析数据<br>
// * 2.迭代数据,产出图片数据流,并添加到List<br>
// *
// * @param data 数据
// * @param rowKeys 行
// * @param columnKeys 列
// * @param entity 图片配置对象
// * @return 包含多个图片数据流的List
// * @throws IOException
// */
// public ArrayList createStackedBarChart(double[][] data, String[] rowKeys, String[] columnKeys, ChartEntity entity) throws IOException {
// // 解析数据
// ArrayList list = new ArrayList();
// byte[] bytes = new byte[]{};
// Map map = this.parseDataForBarPage(data, rowKeys, columnKeys);
// int pageNum = Integer.parseInt("" + map.get("pageNum"));
// // 迭代数据,产出图片数据流,并添加到List
// for (int i = 0; i < pageNum; i++) {
// bytes = createSingleStackedBarChart((double[][]) (map.get("data" + i)), (String[]) (map.get("rowKeys" + i)),
// (String[]) (map.get("columnKeys" + i)), entity);
// list.add(bytes);
// }
// return list;
// }
//
// /**
// * 解析生成柱状图分页数据
// *
// * @param data
// * @param rowKeys
// * @param columnKeys
// * @return
// */
// private Map parseDataForBarPage(double[][] data, String[] rowKeys, String[] columnKeys) {
// Map map = new HashMap();
//
// double[][] pageData = null;
// String[] pageColumn = null;
//
// int sumColumnNum = columnKeys.length; // 总列数
// int indexNum = Config.getInt("image.export.pagesize", 10);// 分页的列数
// int pageNum = sumColumnNum % indexNum == 0 ? sumColumnNum / indexNum : sumColumnNum / indexNum + 1; // 分页数
// int rowNum = rowKeys.length;
//
// // log.debug("data.length="+data.length+"sumColumnNum="+sumColumnNum+" indexNum="+indexNum+" pageNum="+pageNum+" rowNum="+rowNum+" ");
//
// // 解析传递过来的数据
// for (int i = 0; i < pageNum; i++) {
// int columnNum = (sumColumnNum - i * indexNum) / indexNum > 0 ? indexNum : (sumColumnNum - i * indexNum) % indexNum;//当前页列数
// pageData = new double[rowNum][columnNum];
// // 取数据值
// for (int j = 0; j < rowNum; j++) {
// pageColumn = new String[columnNum];
// for (int k = 0; k < columnNum; k++) {
// pageData[j][k] = data[j][k + i * indexNum]; // 数据
// }
// }
// // 取列值
// for (int j = 0; j < columnNum; j++) {
// pageColumn[j] = columnKeys[j + i * indexNum]; // 列
// }
// // 保存数据并返回
// map.put("data" + i, pageData);
// map.put("rowKeys" + i, rowKeys);
// map.put("columnKeys" + i, pageColumn);
// }
// // 保存分页数
// map.put("pageNum", pageNum);
// return map;
// }
//
// /**
// * 解析生成折线图分页数据
// *
// * @param data
// * @param rowKeys
// * @param columnKeys
// * @return
// */
// private Map parseDataForLinePage(double[][] data, String[] rowKeys, String[] columnKeys) {
// Map map = new HashMap();
//
// double[][] pageData = null;
// String[] pageColumn = null;
//
// int sumColumnNum = columnKeys.length; // 总列数
// int indexNum = Config.getInt("image.export.pagesize", 10);// 分页的列数
// int pageNum = sumColumnNum % indexNum == 0 ? sumColumnNum / indexNum : sumColumnNum / indexNum + 1; // 分页数
// int rowNum = rowKeys.length;
//
// // log.debug("data.length="+data.length+"sumColumnNum="+sumColumnNum+" indexNum="+indexNum+" pageNum="+pageNum+" rowNum="+rowNum+" ");
//
// // 解析传递过来的数据
// for (int i = 0; i < pageNum; i++) {
// int columnNum = (sumColumnNum - i * indexNum) / indexNum > 0 ? indexNum : (sumColumnNum - i * indexNum) % indexNum;//当前页列数
// pageData = new double[rowNum][columnNum];
// // 取数据值
// for (int j = 0; j < rowNum; j++) {
// pageColumn = new String[columnNum];
// for (int k = 0; k < columnNum; k++) {
// pageData[j][k] = data[j][k + i * indexNum]; // 数据
// }
// }
// // 取列值
// for (int j = 0; j < columnNum; j++) {
// pageColumn[j] = columnKeys[j + i * indexNum]; // 列
// }
// // 保存数据并返回
// map.put("data" + i, pageData);
// map.put("rowKeys" + i, rowKeys);
// map.put("columnKeys" + i, pageColumn);
// }
// // 保存分页数
// map.put("pageNum", pageNum);
// return map;
// }
//
// /**
// * 生成单个堆栈柱状图
// *
// * @return 图片数据流
// * @throws IOException
// */
// public byte[] createSingleStackedBarChart(double[][] data, String[] rowKeys, String[] columnKeys, ChartEntity entity) throws IOException {
// CategoryDataset dataset = getBarData(data, rowKeys, columnKeys);
// JFreeChart chart = createStackedBarChart(dataset, entity);
// byte[] bytes = this.createImage(chart, entity);
// return bytes;
// }
//
// // 柱状图,折线图 数据集
// private CategoryDataset getBarData(double[][] data, String[] rowKeys,
// String[] columnKeys) {
// return DatasetUtilities.createCategoryDataset(rowKeys, columnKeys, data);
//
// }
//
// /**
// * 判断文件夹是否存在,如果不存在则新建
// *
// * @param chartPath
// */
// private void isChartPathExist(String chartPath) {
// File file = new File(chartPath);
// if (!file.exists()) {
// file.mkdirs();
// }
// }
//
// /**
// * 折线图
// */
// private JFreeChart createTimeXYChar(CategoryDataset xyDataset, ChartEntity entity) {
//
// JFreeChart chart = ChartFactory.createLineChart(
// entity.getTitle(),
// entity.getXname(),
// entity.getYname(),
// xyDataset,
// PlotOrientation.VERTICAL,
// true,
// true,
// false);
//
// chart.setTextAntiAlias(false);
// chart.setBackgroundPaint(Color.WHITE);
//
// CategoryPlot categoryplot = (CategoryPlot) chart.getPlot();
// // 没有数据时显示
// this.configNoData(chart, "没有查询到数据 !");
//
// // x轴 // 分类轴网格是否可见
// categoryplot.setDomainGridlinesVisible(true);
// // y轴 //数据轴网格是否可见
// categoryplot.setRangeGridlinesVisible(true);
//
// categoryplot.setRangeGridlinePaint(Color.WHITE);// 虚线色彩
//
// categoryplot.setDomainGridlinePaint(Color.WHITE);// 虚线色彩
//
// categoryplot.setBackgroundPaint(Color.lightGray);
//
//
// // 配置字体
// this.configFont(chart);
//
// // x轴设置
// CategoryAxis domainAxis = categoryplot.getDomainAxis();
//
// // 设置距离图片左端距离
// domainAxis.setLowerMargin(0.0);
// // 设置距离图片右端距离
// domainAxis.setUpperMargin(0.0);
// domainAxis.setTickLabelPaint(Color.BLUE);
// domainAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_45); // 横轴上的label斜显示
//
// NumberAxis numberaxis = (NumberAxis) categoryplot.getRangeAxis();
// numberaxis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
// numberaxis.setAutoRangeIncludesZero(true);
//
// // 获得renderer 注意这里是下嗍造型到lineandshaperenderer!!
// LineAndShapeRenderer lineandshaperenderer = (LineAndShapeRenderer) categoryplot.getRenderer();
// lineandshaperenderer.setBaseShapesVisible(true); // series 点(即数据点)可见
// lineandshaperenderer.setBaseLinesVisible(true); // series 点(即数据点)间有连线可见
//
// // 显示折点数据
// lineandshaperenderer.setBaseItemLabelGenerator(new
// StandardCategoryItemLabelGenerator());
// lineandshaperenderer.setBaseItemLabelsVisible(true);
//
// return chart;
// }
//
// /**
// * 堆栈柱状图
// */
// private JFreeChart createStackedBarChart(CategoryDataset dataset, ChartEntity entity) {
//
// JFreeChart chart = ChartFactory.createStackedBarChart3D(
// entity.getTitle(),
// entity.getXname(),
// entity.getYname(),
// dataset,
// PlotOrientation.VERTICAL,
// true,
// false,
// false);
//
// // 没有数据配置
// this.configNoData(chart, "没有查询到数据 !");
//
// // 配置字体
// this.configFont(chart);
//
// // 配置 Renderer
// this.configBarRenderer(chart);
//
// // 其他配置
// this.configOtherForBar(chart);
//
// return chart;
// }
//
// /**
// * 配置字体
// *
// * @param chart JFreeChart 对象
// */
// private void configFont(JFreeChart chart) {
// // 配置字体
// Font xfont = new Font("宋体", Font.PLAIN, 12);// X轴
// Font yfont = new Font("宋体", Font.PLAIN, 12);// Y轴
// Font kfont = new Font("宋体", Font.PLAIN, 12);// 底部
// Font titleFont = new Font("隶书", Font.BOLD, 25); // 图片标题
// CategoryPlot plot = chart.getCategoryPlot();// 图形的绘制结构对象
//
// // 图片标题
// chart.setTitle(new TextTitle(chart.getTitle().getText(), titleFont));
//
// // 底部
// chart.getLegend().setItemFont(kfont);
//
// // X 轴
// CategoryAxis domainAxis = plot.getDomainAxis();
// domainAxis.setLabelFont(xfont);// 轴标题
// domainAxis.setTickLabelFont(xfont);// 轴数值
// domainAxis.setTickLabelPaint(Color.BLUE); // 字体颜色
// domainAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_45); // 横轴上的label斜显示
//
// // Y 轴
// ValueAxis rangeAxis = plot.getRangeAxis();
// rangeAxis.setLabelFont(yfont);
// rangeAxis.setLabelPaint(Color.BLUE); // 字体颜色
// rangeAxis.setTickLabelFont(yfont);
//
// }
//
// /**
// * 配置柱状图
// *
// * @param chart
// */
// private void configBarRenderer(JFreeChart chart) {
//
// CategoryPlot categoryplot = (CategoryPlot) chart.getPlot();
// // 自定义显示柱子上的总值
// ExtendedStackedBarRenderer extendedstackedbarrenderer = new ExtendedStackedBarRenderer();
// extendedstackedbarrenderer.setBaseItemLabelsVisible(true);
// extendedstackedbarrenderer.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator());
// extendedstackedbarrenderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator());
// categoryplot.setRenderer(extendedstackedbarrenderer);
//
// BarRenderer barrenderer = (BarRenderer) categoryplot.getRenderer();
// barrenderer.setDrawBarOutline(false);
// barrenderer.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator());
// barrenderer.setBaseItemLabelsVisible(true);
// barrenderer.setBasePositiveItemLabelPosition(new ItemLabelPosition(ItemLabelAnchor.CENTER, TextAnchor.CENTER));
// barrenderer.setBaseNegativeItemLabelPosition(new ItemLabelPosition(ItemLabelAnchor.CENTER, TextAnchor.CENTER));
//
// // 柱子显示数值
// // barrenderer.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator("{2}",new DecimalFormat("0.0%")));
// // barrenderer.setItemLabelGenerator(new StandardCategoryItemLabelGenerator());
// barrenderer.setItemLabelFont(new Font("Arial Unicode MS", Font.PLAIN, 9));
// barrenderer.setItemLabelsVisible(true);
//
// // 如果数值没有显示空间,设置显示格式
// // ItemLabelPosition itemLabelPositionFallback=new ItemLabelPosition(
// // ItemLabelAnchor.OUTSIDE12,TextAnchor.BASELINE_LEFT,
// // TextAnchor.HALF_ASCENT_LEFT,0D);
// // barrenderer.setPositiveItemLabelPositionFallback(itemLabelPositionFallback);
// // barrenderer.setNegativeItemLabelPositionFallback(itemLabelPositionFallback);
//
// categoryplot.setRenderer(barrenderer);
// }
//
// /**
// * 配置没有数据时的显示信息
// *
// * @param chart
// */
// private void configNoData(JFreeChart chart, String message) {
// CategoryPlot categoryplot = (CategoryPlot) chart.getPlot();
// // 没有数据时的显示
// categoryplot.setNoDataMessage(message);
// categoryplot.setNoDataMessageFont(new Font("黑体", Font.BOLD, 25));
// }
//
// /**
// * 其他配置
// *
// * @param chart
// */
// private void configOtherForBar(JFreeChart chart) {
//
// chart.setTextAntiAlias(false); // 图例字体清晰
//
// chart.setBackgroundPaint(Color.WHITE); // 背景颜色
//
// CategoryPlot plot = chart.getCategoryPlot();// 图形的绘制结构对象
// NumberAxis numberaxis = (NumberAxis) plot.getRangeAxis();
// numberaxis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
// numberaxis.setAutoRangeIncludesZero(true);
// }
//
// /**
// * 创建图片的数据流
// *
// * @param chart
// * @param entity 图片配置对象
// * @return 图片数据流
// * @throws IOException
// */
// private byte[] createImage(JFreeChart chart, ChartEntity entity) throws IOException {
// return ChartUtilities.encodeAsPNG(chart.createBufferedImage(entity.getWidth(), entity.getHeight()));
// }
//
// /**
// * 创建图片文件到硬盘
// *
// * @param chart
// * @param entity
// * @throws IOException
// */
// private void createImageFile(JFreeChart chart, ChartEntity entity) throws IOException {
// FileOutputStream fos_jpg = null;
// try {
// isChartPathExist(tempImgPath);
// String chartName = tempImgPath + entity.getFileName();
// fos_jpg = new FileOutputStream(chartName);
// ChartUtilities.writeChartAsJPEG(fos_jpg, chart, entity.getWidth(), entity.getHeight());
// } catch (Exception e) {
// e.printStackTrace();
// } finally {
// try {
// fos_jpg.close();
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
// }
/**
* 创建柱状+折现统计复合图
*
* @param isAddLine
* @param title
* @param domainAxisLabel
* @param rangeAxisLabel
* @param dataset
* @param datasetLine
* @param width
* @param height
* @return
*/
public static ImageEntity iCreateBarLineChart(Boolean isAddLine, String title, String domainAxisLabel, String rangeAxisLabel,
DefaultCategoryDataset dataset, DefaultCategoryDataset datasetLine, int width, int height) {
// TODO Auto-generated method stub
JFreeChart chart = ChartFactory.createBarChart(title,
domainAxisLabel, rangeAxisLabel, dataset, PlotOrientation.VERTICAL, // 图表方向:水平、垂直
true, // 是否显示图例(对于简单的柱状图必须是false)
false, // 是否生成工具
false);
iSetBarChart(chart);
if (isAddLine) {
CategoryPlot categoryplot = chart.getCategoryPlot();
categoryplot.setDataset(1, datasetLine);
LineAndShapeRenderer lineandshaperenderer = new LineAndShapeRenderer();
lineandshaperenderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator());
lineandshaperenderer.setDefaultItemLabelGenerator(new StandardCategoryItemLabelGenerator());
lineandshaperenderer.setDefaultLinesVisible(true);
lineandshaperenderer.setSeriesPaint(0, Color.decode("#9BBB59"));
categoryplot.setRenderer(1, lineandshaperenderer);
NumberAxis numberaxis = new NumberAxis("平均值");
numberaxis.setLabelFont(new Font("宋体", Font.TRUETYPE_FONT, 12));
categoryplot.setRangeAxis(1, numberaxis);
categoryplot.mapDatasetToRangeAxis(1, 1);
categoryplot.setDatasetRenderingOrder(DatasetRenderingOrder.FORWARD);
}
// JFreeChart lineChart = ChartFactory.createLineChart(title,
// domainAxisLabel, rangeAxisLabel, dataset);
try {
ChartUtils.saveChartAsJPEG(new File(tempImgPath2), chart, width, height);
} catch (IOException e) {
e.printStackTrace();
}
ImageEntity imageEntity = new ImageEntity(imgToByte(tempImgPath2), width, height);
Assert.notNull(imageEntity.getData(), "生成柱状+折现统计复合图对象失败!");
return imageEntity;
}
/**
* 双色柱状图
*
* @param title
* @param domainAxisLabel
* @param rangeAxisLabel
* @param dataset
* @param width
* @param height
* @return
*/
public static ImageEntity iCreateBarChart(String title, String domainAxisLabel, String rangeAxisLabel,
DefaultCategoryDataset dataset, int width, int height) {
// TODO Auto-generated method stub
JFreeChart chart = ChartFactory.createBarChart(title,
domainAxisLabel, rangeAxisLabel, dataset);
iSetBarChartDouble(chart);
try {
ChartUtils.saveChartAsJPEG(new File(tempImgPath2), chart, width, height);
} catch (IOException e) {
e.printStackTrace();
}
ImageEntity imageEntity = new ImageEntity(imgToByte(tempImgPath2), width, height);
Assert.notNull(imageEntity.getData(), "生成柱状+折现统计复合图对象失败!");
return imageEntity;
}
public static void iSetBarChart(JFreeChart chart) {
CategoryPlot categoryplot = chart.getCategoryPlot();// 图本身
ValueAxis rangeAxis = categoryplot.getRangeAxis();
CategoryAxis domainAxis = categoryplot.getDomainAxis();
// 设置Y轴的提示文字样式
rangeAxis.setLabelFont(new Font("微软雅黑", Font.PLAIN, 12));
// 设置Y轴刻度线的长度
rangeAxis.setTickMarkInsideLength(10f);
domainAxis.setCategoryLabelPositions(CategoryLabelPositions.STANDARD); // 横轴上的
domainAxis.setLowerMargin(0.1);
domainAxis.setUpperMargin(0.1);
// rangeAxis.setTickMarkOutsideLength(10f);
// 设置X轴下的标签文字
domainAxis.setLabelFont(new Font("微软雅黑", Font.PLAIN, 12));
// 设置X轴上提示文字样式
domainAxis.setTickLabelFont(new Font("微软雅黑", Font.PLAIN, 12));
NumberAxis vn = (NumberAxis) categoryplot.getRangeAxis();
// 设置Y轴的数字为百分比样式显示设置Y轴的数字为百分比样式显示
DecimalFormat df = new DecimalFormat("0.0");
vn.setNumberFormatOverride(df);
// 使柱状图反过来显示
// vn.setInverted(true);
// vn.setVerticalTickLabels(true);
// 自定义柱状图中柱子的样式
BarRenderer brender = new BarRenderer();
brender.setSeriesPaint(0, Color.decode("#C0504D")); // 给series1 Bar
brender.setSeriesPaint(1, Color.decode("#E46C0A")); // 给series2 Bar
brender.setSeriesPaint(2, Color.decode("#4F81BD")); // 给series3 Bar
brender.setSeriesPaint(3, Color.decode("#00B050")); // 给series4 Bar
brender.setSeriesPaint(4, Color.decode("#7030A0")); // 给series5 Bar
brender.setSeriesPaint(5, Color.decode("#00BF00")); // 给series6 Bar
// 设置柱状图的顶端显示数字
brender.setIncludeBaseInRange(true);
brender.setDefaultItemLabelGenerator(new StandardCategoryItemLabelGenerator());
brender.setDefaultItemLabelsVisible(true);
// 设置柱子为平面图不是立体的
brender.setBarPainter(new StandardBarPainter());
// 设置柱状图之间的距离0.1代表10%;
brender.setItemMargin(0.3);
// 设置柱子的阴影,false代表没有阴影
brender.setShadowVisible(false);
// 设置图的背景为白色
categoryplot.setBackgroundPaint(Color.WHITE);
// 设置背景虚线的颜色
categoryplot.setRangeGridlinePaint(Color.decode("#B6A2DE"));
// 去掉柱状图的背景边框,使边框不可见
categoryplot.setOutlineVisible(false);
// 设置标题的字体样式
chart.getTitle().setFont(new Font("微软雅黑", Font.PLAIN, 24));
// 设置图表下方图例上的字体样式
chart.getLegend().setItemFont(new Font("微软雅黑", Font.PLAIN, 12));
categoryplot.setRenderer(brender);
}
public static void iSetBarChartDouble(JFreeChart chart) {
CategoryPlot categoryplot = chart.getCategoryPlot();// 图本身
ValueAxis rangeAxis = categoryplot.getRangeAxis();
CategoryAxis domainAxis = categoryplot.getDomainAxis();
// 设置Y轴的提示文字样式
rangeAxis.setLabelFont(new Font("微软雅黑", Font.PLAIN, 12));
// 设置Y轴刻度线的长度
rangeAxis.setTickMarkInsideLength(10f);
rangeAxis.setTickMarkOutsideLength(10f);
// 设置X轴下的标签文字
domainAxis.setLabelFont(new Font("微软雅黑", Font.PLAIN, 12));
// 设置X轴上提示文字样式
domainAxis.setTickLabelFont(new Font("微软雅黑", Font.PLAIN, 12));
NumberAxis vn = (NumberAxis) categoryplot.getRangeAxis();
// 设置Y轴的数字为百分比样式显示设置Y轴的数字为百分比样式显示
DecimalFormat df = new DecimalFormat("0.0");
vn.setNumberFormatOverride(df);
// 使柱状图反过来显示
// vn.setInverted(true);
// vn.setVerticalTickLabels(true);
// // 自定义柱状图中柱子的样式
BarRenderer brender = new BarRenderer();
brender.setSeriesPaint(0, Color.gray);
brender.setSeriesPaint(1, Color.orange);
// brender.setSeriesPaint(1, Color.decode("#C0504D")); // 给series1 Bar
// brender.setSeriesPaint(2, Color.decode("#C0504D")); // 给series1 Bar
// brender.setSeriesPaint(0, Color.decode("#E46C0A")); // 给series2 Bar
// brender.setSeriesPaint(2, Color.decode("#4F81BD")); // 给series3 Bar
// brender.setSeriesPaint(3, Color.decode("#00B050")); // 给series4 Bar
// brender.setSeriesPaint(4, Color.decode("#7030A0")); // 给series5 Bar
// brender.setSeriesPaint(5, Color.decode("#00BF00")); // 给series6 Bar
// 设置柱状图的顶端显示数字
brender.setIncludeBaseInRange(true);
// brender.setBaseItemLabelGenerator(new StandardCategoryItemLabelGenerator());
// brender.setBaseItemLabelsVisible(isBaseItemLabelsVisible());
// 设置柱子为平面图不是立体的
brender.setBarPainter(new StandardBarPainter());
// 设置柱状图之间的距离0.1代表10%;
brender.setItemMargin(0.1);
// // 设置柱子的阴影,false代表没有阴影
brender.setShadowVisible(false);
// 设置图的背景为白色
categoryplot.setBackgroundPaint(Color.WHITE);
// 设置背景虚线的颜色
categoryplot.setRangeGridlinePaint(Color.decode("#B6A2DE"));
// 去掉柱状图的背景边框,使边框不可见
categoryplot.setOutlineVisible(false);
// 设置标题的字体样式
chart.getTitle().setFont(new Font("微软雅黑", Font.PLAIN, 24));
// 设置图表下方图例上的字体样式
chart.getLegend().setItemFont(new Font("微软雅黑", Font.PLAIN, 12));
categoryplot.setRenderer(brender);
}
public static void mergeCell(XWPFTable table, int beginRowIndex, int endRowIndex, int colIndex) {
if (beginRowIndex == endRowIndex || beginRowIndex > endRowIndex) {
return;
}
//合并行单元格的第一个单元格
CTVMerge startMerge = CTVMerge.Factory.newInstance();
startMerge.setVal(STMerge.RESTART);
//合并行单元格的第一个单元格之后的单元格
CTVMerge endMerge = CTVMerge.Factory.newInstance();
endMerge.setVal(STMerge.CONTINUE);
table.getRow(beginRowIndex).getCell(colIndex).getCTTc().getTcPr().setVMerge(startMerge);
for (int i = beginRowIndex + 1; i <= endRowIndex; i++) {
table.getRow(i).getCell(colIndex).getCTTc().getTcPr().setVMerge(endMerge);
}
}
}

121
hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/TimeUtils.java

@ -1,26 +1,111 @@
package com.hnac.hzims.operational.util;
import org.springblade.core.tool.utils.DateUtil;
import java.util.Calendar;
import java.util.Date;
public class TimeUtils {
private static int sheet1NowRow, sheet2NowRow;
/**
* 相差时数
* @author ty
* @param endDate
* @param nowDate
* @return
*/
public static Long getDifferTime(Date nowDate,Date endDate ) {
long nh = 1000 * 60 * 60L;
// 获得两个时间的毫秒时间差异
long diff = endDate.getTime() - nowDate.getTime();
// 计算差多少小时
long hour = diff/ nh;
return hour;
}
private static int sheet1NowRow, sheet2NowRow;
/**
* 相差时数
*
* @param endDate
* @param nowDate
* @return
* @author ty
*/
public static Long getDifferTime(Date nowDate, Date endDate) {
long nh = 1000 * 60 * 60L;
// 获得两个时间的毫秒时间差异
long diff = endDate.getTime() - nowDate.getTime();
// 计算差多少小时
long hour = diff / nh;
return hour;
}
public static String getYear(Integer year) {
// 创建一个Calendar对象
Calendar calendar = Calendar.getInstance();
// 设置年份
calendar.set(Calendar.YEAR, year);
// 设置月份为1(即一月)
calendar.set(Calendar.MONTH, Calendar.JANUARY);
// 设置日期为1
calendar.set(Calendar.DATE, 1);
// 设置时间为0点0分0秒
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
String start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 00:00:00";
return start;
}
public static String getYearEnd(Integer year) {
// 创建一个Calendar对象
Calendar calendar = Calendar.getInstance();
// 设置年份
calendar.set(Calendar.YEAR, year);
// 设置月份为12(即十二月)
calendar.set(Calendar.MONTH, Calendar.DECEMBER);
// 设置日期为31
calendar.set(Calendar.DATE, 31);
String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 00:00:00";
return end;
}
public static String getYearEndV2(Integer year) {
// 创建一个Calendar对象
Calendar calendar = Calendar.getInstance();
// 设置年份
calendar.set(Calendar.YEAR, year);
// 设置月份为12(即十二月)
calendar.set(Calendar.MONTH, Calendar.DECEMBER);
// 设置日期为31
calendar.set(Calendar.DATE, 31);
String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 23:59:59";
return end;
}
public static String getMonthStart(Integer year, Integer mon) {
// 创建一个Calendar对象
Calendar calendar = Calendar.getInstance();
// 设置年份
calendar.set(Calendar.YEAR, year);
// 设置月份
calendar.set(Calendar.MONTH,mon-1);
// 设置日期为1
calendar.set(Calendar.DATE, 1);
String start = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 00:00:00";
return start;
}
public static String getMonthEnd(Integer year, Integer mon) {
// 创建一个Calendar对象
Calendar calendar = Calendar.getInstance();
// 设置年份
calendar.set(Calendar.YEAR, Integer.valueOf(year));
// 设置月份为1(即一月)
calendar.set(Calendar.MONTH, mon);
calendar.set(Calendar.DAY_OF_MONTH, 1);
// 将日期对象减去一天,即为当月的最后一天
calendar.add(Calendar.DAY_OF_MONTH, -1);
String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 00:00:00";
return end;
}
public static String getMonthEndV2(Integer year, Integer mon) {
// 创建一个Calendar对象
Calendar calendar = Calendar.getInstance();
// 设置年份
calendar.set(Calendar.YEAR, Integer.valueOf(year));
// 设置月份为1(即一月)
calendar.set(Calendar.MONTH, mon);
calendar.set(Calendar.DAY_OF_MONTH, 1);
// 将日期对象减去一天,即为当月的最后一天
calendar.add(Calendar.DAY_OF_MONTH, -1);
String end = DateUtil.format(calendar.getTime(), DateUtil.PATTERN_DATE) + " 23:59:59";
return end;
}
}

15
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/feign/TicketInfoClient.java

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.Lists;
import com.hnac.hzims.safeproduct.Constants;
import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity;
import com.hnac.hzims.ticket.allTicket.service.TicketInfoEvaluateService;
import com.hnac.hzims.ticket.constants.TicketConstants;
import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService;
@ -19,6 +21,7 @@ import com.hnac.hzims.vo.SafeCheckStatisticVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*;
import org.springblade.flow.core.feign.IFlowClient;
@ -52,6 +55,8 @@ public class TicketInfoClient implements ITicketInfoClient {
private final IFlowClient flowClient;
private final IWorkTicketDelayService delayService;
private final TicketInfoEvaluateService ticketInfoEvaluateService;
@Override
@GetMapping("/updateUndoneStatus")
@Transactional(rollbackFor = Exception.class)
@ -92,7 +97,15 @@ public class TicketInfoClient implements ITicketInfoClient {
}});
return R.data(infoList);
}
@Override
@GetMapping("/getTicketPassByIds")
public R<Long> getTicketPassByIds(@RequestParam List<Long> ticekeIds) {
LambdaQueryWrapper<TicketInfoEvaluateEntity> evaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
evaluateEntityLambdaQueryWrapper.in(TicketInfoEvaluateEntity::getTicketId, ticekeIds);
evaluateEntityLambdaQueryWrapper.eq(BaseEntity::getStatus, 1);
Long count =Long.valueOf(ticketInfoEvaluateService.count(evaluateEntityLambdaQueryWrapper));
return R.data(count);
}
@Override
@GetMapping("/getWorkTicketTransfer")
public R<List<WorkTicketPrincipalChangeEntity>> getWorkTicketTransfer(@RequestParam String startDate, @RequestParam String endDate) {

Loading…
Cancel
Save