zouyu
2024-08-05 9f95745a06d65d6627765e0b9135746beff3158e
检验下单修改
已修改4个文件
22 ■■■■■ 文件已修改
framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
@@ -10,4 +10,6 @@
    String name() default "";
    int width() default 100;
}
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
@@ -12,7 +12,7 @@
public class PrintChina {
    public static <T> List<Map<String, String>> printChina(Class<T> tClass) {
    public static <T> List<Map<String, Object>> printChina(Class<T> tClass) {
        //将实体类的属性和注释转换成参数
        List<Field> fieldList = new ArrayList<>();
        while (tClass != null){
@@ -21,27 +21,29 @@
        }
        Field[] fields = new Field[fieldList.size()];
        fieldList.toArray(fields);
        ArrayList<Map<String, String>> list = new ArrayList<>();
        ArrayList<Map<String, Object>> list = new ArrayList<>();
        for (Field field : fields) {
            Map<String, String> soundVo = new HashMap<>();
            Map<String, Object> soundVo = new HashMap<>();
            boolean bool = field.isAnnotationPresent(ApiModelProperty.class);
            boolean bool2 = field.isAnnotationPresent(ValueTableShow.class);
            if (bool2) {
                int order = field.getAnnotation(ValueTableShow.class).value();
                String value = field.getAnnotation(ValueTableShow.class).name();
                int width = field.getAnnotation(ValueTableShow.class).width();
                if (bool){
                    value = value.isEmpty() ? field.getAnnotation(ApiModelProperty.class).value() : value;
                }
                soundVo.put("label", field.getName());
                soundVo.put("value", value);
                soundVo.put("width", width);
                soundVo.put("order", order + "");
                if(list.size() == 0){
                    list.add(soundVo);
                }else{
                    boolean isAdd = false;
                    for (int i = 0; i < list.size(); i++) {
                        Map<String, String> map = list.get(i);
                        if(order < Integer.parseInt(map.get("order"))){
                        Map<String, Object> map = list.get(i);
                        if(order < Integer.parseInt(map.get("order").toString())){
                            list.add(i, soundVo);
                            isAdd = true;
                            break;
framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
@@ -60,9 +60,9 @@
    @Override
    protected void addInterceptors(InterceptorRegistry registry) {
        // TODO: 2024/6/4 访问swagger需关下面拦截器
        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
        registry.addInterceptor(powerConfig).addPathPatterns("/**");
        registry.addInterceptor(logConfig).addPathPatterns("/**");
//        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
//        registry.addInterceptor(powerConfig).addPathPatterns("/**");
//        registry.addInterceptor(logConfig).addPathPatterns("/**");
        super.addInterceptors(registry);
    }
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -10,7 +10,7 @@
    private String id;
    @ValueTableShow(value = 1,name = "委托编号")
    @ValueTableShow(value = 1,name = "委托编号",width = 190)
    private String entrustCode;
    @ValueTableShow(value = 2,name = "样品名称")