|
@@ -4,6 +4,7 @@ import cn.efunbox.audio.entity.*;
|
|
|
import cn.efunbox.audio.service.*;
|
|
|
import cn.efunbox.audio.utils.ApiCode;
|
|
|
import cn.efunbox.audio.utils.HttpUtil;
|
|
|
+import cn.efunbox.audio.utils.Common;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.lang.reflect.Field;
|
|
|
import java.lang.reflect.Method;
|
|
|
+import java.sql.Timestamp;
|
|
|
import java.util.*;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -116,7 +118,7 @@ public class AudioController {
|
|
|
record.setIdDevice(device.getId());
|
|
|
record.setIdChannel(device.getIdChannel());
|
|
|
record.setIdAudio(audio.getId());
|
|
|
- record.setCreated(new Date());
|
|
|
+ record.setCreated(new Timestamp(new Date().getTime()));
|
|
|
recordService.Insert(record);
|
|
|
|
|
|
HttpUtil.responseOkData(request, response, audio);
|
|
@@ -157,7 +159,7 @@ public class AudioController {
|
|
|
HttpUtil.responseApiCode(request, response, ApiCode.PARAMETER_ERROR);
|
|
|
return;
|
|
|
}
|
|
|
- audio.setCreated(new Date());
|
|
|
+ audio.setCreated(new Timestamp(new Date().getTime()));
|
|
|
audio = audioService.Insert(audio);
|
|
|
|
|
|
HttpUtil.responseOutWithJson(request, response, audio);
|
|
@@ -176,19 +178,8 @@ public class AudioController {
|
|
|
HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
|
|
|
return;
|
|
|
}
|
|
|
- for(int i=0; i<audio.getClass().getDeclaredFields().length; i++){
|
|
|
- try {
|
|
|
- String fieldName = audio.getClass().getDeclaredFields()[i].getName();
|
|
|
- System.out.println(fieldName);
|
|
|
- String value = GetFieldValueByName(fieldName, audio)==null?"":GetFieldValueByName(fieldName, audio).toString();
|
|
|
- System.out.println(value);
|
|
|
- if(null==GetFieldValueByName(fieldName, audio) && null!=GetFieldValueByName(fieldName, audioOld))
|
|
|
- SetFieldValueByName(audio, fieldName, GetFieldValueByName(fieldName, audioOld));
|
|
|
- }
|
|
|
- catch (Exception e){
|
|
|
- System.out.println(e.getMessage());
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+ audio = (Audio)Common.CopyValue(audio, audioOld);
|
|
|
audio = audioService.Insert(audio);
|
|
|
|
|
|
HttpUtil.responseOutWithJson(request, response, audio);
|
|
@@ -196,44 +187,6 @@ public class AudioController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 根据属性名获取属性值
|
|
|
- * */
|
|
|
- private Object GetFieldValueByName(String fieldName, Object o) {
|
|
|
- try {
|
|
|
- String firstLetter = fieldName.substring(0, 1).toUpperCase();
|
|
|
- String getter = "get" + firstLetter + fieldName.substring(1);
|
|
|
- Method method = o.getClass().getMethod(getter, new Class[] {});
|
|
|
- Object value = method.invoke(o, new Object[] {});
|
|
|
- return value;
|
|
|
- } catch (Exception e) {
|
|
|
- log.error(e.getMessage(),e);
|
|
|
- return null;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 用反射设置对象的属性值
|
|
|
- * @param obj 需要設置值的對象
|
|
|
- * @param fieldName 需要設置值的屬性
|
|
|
- * @param value 需要设置的值
|
|
|
- * @return 设置值后的对象
|
|
|
- */
|
|
|
- private Object SetFieldValueByName(Object obj, String fieldName, Object value) {
|
|
|
- try{
|
|
|
- String firstWord = fieldName.substring(0, 1).toUpperCase();
|
|
|
- String methodName = String.format("set%s%s", firstWord, fieldName.substring(1));
|
|
|
- Method method = obj.getClass().getMethod(methodName, value.getClass());
|
|
|
- method.invoke(obj, value);
|
|
|
- }catch (Exception e) {
|
|
|
- System.out.println(e.getMessage());
|
|
|
- log.error(e.getMessage(), e);
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- return obj;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
* 过滤出渠道有访问权限的音频列表
|
|
|
* @param audioList
|
|
|
* @param rightsList
|