|
@@ -27,6 +27,7 @@ import com.zhongzheng.modules.course.bo.CourseChapterSectionQueryBo;
|
|
|
import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
|
|
|
import com.zhongzheng.modules.course.bo.CourseModuleChapterQueryBo;
|
|
|
import com.zhongzheng.modules.course.bo.CourseSectionQueryBo;
|
|
|
+import com.zhongzheng.modules.course.domain.CourseBusiness;
|
|
|
import com.zhongzheng.modules.course.domain.CourseSection;
|
|
|
import com.zhongzheng.modules.course.domain.CourseSubject;
|
|
|
import com.zhongzheng.modules.course.service.*;
|
|
@@ -140,7 +141,7 @@ public class WisdomServiceImpl implements IWisdomService {
|
|
|
|
|
|
private String getCentersListUrl = "/exam/api/centers";
|
|
|
|
|
|
- private String batchUserUrl = "/exam/api/examinees";
|
|
|
+ private String batchUserUrl = "/exam/api/center-examinees";
|
|
|
|
|
|
@Autowired
|
|
|
private RedisCache redisCache;
|
|
@@ -219,40 +220,54 @@ public class WisdomServiceImpl implements IWisdomService {
|
|
|
@Override
|
|
|
public void syncApplyUserInfo(Long applyId) {
|
|
|
List<UserSubscribeVo> list = iUserSubscribeService.selectApplyUserList(applyId);
|
|
|
- Map<Long,CenterVo> cMap = new HashMap<>();
|
|
|
+ Map<String,CenterVo> cMap = new HashMap<>();
|
|
|
List<CenterVo> cList = new ArrayList<>();
|
|
|
for(UserSubscribeVo vo : list){
|
|
|
- ExamineesVo userVo = new ExamineesVo();
|
|
|
- userVo.setExamineeCode(vo.getExamineeCode());
|
|
|
- userVo.setIdNumber(vo.getIdCard());
|
|
|
- userVo.setPhone_num(vo.getTelphone());
|
|
|
- userVo.setExamineeName(vo.getRealname());
|
|
|
- userVo.setIdCardImg1(vo.getIdCardImg1());
|
|
|
- userVo.setIdCardImg2(vo.getIdCardImg2());
|
|
|
+ Map<String, Object> userVo = new HashMap<>();
|
|
|
+ userVo.put("examineeCode",vo.getExamineeCode());
|
|
|
+ userVo.put("idNumber",vo.getIdCard());
|
|
|
+ userVo.put("examineeName","ddsfs");
|
|
|
+ userVo.put("idCardImg1",vo.getIdCardImg1());
|
|
|
+ userVo.put("idCardImg2",vo.getIdCardImg2());
|
|
|
+ userVo.put("phone_num",vo.getTelphone());
|
|
|
+ userVo.put("status",0);
|
|
|
+ userVo.put("reportTime",DateUtils.getTime());
|
|
|
+ userVo.put("temperature","0℃");
|
|
|
if(vo.getReportStatus()==0){
|
|
|
- userVo.setReportStatus("未签署");
|
|
|
+ userVo.put("reportStatus","未签署");
|
|
|
}
|
|
|
if(vo.getReportStatus()==1){
|
|
|
- userVo.setReportStatus("已签署");
|
|
|
+ userVo.put("reportStatus","已签署");
|
|
|
}
|
|
|
- if(cMap.containsKey(vo.getCenterId())){
|
|
|
- CenterVo centerVo = cMap.get(vo.getCenterId());
|
|
|
- List<ExamineesVo> examinees = centerVo.getExaminees();
|
|
|
+ String key = vo.getCenterId()+"-"+vo.getApplySiteExamTime()+"-"+vo.getApplySiteStartTime()+"-"+vo.getApplySiteEndTime();
|
|
|
+ if(cMap.containsKey(key)){
|
|
|
+ CenterVo centerVo = cMap.get(key);
|
|
|
+ List<Map<String, Object>> examinees = centerVo.getExaminees();
|
|
|
examinees.add(userVo);
|
|
|
}else{
|
|
|
- List<ExamineesVo> examinees = new ArrayList<>();
|
|
|
+ List<Map<String, Object>> examinees = new ArrayList<>();
|
|
|
examinees.add(userVo);
|
|
|
CenterVo centerVo = new CenterVo();
|
|
|
centerVo.setExaminees(examinees);
|
|
|
centerVo.setCenterId(vo.getCenterId());
|
|
|
- centerVo.setExamCode(vo.getSiteCode());
|
|
|
+ centerVo.setExamCode(vo.getApplyCode());
|
|
|
+ centerVo.setExamName(vo.getApplyName());
|
|
|
centerVo.setZipFileName(vo.getApplyName()+"考生证件照");
|
|
|
- cMap.put(vo.getCenterId(),centerVo);
|
|
|
+ centerVo.setExamTime(DateUtils.timestampToDate(vo.getApplySiteExamTime()));
|
|
|
+ centerVo.setExamStartTime(centerVo.getExamTime()+" "+vo.getApplySiteStartTime());
|
|
|
+ centerVo.setExamEndTime(centerVo.getExamTime()+" "+vo.getApplySiteEndTime());
|
|
|
+ if(vo.getSubscribeStatus()==1){
|
|
|
+ centerVo.setStatus(0);
|
|
|
+ }
|
|
|
+ if(vo.getSubscribeStatus()==2){
|
|
|
+ centerVo.setStatus(2);
|
|
|
+ }
|
|
|
+ cMap.put(key,centerVo);
|
|
|
}
|
|
|
}
|
|
|
- Iterator<Long> iterator = cMap.keySet().iterator();
|
|
|
+ Iterator<String> iterator = cMap.keySet().iterator();
|
|
|
while (iterator.hasNext()) {
|
|
|
- Long key = iterator.next();
|
|
|
+ String key = iterator.next();
|
|
|
CenterVo vo = cMap.get(key);
|
|
|
String filename = FileUtils.encodingZipFilename(vo.getZipFileName());
|
|
|
String zipFile = FileUtils.getZipAbsoluteFile(filename);
|
|
@@ -260,50 +275,73 @@ public class WisdomServiceImpl implements IWisdomService {
|
|
|
try {
|
|
|
ZipOutputStream outStream = new ZipOutputStream(new FileOutputStream(zipFile));
|
|
|
List<FileBean> fileBeanList = new ArrayList<>();
|
|
|
- for(ExamineesVo userVo : vo.getExaminees()){
|
|
|
+ for(Map<String, Object> userVo : vo.getExaminees()){
|
|
|
FileBean f1 = new FileBean();
|
|
|
- f1.setPath(userVo.getIdCardImg1());
|
|
|
- f1.setFileName(userVo.getExamineeCode()+"_0.jpg");
|
|
|
+ String idCardImg1 = Validator.isEmpty(userVo.get("idCardImg1"))?null:String.valueOf(userVo.get("idCardImg1"));
|
|
|
+ f1.setPath(idCardImg1);
|
|
|
+ f1.setFileName(userVo.get("examineeCode")+"_0.jpg");
|
|
|
FileBean f2 = new FileBean();
|
|
|
- f2.setPath(userVo.getIdCardImg2());
|
|
|
- f2.setFileName(userVo.getExamineeCode()+"_1.jpg");
|
|
|
+ String idCardImg2 = Validator.isEmpty(userVo.get("idCardImg2"))?null:String.valueOf(userVo.get("idCardImg2"));
|
|
|
+ f2.setPath(idCardImg2);
|
|
|
+ f2.setFileName(userVo.get("examineeCode")+"_1.jpg");
|
|
|
fileBeanList.add(f1);
|
|
|
fileBeanList.add(f2);
|
|
|
}
|
|
|
- System.out.println(fileBeanList);
|
|
|
ossService.zipWisdomDownload(fileBeanList,outStream);
|
|
|
outStream.close();
|
|
|
byte[] dataByte = ToolsUtils.getBytesByFile(zipFile);
|
|
|
- // vo.setExamineeZipFiles();
|
|
|
+ vo.setExamineeZipFiles(dataByte);
|
|
|
} catch (IOException e) {
|
|
|
- System.out.println(e.getMessage() + "压缩");
|
|
|
}
|
|
|
cList.add(vo);
|
|
|
}
|
|
|
String url = host + batchUserUrl;
|
|
|
String auth_code = authorization();
|
|
|
- List<Map<String, Object>> paramMapList = new ArrayList<>();
|
|
|
- for(CenterVo vo : cList){
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
- map.put("centerId",vo.getCenterId());
|
|
|
- map.put("examCode",vo.getExamCode());
|
|
|
- map.put("examinees",vo.getExaminees());
|
|
|
- map.put("zipFileName",vo.getZipFileName());
|
|
|
- // map.put("examineeZipFiles",vo.getExamineeZipFiles());
|
|
|
- paramMapList.add(map);
|
|
|
- }
|
|
|
try{
|
|
|
+ List<Map<String, Object>> paramMapList = new ArrayList<>();
|
|
|
+ for(CenterVo vo : cList){
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("centerId",vo.getCenterId());
|
|
|
+ map.put("examCode",vo.getExamCode());
|
|
|
+ map.put("examinees",vo.getExaminees());
|
|
|
+ map.put("examName",vo.getExamName());
|
|
|
+ map.put("zipFileName",vo.getZipFileName());
|
|
|
+ map.put("examTime",vo.getExamTime()+" 00:00:00");
|
|
|
+ map.put("examStartTime",vo.getExamStartTime()+":00");
|
|
|
+ map.put("examEndTime",vo.getExamEndTime()+":00");
|
|
|
+ map.put("roomStatus",0);
|
|
|
+ map.put("examStatus",0);
|
|
|
+ map.put("examineeSum",0);
|
|
|
+ // map.put("examineeZipFiles",vo.getExamineeZipFiles());
|
|
|
+ map.put("examineeZipFiles","2");
|
|
|
+ paramMapList.add(map);
|
|
|
+ }
|
|
|
String signature = SignatureUtil.createSignature(paramMapList, appid);
|
|
|
- /*JSONObject obj = new JSONObject();
|
|
|
- JSONArray jsonArray = new JSONArray();
|
|
|
- jsonArray.add(paramMapList);*/
|
|
|
Map<String, String> hearders = new HashMap<>();
|
|
|
hearders.put("auth_code", auth_code);
|
|
|
hearders.put("appid", appid);
|
|
|
hearders.put("sign", signature);
|
|
|
- System.out.println(signature);
|
|
|
String result = HttpUtils.sendPostJsonHeader(url,JSON.toJSONString(paramMapList),hearders);
|
|
|
+ JSONObject userInfoJSON = null;
|
|
|
+ userInfoJSON = JSON.parseObject(result);
|
|
|
+ if (userInfoJSON.containsKey("code")&&"200".equals(String.valueOf(userInfoJSON.get("code")))) {
|
|
|
+ JSONArray jsonArray = userInfoJSON.getJSONObject("result").getJSONArray("records");
|
|
|
+ List<ExamineesVo> listRs=jsonArray.toJavaList(ExamineesVo.class);
|
|
|
+ for (ExamineesVo vo : listRs){
|
|
|
+ LambdaUpdateWrapper<UserSubscribe> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
|
|
|
+ objectLambdaUpdateWrapper.eq(UserSubscribe::getExamineeCode, vo.getExamineeCode());
|
|
|
|
|
|
+ objectLambdaUpdateWrapper.set(UserSubscribe::getSeatNumber, vo.getSeatNumber());
|
|
|
+ objectLambdaUpdateWrapper.set(UserSubscribe::getSyncStatus, 1);
|
|
|
+ objectLambdaUpdateWrapper.set(UserSubscribe::getRoomAddress, vo.getRoomAddress());
|
|
|
+ objectLambdaUpdateWrapper.set(UserSubscribe::getSyncResult, "同步成功"+DateUtils.getTime());
|
|
|
+ objectLambdaUpdateWrapper.set(UserSubscribe::getRoomName, vo.getRoomName());
|
|
|
+ objectLambdaUpdateWrapper.set(UserSubscribe::getRoomCode, vo.getRoomCode());
|
|
|
+ objectLambdaUpdateWrapper.set(UserSubscribe::getRoomId, vo.getRoomId());
|
|
|
+ objectLambdaUpdateWrapper.set(UserSubscribe::getUpdateTime,DateUtils.getNowTime());
|
|
|
+ iUserSubscribeService.update(null, objectLambdaUpdateWrapper);
|
|
|
+ }
|
|
|
+ }
|
|
|
}catch (Exception e){
|
|
|
|
|
|
}
|