|
@@ -1,17 +1,13 @@
|
|
package com.sooka.apply.service.impl;
|
|
package com.sooka.apply.service.impl;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
-import com.sooka.apply.domain.IntBo;
|
|
|
|
import com.sooka.common.core.text.Convert;
|
|
import com.sooka.common.core.text.Convert;
|
|
import com.sooka.common.utils.DateUtils;
|
|
import com.sooka.common.utils.DateUtils;
|
|
-import com.sooka.common.utils.StringUtils;
|
|
|
|
import com.sooka.common.utils.uuid.IdUtils;
|
|
import com.sooka.common.utils.uuid.IdUtils;
|
|
-import com.sooka.common.utils.uuid.UUID;
|
|
|
|
import com.sooka.framework.util.ShiroUtils;
|
|
import com.sooka.framework.util.ShiroUtils;
|
|
-import com.sooka.framework.web.domain.server.Sys;
|
|
|
|
import com.sooka.system.domain.SysUser;
|
|
import com.sooka.system.domain.SysUser;
|
|
|
|
+import com.util.SecretKeyUtil;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -103,7 +99,7 @@ public class IntRecordServiceImpl implements IIntRecordService
|
|
/**添加后返回主表ID**/
|
|
/**添加后返回主表ID**/
|
|
intRecordMapper.insertIntRecord(intRecord);
|
|
intRecordMapper.insertIntRecord(intRecord);
|
|
/**添加子表**/
|
|
/**添加子表**/
|
|
- return insertIntDetailed(intRecord.getId(),intRecord.getIntDetailedList());
|
|
|
|
|
|
+ return insertIntDetailed(intRecord.getId(),intRecord.getDuration(),intRecord.getIntDetailedList());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -131,7 +127,7 @@ public class IntRecordServiceImpl implements IIntRecordService
|
|
/**删除子表**/
|
|
/**删除子表**/
|
|
intRecordMapper.deleteIntDetailedByRecordIds(Convert.toStrArray(intRecord.getId()));
|
|
intRecordMapper.deleteIntDetailedByRecordIds(Convert.toStrArray(intRecord.getId()));
|
|
/**添加子表**/
|
|
/**添加子表**/
|
|
- return insertIntDetailed(intRecord.getId(),intRecord.getIntDetailedList());
|
|
|
|
|
|
+ return insertIntDetailed(intRecord.getId(),intRecord.getDuration(),intRecord.getIntDetailedList());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -204,14 +200,13 @@ public class IntRecordServiceImpl implements IIntRecordService
|
|
*
|
|
*
|
|
* @param list 申请记录对象
|
|
* @param list 申请记录对象
|
|
*/
|
|
*/
|
|
- private int insertIntDetailed(String id, List<IntDetailed> list){
|
|
|
|
- System.out.println(id);
|
|
|
|
|
|
+ private int insertIntDetailed(String id, String duration, List<IntDetailed> list){
|
|
List<IntDetailed> list_ = new ArrayList<IntDetailed>();
|
|
List<IntDetailed> list_ = new ArrayList<IntDetailed>();
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
IntDetailed intDetailed = new IntDetailed();
|
|
IntDetailed intDetailed = new IntDetailed();
|
|
intDetailed.setRecordId(id);
|
|
intDetailed.setRecordId(id);
|
|
intDetailed.setIntId(list.get(i).getIntId());
|
|
intDetailed.setIntId(list.get(i).getIntId());
|
|
- intDetailed.setSecretKey(IdUtils.fastSimpleUUID());
|
|
|
|
|
|
+ intDetailed.setSecretKey(SecretKeyUtil.AESEncode("3fc674da58",duration+"/"+IdUtils.fastSimpleUUID()));
|
|
intDetailed.setPurpose(list.get(i).getPurpose());
|
|
intDetailed.setPurpose(list.get(i).getPurpose());
|
|
intDetailed.setFile(list.get(i).getFile());
|
|
intDetailed.setFile(list.get(i).getFile());
|
|
list_.add(intDetailed);
|
|
list_.add(intDetailed);
|