增加java枚举注解；

增加深度解析注解；

admin-core/src/main/java/com/ibeetl/admin/core/annotation/DictEnum.java

@@ -0,0 +1,38 @@
+package com.ibeetl.admin.core.annotation;
+
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * <p>
+ * 通过Java里的枚举类，获取枚举的值
+ * </p>
+ *
+ * @author mlx
+ * @date 2022/9/21
+ * @modified
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface DictEnum {
+
+    /**
+     * 指定类
+     * @return
+     */
+    String value() default "text";
+
+    @AliasFor("value")
+    String type() default "text";
+
+    /**
+     * 文本的后缀
+     *
+     * @return
+     */
+    String suffix() default "Text";
+}

admin-core/src/main/java/com/ibeetl/admin/core/conf/WebMvcConfig.java

@@ -0,0 +1,27 @@
+package com.ibeetl.admin.core.conf;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * 枚举字段可以使用null、空字符串、非匹配的任意字符串进行传参，而不引发异常
+ * @author lx
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @PostConstruct
+    public void myObjectMapper() {
+        // 解决enum不匹配问题 默认值为false
+        objectMapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
+    }
+
+}

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java

@@ -1,6 +1,12 @@
 package com.ibeetl.admin.core.service;
 
+import cn.hutool.core.exceptions.UtilException;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.annotation.DictDeep;
+import com.ibeetl.admin.core.annotation.DictEnum;
 import com.ibeetl.admin.core.entity.CoreDict;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.util.enums.DelFlagEnum;
