|
@@ -4,19 +4,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.ym.mec.biz.dal.dao.SysManualDao;
|
|
import com.ym.mec.biz.dal.dao.SysManualDao;
|
|
|
|
+import com.ym.mec.biz.dal.entity.CloudTeacherStudent;
|
|
|
|
+import com.ym.mec.biz.dal.entity.SysConfig;
|
|
import com.ym.mec.biz.dal.entity.SysManual;
|
|
import com.ym.mec.biz.dal.entity.SysManual;
|
|
import com.ym.mec.biz.dal.page.SysManualQueryInfo;
|
|
import com.ym.mec.biz.dal.page.SysManualQueryInfo;
|
|
import com.ym.mec.biz.service.SysManualService;
|
|
import com.ym.mec.biz.service.SysManualService;
|
|
|
|
+import com.ym.mec.common.dal.BaseDAO;
|
|
import com.ym.mec.common.page.PageInfo;
|
|
import com.ym.mec.common.page.PageInfo;
|
|
import com.ym.mec.common.page.PageUtil;
|
|
import com.ym.mec.common.page.PageUtil;
|
|
import com.ym.mec.common.page.WrapperUtil;
|
|
import com.ym.mec.common.page.WrapperUtil;
|
|
|
|
+import com.ym.mec.util.collection.MapUtil;
|
|
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 org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
* (SysManual)表服务实现类
|
|
* (SysManual)表服务实现类
|
|
@@ -29,11 +33,26 @@ public class SysManualServiceImpl extends ServiceImpl<SysManualDao, SysManual> i
|
|
|
|
|
|
private final static Logger logger = LoggerFactory.getLogger(SysManualServiceImpl.class);
|
|
private final static Logger logger = LoggerFactory.getLogger(SysManualServiceImpl.class);
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private SysManualDao sysManualDao;
|
|
|
|
+
|
|
public PageInfo<SysManual> query(SysManualQueryInfo queryInfo) {
|
|
public PageInfo<SysManual> query(SysManualQueryInfo queryInfo) {
|
|
- QueryWrapper<SysManual> queryWrapper = new WrapperUtil<SysManual>().hasEq("menu_id_", queryInfo.getMenuId()).queryWrapper();
|
|
|
|
- Page<SysManual> pageInfo = PageUtil.getPage(queryInfo.getPage(), queryInfo.getRows());
|
|
|
|
|
|
+ PageInfo<SysManual> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
|
|
|
|
+ Map<String, Object> params = new HashMap<>();
|
|
|
|
+ MapUtil.populateMap(params, queryInfo);
|
|
|
|
+ List<SysManual> dataList = null;
|
|
|
|
+ int count = sysManualDao.findRecordCount(params);
|
|
|
|
+ if (count > 0) {
|
|
|
|
+ pageInfo.setTotal(count);
|
|
|
|
+ params.put("offset", pageInfo.getOffset());
|
|
|
|
+ dataList = sysManualDao.queryRecord(params);
|
|
|
|
+ }
|
|
|
|
+ if (count == 0) {
|
|
|
|
+ dataList = new ArrayList<>();
|
|
|
|
+ }
|
|
|
|
+ pageInfo.setRows(dataList);
|
|
|
|
|
|
- return PageUtil.pageInfo(this.page(pageInfo, queryWrapper));
|
|
|
|
|
|
+ return pageInfo;
|
|
}
|
|
}
|
|
|
|
|
|
public Boolean add(SysManual sysManual, Integer userId) {
|
|
public Boolean add(SysManual sysManual, Integer userId) {
|