Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-12-28 3e2ae8bd7aefb12f5521e49c3bb5c773ef525cae

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/enums/SpillwayTypeEnum.java

@@ -33,30 +33,30 @@
    * }
    */

   ZC(1,"正槽式溢洪道"),
   ZC("1","正槽式溢洪道"),

   CC(2,"侧槽式溢洪道"),
   CC("2","侧槽式溢洪道"),

   JS(3,"井式溢洪道"),
   JS("3","井式溢洪道"),

   HX(4,"虹吸式溢洪道"),
   HX("4","虹吸式溢洪道"),

   YLB(5,"溢流坝段坝顶溢流"),
   YLB("5","溢流坝段坝顶溢流"),


   QI_TA(9,"其他"),
   QI_TA("9","其他"),

   NULL_ABLE(-1,"");
   NULL_ABLE("-1","");

   Integer key;
   String key;

   String label;
   SpillwayTypeEnum(Integer key, String label) {
   SpillwayTypeEnum(String key, String label) {
      this.key = key;
      this.label = label;
   }

   public static SpillwayTypeEnum find(Integer key) {
   public static SpillwayTypeEnum find(String key) {
      return Arrays.stream(values()).filter(resFucEnum -> resFucEnum.key==key).findAny().orElse(NULL_ABLE);
   }