Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -84,15 +84,17 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		boolean isNewer = false;
 		Date date = new Date();
 		Date startDate = queryInfo.getDate();
+		Date endDate = null;
 		if (startDate == null) {
 			try {
 				String startDateStr = "2020-05-01";
 				startDate = sdf.parse(startDateStr);
+				endDate = sdf.parse("2021-02-01");
 			} catch (ParseException e) {
 				throw new RuntimeException(e);
 			}
 		}
-		if (queryInfo.getTenantId() == 1 && date.after(startDate)) {
+		if (queryInfo.getTenantId() == 1 && date.after(startDate) && date.before(endDate)) {
 			if (user != null && "18696158274".equals(user.getPhone()) == false) {
 				isNewer = webFeignService.isPurchasedPracticeCourse(user.getId()) == false;
 				SysNewsInformation info = new SysNewsInformation();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -427,7 +427,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 							null,0,"6?sealClassId=" + courseScheduleId + "&subjectName=" + name ,"STUDENT",courseSchedule.getName());
 				}
 			}
-		}else if(StringUtils.isNotEmpty(teacherAttendance.getSignInDeviceNo())){
+		}else if(StringUtils.isEmpty(teacherAttendance.getSignInDeviceNo())){
 			teacherAttendance.setSignInDeviceNo(deviceNum);
 			teacherAttendanceDao.update(teacherAttendance);
 		}

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -290,6 +290,7 @@
         <result column="student_num_" property="studentNum"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="group_type_" property="groupType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="expect_student_num_" property="expectStudentNum"/>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -295,6 +295,7 @@ public class RoomServiceImpl implements RoomService {
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     @Override
     public void joinRoomSuccess(String roomId,String userId,String deviceNum) throws Exception {
+        log.info("joinRoomSuccess: roomId={}, userId={}, deviceNum={}", roomId,userId,deviceNum);
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         if(roomMember == null){
             roomMember = saveRoomMember(roomId,userId);
@@ -314,7 +315,6 @@ public class RoomServiceImpl implements RoomService {
             redisTemplate.delete(leaveSuccessKey);
         }
         redisTemplate.opsForValue().setIfAbsent(joinSuccessKey,roomId,2l,TimeUnit.SECONDS);
-        log.info("joinRoomSuccess : roomId={}, userId={}", roomId, userId);
 
         RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
         CourseSchedule schedule = courseScheduleDao.getLock(Long.parseLong(roomId.substring(1)));
@@ -433,6 +433,7 @@ public class RoomServiceImpl implements RoomService {
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     @Override
     public void leaveRoomSuccess(String roomId,String userId,String deviceNum) throws Exception {
+        log.info("leaveRoomSuccess: roomId={}, userId={},deviceNum={}", roomId,userId,deviceNum);
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
         String leaveSuccessKey = "leaveRoomSuccess"+ roomId + userId;
         Integer firstCourseId = Integer.parseInt(roomId.substring(1));
@@ -466,8 +467,6 @@ public class RoomServiceImpl implements RoomService {
             redisTemplate.delete(joinSuccessKey);
         }
         redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey,roomId,2,TimeUnit.SECONDS);
-        //记录
-        log.info("leaveRoomSuccess: roomId={}, userId={}", roomId,userId);
         RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
 
         if(roleEnum == RoleTeacher){
@@ -483,7 +482,6 @@ public class RoomServiceImpl implements RoomService {
             userDao.deleteByUid(userId);
             return;
         }
-
         if (roleEnum != RoleStudent && isUserDisplay(room, userId)) {
             updateDisplay(roomId, userId, "", 0);
         }
@@ -494,7 +492,6 @@ public class RoomServiceImpl implements RoomService {
             imHelper.dismiss(userId, roomId);
             log.info("leaveRoomSuccess dismiss the room: {},userId: {}", roomId,userId);
         } else {
-//            imHelper.quit(new String[]{userId}, roomId);
             roomMemberDao.deleteUserByRidAndUid(roomId, userId);
             MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, userId, roleEnum.getValue());
             msg.setUserName(roomMember.getName());

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -135,6 +135,45 @@ public class ExportController extends BaseController {
     private SellOrderDao sellOrderDao;
     @Autowired
     private VipGroupActivityService vipGroupActivityService;
+    @Autowired
+    private GoodsService goodsService;
+
+    @ApiOperation(value = "商品列表导出")
+    @PostMapping("export/goods")
+    @PreAuthorize("@pcs.hasPermissions('export/goods')")
+    public void exportGoods(HttpServletResponse response, GoodsQueryInfo queryInfo) throws IOException {
+        queryInfo.setPage(1);
+        queryInfo.setRows(49999);
+        List<Goods> rows = goodsService.queryPage(queryInfo).getRows();
+        OutputStream outputStream = response.getOutputStream();
+        try {
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"商品编号", "货号", "品牌", "商品名称",
+                    "是否组合商品", "学员是否展示", "教务端是否展示", "乐团是否展示", "是否库存预警",
+                    "商品类型", "商品分类", "具体型号", "内部库存", "税务库存", "库存类型", "市场价(元)",
+                    "零售价(元)", "商品团购价(元)", "商品描述", "商品详情", "是否上下架"}, new String[]{
+                    "id", "sn", "brand", "name",
+                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg", "stockWarning.msg",
+                    "type.desc", "goodsCategoryName", "specification", "stockCount", "taxStockCount", "stockType.msg", "marketPrice",
+                    "discountPrice", "groupPurchasePrice", "brief", "desc", "status.msg"}, rows);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attac:wq" +
+                    "hment;filename=goods-" + DateUtil.getDate(new Date()) + ".xls");
+            response.flushBuffer();
+            outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 
     @ApiOperation(value = "VIP活动导出")
     @PostMapping("export/vipGroupActivity")