diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalD.java index e15b02b2a..1ccf62753 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalD.java @@ -20,6 +20,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_bus_global_d") +@Deprecated public class RDimBusGlobalD { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalM.java index f2e44a13a..05ef3d8e5 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalM.java @@ -20,6 +20,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_bus_global_m") +@Deprecated public class RDimBusGlobalM{ private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalY.java index 8eedf0a18..4a47ec058 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalY.java @@ -20,6 +20,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_bus_global_y") +@Deprecated public class RDimBusGlobalY { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventD.java index b55c3d423..e567b68fe 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventD.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_bus_station_event_d") +@Deprecated public class RDimBusStationEventD { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventM.java index 678280f0f..e3d7b6714 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventM.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_bus_station_event_m") +@Deprecated public class RDimBusStationEventM{ private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisDPO.java index 33be55e0e..f3e2bbebf 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisDPO.java @@ -17,6 +17,7 @@ import java.time.LocalDate; */ @Data @TableName(value = "r_dim_bus_station_event_startis_d") +@Deprecated public class RDimBusStationEventStartisDPO { @MppMultiId(value = "Org_Id") private String orgId; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisMPO.java index 1a90d3c3f..07001b0a1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisMPO.java @@ -17,6 +17,7 @@ import java.time.LocalDate; */ @Data @TableName(value = "r_dim_bus_station_event_startis_m") +@Deprecated public class RDimBusStationEventStartisMPO { @MppMultiId(value = "Org_Id") private String orgId; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisYPO.java index 55257ccdd..bedef748e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisYPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventStartisYPO.java @@ -17,6 +17,7 @@ import java.time.LocalDate; */ @Data @TableName(value = "r_dim_bus_station_event_startis_y") +@Deprecated public class RDimBusStationEventStartisYPO { @MppMultiId(value = "Org_Id") private String orgId; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventY.java index 40c83ee1f..2dd28e7e2 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusStationEventY.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_bus_station_event_y") +@Deprecated public class RDimBusStationEventY { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetDPO.java index f1620f352..4f0d037ec 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetDPO.java @@ -21,6 +21,7 @@ import lombok.Data; */ @Data @TableName(value = "r_dim_bus_target_d") +@Deprecated public class RDimBusTargetDPO { @MppMultiId(value = "Org_Id") private String orgId; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetMPO.java index cad1b3756..0f9e2d4c9 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetMPO.java @@ -21,6 +21,7 @@ import lombok.Data; */ @Data @TableName(value = "r_dim_bus_target_m") +@Deprecated public class RDimBusTargetMPO { @MppMultiId(value = "Org_Id") private String orgId; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetYPO.java index e00adcf6b..e7eaa36f0 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetYPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusTargetYPO.java @@ -21,6 +21,7 @@ import lombok.Data; */ @Data @TableName(value = "r_dim_bus_target_y") +@Deprecated public class RDimBusTargetYPO { @MppMultiId(value = "Org_Id") private String orgId; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventD.java index 749bd1b04..59df088db 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventD.java @@ -20,6 +20,7 @@ import lombok.Setter; */ @Data @TableName("r_dim_obj_event_d") +@Deprecated public class RDimObjEventD { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventM.java index b6e93796e..c9f636e8e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventM.java @@ -20,6 +20,7 @@ import lombok.Setter; */ @Data @TableName("r_dim_obj_event_m") +@Deprecated public class RDimObjEventM { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventY.java index daa5ef822..9c13037fb 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventY.java @@ -20,6 +20,7 @@ import lombok.Setter; */ @Data @TableName("r_dim_obj_event_y") +@Deprecated public class RDimObjEventY { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalD.java index 2831b6099..b7aa39d7e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalD.java @@ -19,6 +19,7 @@ import java.time.LocalDate; @Getter @Setter @TableName("r_dim_obj_global_d") +@Deprecated public class RDimObjGlobalD { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalM.java index a39418344..33383dc12 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalM.java @@ -20,6 +20,7 @@ import java.time.LocalDate; @Getter @Setter @TableName("r_dim_obj_global_m") +@Deprecated public class RDimObjGlobalM { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalY.java index 9b8e4372c..04ff34580 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalY.java @@ -20,6 +20,7 @@ import java.time.LocalDate; @Getter @Setter @TableName("r_dim_obj_global_y") +@Deprecated public class RDimObjGlobalY { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateD.java index 0125d534b..ee92c4a7c 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateD.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_obj_rate_d") +@Deprecated public class RDimObjRateD{ private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateM.java index 95d28e7c9..cc2af199b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateM.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_obj_rate_m") +@Deprecated public class RDimObjRateM{ private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateY.java index 4b25667af..4633799e7 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjRateY.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_obj_rate_y") +@Deprecated public class RDimObjRateY{ private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetD.java index 51383335a..2038fcc22 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetD.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_obj_target_d") +@Deprecated public class RDimObjTargetD { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java index ca8f4c9b9..73b802e9f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetM.java @@ -18,6 +18,7 @@ import java.time.LocalDate; @Getter @Setter @TableName("r_dim_obj_target_m") +@Deprecated public class RDimObjTargetM { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java index 3c405a994..cfcfdeaca 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjTargetY.java @@ -18,6 +18,7 @@ import java.time.LocalDate; @Getter @Setter @TableName("r_dim_obj_target_y") +@Deprecated public class RDimObjTargetY { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationBaseD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationBaseD.java index 04d5d8a52..f53d78ad8 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationBaseD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationBaseD.java @@ -20,6 +20,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_station_base_d") +@Deprecated public class RDimStationBaseD extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalD.java index ff20ffa08..34d9269c2 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalD.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_station_global_d") +@Deprecated public class RDimStationGlobalD extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalM.java index f8f662761..1c516a4e3 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalM.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_station_global_m") +@Deprecated public class RDimStationGlobalM extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalY.java index 5422f9215..864cadee6 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationGlobalY.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_station_global_y") +@Deprecated public class RDimStationGlobalY extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationHarmnicDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationHarmnicDPO.java index b2babf5f1..90afec1ea 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationHarmnicDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationHarmnicDPO.java @@ -19,6 +19,7 @@ import lombok.Data; */ @Data @TableName(value = "r_dim_station_harmnic_d") +@Deprecated public class RDimStationHarmnicDPO { /** * 单位code diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetD.java index d6bfbb020..dc7b2d831 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetD.java @@ -19,6 +19,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_station_target_d") +@Deprecated public class RDimStationTargetD extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetM.java index a3994ace0..df6663f26 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetM.java @@ -20,6 +20,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_station_target_m") +@Deprecated public class RDimStationTargetM extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetY.java index 465355ab9..10f703784 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimStationTargetY.java @@ -20,6 +20,7 @@ import lombok.Setter; @Getter @Setter @TableName("r_dim_station_target_y") +@Deprecated public class RDimStationTargetY extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java index c428d1547..5aff54244 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java @@ -6,12 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.harmonic.mapper.upload.PmsTemUserMapper; import com.njcn.harmonic.pojo.param.upload.PmsTemProcessApprovalParam; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; +import com.njcn.user.api.DeptFeignClient; import com.njcn.web.enums.GWSendEnum; import com.njcn.web.factory.PageFactory; import com.njcn.web.pojo.param.SendParam; import com.njcn.web.utils.GwSendUtil; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -33,8 +37,13 @@ import com.njcn.harmonic.service.upload.PmsTemProcessApprovalService; * @version V1.0.0 */ @Service +@RequiredArgsConstructor public class PmsTemProcessApprovalServiceImpl extends ServiceImpl implements PmsTemProcessApprovalService{ + private final DeptFeignClient deptFeignClient; + + private final PmsTemUserMapper pmsTemUserMapper; + @Override public Boolean createOrUpdate(PmsTemProcessApprovalParam param) { PmsTemProcessApproval pmsTemProcessApproval = new PmsTemProcessApproval(); @@ -47,8 +56,15 @@ public class PmsTemProcessApprovalServiceImpl extends ServiceImpl pageList(PmsTemProcessApprovalParam.QueryPmsTemProcessApprovalParam param) { + List deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(param.getMaintOrg()).getData(); + List objIds = pmsTemUserMapper.selectList(new LambdaQueryWrapper().select(PmsTemUserPO::getObjId).in(PmsTemUserPO::getMaintOrg,deptCodes)).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList()); + + if(CollUtil.isEmpty(objIds)){ + return new Page<>(param.getPageNum(),param.getPageSize()); + } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.between(StringUtils.isNotBlank(param.getSearchBeginTime())&&StringUtils.isNotBlank(param.getSearchEndTime()),PmsTemProcessApproval::getCreateTime,param.getSearchBeginTime(),param.getSearchEndTime()); + lambdaQueryWrapper + .between(StringUtils.isNotBlank(param.getSearchBeginTime())&&StringUtils.isNotBlank(param.getSearchEndTime()),PmsTemProcessApproval::getCreateTime,param.getSearchBeginTime(),param.getSearchEndTime()).in(PmsTemProcessApproval::getTempUserDossierId,objIds); return this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java index 84a1dfd9d..42e2a3109 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.harmonic.service.upload.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -96,7 +97,7 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl getList(PmsTemUserParam.QueryPmsTemUserParam param) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate,param.getSearchBeginTime()); + lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate,DateUtil.format(DateUtil.parse(param.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN),DatePattern.NORM_MONTH_PATTERN)); return this.list(lambdaQueryWrapper); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java index 4027f612c..ea357d561 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.mapper.upload.PmsTemProcessTrackMapper; +import com.njcn.harmonic.mapper.upload.PmsTemUserMapper; import com.njcn.harmonic.pojo.param.upload.PmsTemProcessTrackParam; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; @@ -42,6 +43,10 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl pageList(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam parkQuery) { + List deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(parkQuery.getMaintOrg()).getData(); + List objIds = pmsTemUserMapper.selectList(new LambdaQueryWrapper().select(PmsTemUserPO::getObjId).in(PmsTemUserPO::getMaintOrg,deptCodes)).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList()); + + if(CollUtil.isEmpty(objIds)){ + return new Page<>(parkQuery.getPageNum(),parkQuery.getPageSize()); + } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(PmsTemProcessTrackPO::getTempUserDossierId,objIds); + return this.page(new Page<>(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java index 176a3993b..3b54ff40a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadCommPointBusServiceImpl.java @@ -101,7 +101,7 @@ public class RUploadCommPointBusServiceImpl extends ServiceImpl sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT); List ids = list.get(i).stream().map(RUploadCommPointBus::getObjId).collect(Collectors.toList()); int count = GwSendUtil.returnInfoMsg(ids,sendRes); - System.out.println("上送成功,上送成功返回"+count+"条"); + System.out.println("上送成功,上送成功返回"+count+"条,上传数据"+list.get(i).size()+"条"); if(count == list.get(i).size()){ LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); lambdaUpdateWrapper.set(RUploadCommPointBus::getUploadStatus,1).in(RUploadCommPointBus::getObjId,ids); diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java index bdce8e570..35ddc3471 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetDPO.java @@ -20,6 +20,7 @@ import lombok.Data; */ @Data @TableName(value = "r_dim_station_target_d") +@Deprecated public class RDimStationTargetDPO extends BaseEntity { @MppMultiId(value = "Org_Id") private String orgId; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java index 456a9ed33..6997c8cb1 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetMPO.java @@ -21,6 +21,7 @@ import lombok.Data; */ @Data @TableName(value = "r_dim_station_target_m") +@Deprecated public class RDimStationTargetMPO extends BaseEntity { @MppMultiId(value = "Org_Id") private String orgId; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java index 880816ceb..9cd176271 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimStationTargetYPO.java @@ -21,6 +21,7 @@ import lombok.Data; */ @Data @TableName(value = "r_dim_station_target_y") +@Deprecated public class RDimStationTargetYPO extends BaseEntity { @MppMultiId(value = "Org_Id")