数据库时区问题

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxClazzCurriculumServiceImpl.java

@@ -1,17 +1,22 @@
 package com.usoftchina.smartschool.school.wxschool.basic.service.impl;
 
+import com.usoftchina.smartschool.school.po.ClazzCurriculumDO;
 import com.usoftchina.smartschool.school.po.TeacherClazzDO;
 import com.usoftchina.smartschool.school.po.TeacherDO;
-import com.usoftchina.smartschool.school.wxschool.mapper.*;
-import com.usoftchina.smartschool.school.po.ClazzCurriculumDO;
-import com.usoftchina.smartschool.school.po.StudentDO;
 import com.usoftchina.smartschool.school.wxschool.basic.service.WxClazzCurriculumService;
+import com.usoftchina.smartschool.school.wxschool.mapper.WxClazzCurriculumMapper;
+import com.usoftchina.smartschool.school.wxschool.mapper.WxSubjectMapper;
+import com.usoftchina.smartschool.school.wxschool.mapper.WxTeacherClazzMapper;
+import com.usoftchina.smartschool.school.wxschool.mapper.WxTeacherMapper;
 import com.usoftchina.smartschool.school.wxschool.utils.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -73,7 +78,7 @@ public class WxClazzCurriculumServiceImpl implements WxClazzCurriculumService {
 		List<Map<String,Object>> curTuess = new ArrayList<>();
 		List<Map<String,Object>> curWeds = new ArrayList<>();
 		SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
-		dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-6"));
+		//dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-6"));
 		for (ClazzCurriculumDO cc:curricula) {
 			Long curFri = cc.getCurFri();
 			//System.err.println(cc.getCurStartTime());

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxOutInRecordServiceImpl.java

@@ -13,8 +13,9 @@ import com.usoftchina.smartschool.school.wxschool.utils.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -43,7 +44,7 @@ public class WxOutInRecordServiceImpl implements WxOutInRecordService {
 		Integer pageStart = (pageIndex-1)*pageSize;
 		Map<String, Object> map = new HashMap<>();
 		List<OutInRecordDO> outInRecordDOS = outInRecordMapper.selectOutInRecordDOListByStuId(stuId, pageStart, pageSize);
-		List<Map<String, Object>> maps = new ArrayList<>();
+		//List<Map<String, Object>> maps = new ArrayList<>();
 		if (ObjectUtils.isNotEmpty(outInRecordDOS)){
 			Long stuId1 = outInRecordDOS.get(0).getStuId();
 			StudentDO studentDO = studentMapper.get(stuId1);
@@ -52,7 +53,7 @@ public class WxOutInRecordServiceImpl implements WxOutInRecordService {
 			map1.put("clazzName",clazzDO.getClazzName());
 			map1.put("gradeName",gradeMapper.get(clazzDO.getGradeId()).getGradeName());
 			map.put("student",map1);
-			for (OutInRecordDO oi:outInRecordDOS) {
+			/*for (OutInRecordDO oi:outInRecordDOS) {
 				Map<String, Object> toMap = JavaBeanUtil.convertBeanToMap(oi);
 				SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
 				dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-6"));
@@ -63,9 +64,9 @@ public class WxOutInRecordServiceImpl implements WxOutInRecordService {
 					toMap.put("outDate",dateFormat.format(oi.getOutDate()));
 				}
 				maps.add(toMap);
-			}
+			}*/
 		}
-		map.put("outInRecordDOS",maps);
+		map.put("outInRecordDOS",outInRecordDOS);
 		return map;
 	}
 

applications/school/school-server/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
     active: dev
   jackson:
     date-format: yyyy-MM-dd HH:mm
-    time-zone: GMT+8
+    time-zone: GMT+2
   servlet:
     multipart:
       max-file-size: 100Mb