Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

 screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java

@@ -395,7 +395,7 @@
            //操作日志记录
            HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
            StringBuilder content = new StringBuilder();
            content.append("修改了特殊设备：").append(specialDeviceHistory.getId()).append("：");
            content.append("修改了历史特殊设备：").append(specialDeviceHistory.getId()).append(";");
            Field[] fields = SpecialDevice.class.getDeclaredFields();
            for (Field field : fields) {
                if (field.getName().equals("id")) {
@@ -412,7 +412,7 @@
                    Object o1 = method.invoke(specialDeviceHistory);
                    Object o2 = method.invoke(updateSpecialDeviceHistory);
                    if (o2 != null) {
                        content.append(fieldName).append("：").append(o1).append("-->").append(o2).append(":");
                        content.append(fieldName).append("：").append(o1).append("-->").append(o2).append(";");
                    }

                } catch (Exception e) {
@@ -425,7 +425,7 @@
        //操作日志记录
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        StringBuilder content = new StringBuilder();
        content.append("修改了特殊设备：").append(specialDeviceId).append("：");
        content.append("修改了特殊设备：").append(specialDeviceId).append(";");
        Field[] fields = SpecialDevice.class.getDeclaredFields();
        for (Field field : fields) {
            if (field.getName().equals("id")) {
@@ -442,7 +442,7 @@
                Object o1 = method.invoke(oldSpecialDevice);
                Object o2 = method.invoke(specialDevice);
                if (o2 != null) {
                    content.append(fieldName).append("：").append(o1).append("-->").append(o2).append(":");
                    content.append(fieldName).append("：").append(o1).append("-->").append(o2).append(";");
                }

            } catch (Exception e) {