@@ -9,6 +15,7 @@ import org.beetl.sql.core.TailBean;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,9 +35,9 @@ public class CoreBaseService<T> {
     protected SQLManager sqlManager;
 
 
-
     /**
      * 根据id查询对象，如果主键ID不存在
+     *
      * @param id
      * @return
      */
@@ -42,6 +49,7 @@ public class CoreBaseService<T> {
 
     /**
      * 根据实体查询实体对象List
+     *
      * @param paras
      * @return
      */
@@ -54,6 +62,7 @@ public class CoreBaseService<T> {
 
     /**
      * 根据实体查询实体对象List
+     *
      * @param paras
      * @return
      */
@@ -68,6 +77,7 @@ public class CoreBaseService<T> {
 
     /**
      * 根据实体查询实体对象List
+     *
      * @param paras
      * @return
      */
@@ -85,6 +95,7 @@ public class CoreBaseService<T> {
 
     /**
      * 根据实体或map查询List
+     *
      * @param paras
      * @return
      */
@@ -95,6 +106,7 @@ public class CoreBaseService<T> {
 
     /**
      * 根据id查询
+     *
      * @param classz 返回的对象类型
      * @param id     主键id
      * @return
@@ -107,6 +119,7 @@ public class CoreBaseService<T> {
 
     /**
      * 新增一条数据
+     *
      * @param model 实体类
      * @return
      */
@@ -116,6 +129,7 @@ public class CoreBaseService<T> {
 
     /**
      * 新增一条数据后将ID存入实体
+     *
      * @param model 实体类
      * @return
      */
@@ -125,6 +139,7 @@ public class CoreBaseService<T> {
 
     /**
      * 批量新增数据
+     *
      * @param list 实体集合
      * @return
      */
@@ -138,14 +153,17 @@ public class CoreBaseService<T> {
 
     /**
      * 批量新增数据后将ID存入实体
+     *
      * @param list 实体集合
      * @return
      */
     public boolean insertBatch(List<T> list) {
         return insertBatch(list, true);
     }
+
     /**
      * 批量新增数据后将ID存入实体
+     *
      * @param list 实体集合
      * @return
      */
@@ -159,6 +177,7 @@ public class CoreBaseService<T> {
 
     /**
      * 删除数据（一般为逻辑删除，更新del_flag字段为1）
+     *
      * @param ids
      * @return
      */
@@ -200,8 +219,10 @@ public class CoreBaseService<T> {
         int ret = sqlManager.updateTemplateById(getCurrentEntityClassz(), map);
         return ret == 1;
     }
+
     /**
      * 根据id删除数据
+     *
      * @param id 主键值
      * @return
      */
@@ -211,6 +232,7 @@ public class CoreBaseService<T> {
 
     /**
      * 根据id删除数据
+     *
      * @param id 主键值
      * @return
      */
@@ -220,6 +242,7 @@ public class CoreBaseService<T> {
 
     /**
      * 更新，只更新不为空的字段
+     *
      * @param model
      * @return
      */
@@ -229,6 +252,7 @@ public class CoreBaseService<T> {
 
     /**
      * 更新所有字段
+     *
      * @param model
      * @return
      */
@@ -238,6 +262,7 @@ public class CoreBaseService<T> {
 
     /**
      * 批量更新所有字段
+     *
      * @param list
      * @return
      */
@@ -251,6 +276,7 @@ public class CoreBaseService<T> {
 
     /**
      * 批量更新，只更新不为空的字段
+     *
      * @param list
      * @return
      */
@@ -263,9 +289,9 @@ public class CoreBaseService<T> {
     }
 
 
-
     /**
      * 获取当前注入泛型T的类型
+     *
      * @return 具体类型
      */
     @SuppressWarnings("unchecked")
@@ -308,15 +334,54 @@ public class CoreBaseService<T> {
                         ext.set(field.getName() + dict.suffix(), display);
                     } catch (Exception e) {
                         e.printStackTrace();
+                    } finally {
+                        field.setAccessible(false);
+                    }
                 }
 
+                // 深度解析注解
+                if (field.isAnnotationPresent(DictDeep.class)) {
+                    field.setAccessible(true);
+
+                    try {
+                        Object res = field.get(ext);
+                        if (res instanceof List) {
+                            queryListAfter((List) res);
+                        } else {
+                            queryEntityAfter(res);
                         }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    } finally {
+                        field.setAccessible(false);
                     }
-         c = c.getSuperclass();
-        }while(c!=TailBean.class);
-        
                 }
 
+                // 枚举自动转换中文
+                if (field.isAnnotationPresent(DictEnum.class)) {
+                    field.setAccessible(true);
 
+                    DictEnum dict = field.getAnnotation(DictEnum.class);
 
+                    try {
+                        String display = "";
+                        Method methodByName = ReflectUtil.getMethodByName(field.getType(), "get" + StrUtil.upperFirst(dict.value()));
+                        Object enumValue = ReflectUtil.invoke(field.get(ext), methodByName);
+                        if (ObjectUtil.isNotEmpty(enumValue)) {
+                            display = String.valueOf(enumValue);
+                        }
+                        ext.set(field.getName() + dict.suffix(), display);
+                    } catch (UtilException e) {
+                        throw new RuntimeException(field.getName() + " 缺少getter方法");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    } finally {
+                        field.setAccessible(false);
+                    }
+                }
+            }
+            c = c.getSuperclass();
+        } while (c != TailBean.class);
+
+    }
 }

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java

@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.entity;
 
 import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.annotation.DictDeep;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.Data;
@@ -70,6 +71,7 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{
 
     private Long userId ;
 
+    @DictDeep
     @FetchSql("select * from teacher_open_course_schedule_session_snap where teacher_open_course_schedule_session_snap_status = 1" +
             " and teacher_open_course_id = #teacherOpenCourseId#")
     private List<TeacherOpenCourseScheduleSessionSnap> sessionTagList;

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionSnap.java

@@ -4,13 +4,13 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.annotation.DictEnum;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import org.beetl.sql.annotation.entity.AssignID;
-import org.beetl.sql.annotation.entity.EnumValue;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -37,16 +37,17 @@ public class TeacherOpenCourseScheduleSessionSnap extends BaseEntity{
     private Long teacherOpenCourseScheduleSessionId ;
 
     //关联开课ID
+    @Dict(type = "teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
 
     private Long teacherOpenCourseId ;
 
     //状态（1正常 2删除）
-    @Dict(type="global_stataus")
+    @Dict(type="global_status")
 
     private Integer teacherOpenCourseScheduleSessionSnapStatus ;
 
+    @DictEnum
     //开始状态
-    @EnumValue
     private TeacherOpenCourseScheduleSessionTagStartStatusEnum teacherOpenCourseScheduleSessionTagStartStatus;
 
     //课次名称
@@ -145,7 +146,7 @@ public class TeacherOpenCourseScheduleSessionSnap extends BaseEntity{
      * 已结束 END
      * 未开始 READY
      */
-    protected enum TeacherOpenCourseScheduleSessionTagStartStatusEnum {
+    public enum TeacherOpenCourseScheduleSessionTagStartStatusEnum {
         // 进行中
         ING("进行中"),
         // 已结束
@@ -154,10 +155,12 @@ public class TeacherOpenCourseScheduleSessionSnap extends BaseEntity{
         READY("未开始");
         @Getter
         @Setter
-        private String teacherOpenCourseScheduleSessionTagStartStatusStr;
+        // 可以转换成中文
+//        @JsonValue
+        private String text;
 
-        TeacherOpenCourseScheduleSessionTagStartStatusEnum(String teacherOpenCourseScheduleSessionTagStartStatusStr) {
+        TeacherOpenCourseScheduleSessionTagStartStatusEnum(String text) {
-            this.teacherOpenCourseScheduleSessionTagStartStatusStr = teacherOpenCourseScheduleSessionTagStartStatusStr;
+            this.text = text;
         }
     }
 

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionSnapQuery.java

@@ -8,6 +8,8 @@ import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionSnap;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
+import static com.ibeetl.admin.core.annotation.Query.TYPE_DICT;
+
 /**
  *课表快照查询
  */
@@ -17,9 +19,9 @@ public class TeacherOpenCourseScheduleSessionSnapQuery extends PageParam {
     private Long teacherOpenCourseScheduleSessionSnapId;
     @Query(name = "关联排课ID", display = false)
     private Long teacherOpenCourseScheduleSessionId;
-    @Query(name = "关联开课ID", display = false)
+    @Query(name = "关联开课ID", display = true, type = TYPE_DICT, dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
     private Long teacherOpenCourseId;
-    @Query(name = "状态（1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_stataus")
+    @Query(name = "状态（1正常 2删除）", display = true,type= TYPE_DICT,dict="global_status")
     private Integer teacherOpenCourseScheduleSessionSnapStatus;
     @Query(name = "课次名称", display = false)
     private String teacherOpenCourseScheduleSessionTagName;
@@ -43,6 +45,7 @@ public class TeacherOpenCourseScheduleSessionSnapQuery extends PageParam {
     private String teacherOpenCourseScheduleSessionSnapIdPlural;
     private String teacherOpenCourseScheduleSessionIdPlural;
     private String teacherOpenCourseScheduleSessionSnapStatusPlural;
+    private String teacherOpenCourseIdPlural;
     private String orgIdPlural;
     private String userIdPlural;
 
@@ -176,6 +179,15 @@ public class TeacherOpenCourseScheduleSessionSnapQuery extends PageParam {
     public void setTeacherOpenCourseScheduleSessionSnapJsonStr(String teacherOpenCourseScheduleSessionSnapJsonStr ){
         this.teacherOpenCourseScheduleSessionSnapJsonStr = teacherOpenCourseScheduleSessionSnapJsonStr;
     }
+
+    public String getTeacherOpenCourseIdPlural() {
+        return teacherOpenCourseIdPlural;
+    }
+
+    public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural) {
+        this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
+    }
+
     public String get_given() {
         return _given;
     }

web/src/main/resources/application.properties

@@ -38,6 +38,12 @@ server.tomcat.accesslog.suffix=.log
 server.tomcat.max-http-post-size=-1
 server.tomcat.max-threads=100
 
+#=====================jackson配置==============================
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+spring.jackson.serialization.write_enums_using_to_string=true
+
+
 #html\u89C6\u56FE\u4EA4\u7ED9beetl\u6E32\u67D3
 beetl.suffix=html
 app.name=jlw

web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSessionSnap.md

@@ -69,6 +69,10 @@ queryByCondition
   @if(!isEmpty(userIdPlural)){
   and find_in_set(t.user_id,#userIdPlural#)
   @}
+
+
+
+
 queryByConditionQuery
 ===
 * 根据不为空的参数进行分页查询(无权限)
@@ -138,17 +142,25 @@ queryByCondition
   @if(!isEmpty(userIdPlural)){
   and find_in_set(t.user_id,#userIdPlural#)
   @}
+* 
 deleteTeacherOpenCourseScheduleSessionSnapByIds
 ===
 * 批量删除（假删除）
   update teacher_open_course_schedule_session_snap set teacher_open_course_schedule_session_snap_status = 2 where find_in_set(teacher_open_course_schedule_session_snap_id,#ids#)
+
+
 deleteByIds
 ===
 * 批量删除（真删除）
   delete from teacher_open_course_schedule_session_snap where find_in_set(teacher_open_course_schedule_session_snap_id,#ids#)
+
+
+
 getByIds
 ===
   select * from teacher_open_course_schedule_session_snap where find_in_set(teacher_open_course_schedule_session_snap_id,#ids#)
+
+
 updateGivenByIds
 ===
 * 批量更新指定字段，无论此字段是否有值
@@ -240,6 +252,9 @@ queryByCondition
   @}
   teacher_open_course_schedule_session_snap_id = teacher_open_course_schedule_session_snap_id
   where find_in_set(teacher_open_course_schedule_session_snap_id,#teacherOpenCourseScheduleSessionSnapIdPlural#)
+  
+
+
 getTeacherOpenCourseScheduleSessionSnapValues
 ===
 * 根据不为空的参数进行查询
@@ -287,6 +302,9 @@ queryByCondition
   @if(!isEmpty(userId)){
   and t.user_id =#userId#
   @}
+
+
+
 getValuesByQuery
 ===
 * 根据不为空的参数进行查询

web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js

@@ -141,13 +141,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     hideField :false,
                     hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagEndTime'])?false:sx_['teacherOpenCourseScheduleSessionTagEndTime'],
                 }
-                ,{
-                    field : 'operation_',title : '操作',align:"center", templet: function (d) {
-                        var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
-                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
-                        return htm;
-                    }
-                }
 
         ] ]
 

web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionSnap/index.js

@@ -49,7 +49,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionId'])?false:sx_['teacherOpenCourseScheduleSessionId'],
                 },
                 {
-                    field : 'teacherOpenCourseScheduleSessionSnapStatusText', //数据字典类型为 global_stataus
+                    field : 'teacherOpenCourseScheduleSessionSnapStatusText', //数据字典类型为 global_status
                     title : '状态（1正常 2删除）',
                     align:"center",
                     hideField :false,
@@ -103,20 +103,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     align:"center",
                     hideField :false,
                     hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionSnapAddTime'])?false:sx_['teacherOpenCourseScheduleSessionSnapAddTime'],
-                },
-                {
-                    field : 'orgId', 
-                    title : '组织ID',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
-                },
-                {
-                    field : 'userId', 
-                    title : '用户ID',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
                 }
                 ,{
                     field : 'operation_',title : '操作',align:"center", templet: function (d) {

web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionSnap/add.html

@@ -12,7 +12,7 @@
             <div class="layui-inline">
             	<label class="layui-form-label">状态（1正常 2删除）</label>
 				<div class="layui-input-inline">
-					<layui:simpleDictSelect style='layui-input-inline' type="global_stataus"
+					<layui:simpleDictSelect style='layui-input-inline' type="global_status"
 											id="teacherOpenCourseScheduleSessionSnapStatus" name="teacherOpenCourseScheduleSessionSnapStatus" value="${teacherOpenCourseScheduleSessionSnap.teacherOpenCourseScheduleSessionSnapStatus}" layVerify="" />
 				</div>
             </div>

web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionSnap/edit.html

@@ -12,7 +12,7 @@
             <div class="layui-inline">
             	<label class="layui-form-label">状态（1正常 2删除）</label>
 				<div class="layui-input-inline">
-					<layui:simpleDictSelect style='layui-input-inline' type="global_stataus"
+					<layui:simpleDictSelect style='layui-input-inline' type="global_status"
 						id="teacherOpenCourseScheduleSessionSnapStatus" name="teacherOpenCourseScheduleSessionSnapStatus" value="${teacherOpenCourseScheduleSessionSnap.teacherOpenCourseScheduleSessionSnapStatus}" layVerify="" />
 				</div>
             </div>