diff --git a/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java b/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java index 9537accc..6bc17794 100644 --- a/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java +++ b/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java @@ -302,6 +302,17 @@ public class EmpSalaryEntity extends OrgCommonEntity implements SalaryItemData { @Comment("出生日期") private LocalDate birthday; + + @Comment("身份证签发机关") + private String issueAuthority; + + @Comment("有效期限") + private LocalDate validPeriod; + + @Comment("是否永久有效") + private Boolean permanent; + + /** 批次数据冗余 */ @Comment("批次年月") private LocalDate batchYearMonth; @@ -396,6 +407,10 @@ public class EmpSalaryEntity extends OrgCommonEntity implements SalaryItemData { this.workAge = salaryEntity.workAge; this.age = salaryEntity.age; this.birthday = salaryEntity.birthday; + + this.issueAuthority = salaryEntity.issueAuthority; + this.validPeriod = salaryEntity.validPeriod; + this.permanent = salaryEntity.permanent; } public void updateItems(EmpSalaryEntity salaryEntity) { @@ -699,6 +714,10 @@ public class EmpSalaryEntity extends OrgCommonEntity implements SalaryItemData { map.put("birthday", this.birthday); + map.put("issueAuthority", this.issueAuthority); + map.put("validPeriod", this.validPeriod); + map.put("permanent", this.permanent); + map.put("batchYearMonth", this.batchYearMonth); map.put("batchNo", this.batchNo); diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java index d7dbd5dc..1ee90487 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java @@ -135,4 +135,15 @@ public class CreateEmployeeDto extends OrgCommonDto { private String empStatus; + + @Comment("身份证签发机关") + private String issueAuthority; + + @Comment("有效期限") + private LocalDate validPeriod; + + @Comment("是否永久有效") + private Boolean permanent; + + } diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeCalculateDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeCalculateDto.java index 1c8d47f5..1d84a5f6 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeCalculateDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeCalculateDto.java @@ -144,6 +144,16 @@ public class EmployeeCalculateDto extends OrgCommonDto { @Comment("出生日期") private LocalDate birthday; + + @Comment("身份证签发机关") + private String issueAuthority; + + @Comment("有效期限") + private LocalDate validPeriod; + + @Comment("是否永久有效") + private Boolean permanent; + public Map toCtxMap() { HashMap map = new HashMap<>(); @@ -192,6 +202,11 @@ public class EmployeeCalculateDto extends OrgCommonDto { map.put("empName", this.getName()); map.put("empCode", this.getCode()); + + map.put("issueAuthority", this.issueAuthority); + map.put("validPeriod", this.validPeriod); + map.put("permanent", this.permanent); + Try.run(() -> map.put("departmentId", this.getDepartment().getId())); Try.run(() -> map.put("departmentCode", this.getDepartment().getCode())); Try.run(() -> map.put("departmentName", this.getDepartment().getName())); diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java index a70f3e82..e231d730 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java @@ -181,4 +181,14 @@ public class EmployeeDto extends OrgCommonDto { @Comment("出生日期") private LocalDate birthday; + + + @Comment("身份证签发机关") + private String issueAuthority; + + @Comment("有效期限") + private LocalDate validPeriod; + + @Comment("是否永久有效") + private Boolean permanent; } diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java index 3a452a20..58046042 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java @@ -141,5 +141,13 @@ public class UpdateEmployeeDto extends OrgCommonDto { private String empStatus; + @Comment("身份证签发机关") + private String issueAuthority; + + @Comment("有效期限") + private LocalDate validPeriod; + + @Comment("是否永久有效") + private Boolean permanent; } diff --git a/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java b/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java index 0a0ed2c4..cd879934 100644 --- a/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java +++ b/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java @@ -170,6 +170,16 @@ public class EmployeeEntity extends OrgCommonEntity { @Comment("出生日期") private LocalDate birthday; + @Comment("身份证签发机关") + private String issueAuthority; + + @Comment("有效期限") + private LocalDate validPeriod; + + @Comment("是否永久有效") + private Boolean permanent; + + @Override public void prePersist() { super.prePersist(); diff --git a/src/main/java/cn/lihongjie/coal/meter/dto/CreateMeterDto.java b/src/main/java/cn/lihongjie/coal/meter/dto/CreateMeterDto.java index 2aa9cd6a..b4a91a4e 100644 --- a/src/main/java/cn/lihongjie/coal/meter/dto/CreateMeterDto.java +++ b/src/main/java/cn/lihongjie/coal/meter/dto/CreateMeterDto.java @@ -17,4 +17,8 @@ public class CreateMeterDto extends OrgCommonDto { @Comment("安装位置") private String location; + + + @Comment("ybiot设备id") + private String ybiotDeviceId; } diff --git a/src/main/java/cn/lihongjie/coal/meter/dto/MeterDto.java b/src/main/java/cn/lihongjie/coal/meter/dto/MeterDto.java index 1b05a42a..4fae8085 100644 --- a/src/main/java/cn/lihongjie/coal/meter/dto/MeterDto.java +++ b/src/main/java/cn/lihongjie/coal/meter/dto/MeterDto.java @@ -19,4 +19,8 @@ public class MeterDto extends OrgCommonDto { @Comment("安装位置") private String location; + + + @Comment("ybiot设备id") + private String ybiotDeviceId; } diff --git a/src/main/java/cn/lihongjie/coal/meter/dto/UpdateMeterDto.java b/src/main/java/cn/lihongjie/coal/meter/dto/UpdateMeterDto.java index 26a51c42..2a1b1101 100644 --- a/src/main/java/cn/lihongjie/coal/meter/dto/UpdateMeterDto.java +++ b/src/main/java/cn/lihongjie/coal/meter/dto/UpdateMeterDto.java @@ -14,4 +14,8 @@ public class UpdateMeterDto extends OrgCommonDto { private Double initValue; @Comment("安装位置") private String location; + + + @Comment("ybiot设备id") + private String ybiotDeviceId; } diff --git a/src/main/java/cn/lihongjie/coal/meter/entity/MeterEntity.java b/src/main/java/cn/lihongjie/coal/meter/entity/MeterEntity.java index 21dc3c66..0a17dddf 100644 --- a/src/main/java/cn/lihongjie/coal/meter/entity/MeterEntity.java +++ b/src/main/java/cn/lihongjie/coal/meter/entity/MeterEntity.java @@ -14,12 +14,15 @@ public class MeterEntity extends OrgCommonEntity { @Comment("类型") private String type; - @Comment("初始值") private Double initValue; - - @Comment("安装位置") private String location; + + @Comment("ybiot设备id") + private String ybiotDeviceId; + + + } diff --git a/src/main/java/cn/lihongjie/coal/ocr/entity/OcrEntity.java b/src/main/java/cn/lihongjie/coal/ocr/entity/OcrEntity.java index 2a7f54f9..bba5f032 100644 --- a/src/main/java/cn/lihongjie/coal/ocr/entity/OcrEntity.java +++ b/src/main/java/cn/lihongjie/coal/ocr/entity/OcrEntity.java @@ -34,4 +34,6 @@ public class OcrEntity extends CommonEntity { private String ak; + + } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 082a509f..3200b458 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -334,6 +334,10 @@ aliyun: code: oss-rg-china-mainland endpoint : oss-rg-china-mainland.aliyuncs.com internal-endpoint: 不支持 + OCR: + ak: "LTAI5tQEJePBCd85weQT6z6Q" + sk: "wjEePyMe6mvSsF1fCG3KG8IbxcYoag" + endpoint: "ocr-api.cn-hangzhou.aliyuncs.com" dust: url: "http://dust.0531yun.cn/"