From 9fbd8befa5e133b9011bdd89a77893942fc7f7fd Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Wed, 24 May 2023 21:11:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2023=E5=B9=B45=E6=9C=8824=E6=97=A5=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcKetangbiaoController.java | 42 +++++++++++-------- .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 8 ++-- .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 16 +++---- .../kc/ktgl/service/IKcKetangbiaoService.java | 8 ++-- .../service/impl/KcKetangbiaoServiceImpl.java | 16 +++---- 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java index 2365779c..65bc0393 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java @@ -245,8 +245,6 @@ public class KcKetangbiaoController extends JeecgController jrktzsList(String skrq) { + public Result jrktzsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //第一句-今日课堂-总数 QueryWrapper qw = new QueryWrapper(); qw.select("*"); qw.eq("skrq", skrq); - List> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw); return Result.OK(kcKetangbiaoList); } @@ -275,13 +274,14 @@ public class KcKetangbiaoController extends JeecgController jrktyxkList(String skrq) { + public Result jrktyxkList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //第一句-今日课堂-已下课数 QueryWrapper qw = new QueryWrapper(); qw.select("*"); qw.eq("skrq", skrq); qw.apply("date_format( now(), '%H%i' ) > hhjs"); - List> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw); return Result.OK(kcKetangbiaoList); } @@ -293,13 +293,14 @@ public class KcKetangbiaoController extends JeecgController skzList(String skrq) { + public Result skzList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //第一句-今日课堂-上课中 QueryWrapper qw = new QueryWrapper(); qw.select("*"); qw.eq("skrq", skrq); qw.apply("date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks"); - List> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw); return Result.OK(kcKetangbiaoList); } @@ -311,13 +312,14 @@ public class KcKetangbiaoController extends JeecgController ykktzsList(String skrq) { + public Result ykktzsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂总数 QueryWrapper qw3 = new QueryWrapper(); qw3.select("*"); qw3.ge("skrq",startTime);//<= qw3.le("skrq",skrq);//>= - List> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiao3List = kcKetangbiaoService.pageMaps(page,qw3); return Result.OK(kcKetangbiao3List); } @@ -329,12 +331,13 @@ public class KcKetangbiaoController extends JeecgController ykkttkktList(String skrq) { + public Result ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂听课课堂 KcKetangbiao kcKetangbiao = new KcKetangbiao(); kcKetangbiao.setStartTime(startTime); kcKetangbiao.setEndTime(skrq); - List> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(kcKetangbiao); + Page> page = new Page<>(pageNo, pageSize); + IPage> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(page,kcKetangbiao); return Result.OK(listTjIndex); } @@ -346,12 +349,13 @@ public class KcKetangbiaoController extends JeecgController ykkttkrcList(String skrq) { + public Result ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂听课课堂 KcKetangbiao kcKetangbiao = new KcKetangbiao(); kcKetangbiao.setStartTime(startTime); kcKetangbiao.setEndTime(skrq); - List> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(kcKetangbiao); + Page> page = new Page<>(pageNo, pageSize); + IPage> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(page,kcKetangbiao); return Result.OK(listTjIndex); } @@ -363,9 +367,10 @@ public class KcKetangbiaoController extends JeecgController jrtkktsList(String skrq) { + public Result jrtkktsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂听课课堂 - List> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtkktsList(skrq); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtkktsList(page,skrq); return Result.OK(kcKetangbiao2List); } @@ -378,9 +383,10 @@ public class KcKetangbiaoController extends JeecgController jrtktkrcList(String skrq) { + public Result jrtktkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂听课课堂 - List> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtktkrcList(skrq); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtktkrcList(page,skrq); return Result.OK(kcKetangbiao2List); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index a7372ef2..15e9ff15 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -32,11 +32,11 @@ public interface KcKetangbiaoMapper extends BaseMapper { void saveHis(KcKetangbiao kcKetangbiaohis); - List> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao); + List> getIndexYkktstjYkkttkktList(Page> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao); - List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao); + List> getIndexYkktstjYkkttkrcList(Page> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao); - List> selectJrTkJrtkktsList(String skrq); + List> selectJrTkJrtkktsList(Page> page, @Param("skrq") String skrq); - List> selectJrTkJrtktkrcList(String skrq); + List> selectJrTkJrtktkrcList(Page> page, @Param("skrq") String skrq); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index 485e33a6..127b2782 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -142,11 +142,11 @@ * FROM kc_ketangbiao k, kc_tingke t WHERE k.id = t.kechengbiaoid and t.tingketime > '1' - - AND skrq >= #{startTime} + + AND skrq >= #{et.startTime} - - AND skrq <= #{endTime} + + AND skrq <= #{et.endTime} @@ -155,11 +155,11 @@ * FROM kc_ketangbiao k, kc_tingke t WHERE k.id = t.kechengbiaoid and t.tingketime > '1' - - AND skrq >= #{startTime} + + AND skrq >= #{et.startTime} - - AND skrq <= #{endTime} + + AND skrq <= #{et.endTime} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index 5a928801..a962ce55 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -33,11 +33,11 @@ public interface IKcKetangbiaoService extends IService { */ void saveHis(KcKetangbiao kcKetangbiaohis); - List> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao); + IPage> getIndexYkktstjYkkttkktList(Page> page,KcKetangbiao kcKetangbiao); - List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao); + IPage> getIndexYkktstjYkkttkrcList(Page> page,KcKetangbiao kcKetangbiao); - List> selectJrTkJrtkktsList(String skrq); + IPage> selectJrTkJrtkktsList(Page> page,String skrq); - List> selectJrTkJrtktkrcList(String skrq); + IPage> selectJrTkJrtktkrcList(Page> page,String skrq); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java index a5e289eb..a6cbe413 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java @@ -53,22 +53,22 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao) { - return baseMapper.getIndexYkktstjYkkttkktList(kcKetangbiao); + public IPage> getIndexYkktstjYkkttkktList(Page> page, KcKetangbiao kcKetangbiao) { + return page.setRecords(baseMapper.getIndexYkktstjYkkttkktList(page, kcKetangbiao)); } @Override - public List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao) { - return baseMapper.getIndexYkktstjYkkttkrcList(kcKetangbiao); + public IPage> getIndexYkktstjYkkttkrcList(Page> page, KcKetangbiao kcKetangbiao) { + return page.setRecords(baseMapper.getIndexYkktstjYkkttkrcList(page, kcKetangbiao)); } @Override - public List> selectJrTkJrtkktsList(String skrq) { - return baseMapper.selectJrTkJrtkktsList(skrq); + public IPage> selectJrTkJrtkktsList(Page> page, String skrq) { + return page.setRecords(baseMapper.selectJrTkJrtkktsList(page, skrq)); } @Override - public List> selectJrTkJrtktkrcList(String skrq) { - return baseMapper.selectJrTkJrtktkrcList(skrq); + public IPage> selectJrTkJrtktkrcList(Page> page, String skrq) { + return page.setRecords(baseMapper.selectJrTkJrtktkrcList(page, skrq)); } } From 0b4cff6cfa6c644682c30cb4d1bd3c195bfb3e1b Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Wed, 24 May 2023 23:45:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2023=E5=B9=B45=E6=9C=8824=E6=97=A5=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SyncTFwdtShryxx.java | 70 ++++++++ .../controller/TFwdtShryxxController.java | 163 ++++++++++++++++++ .../kc/grab/exports/entity/TFwdtShryxx.java | 59 +++++++ .../exports/mapper/TFwdtShryxxMapper.java | 14 ++ .../exports/mapper/xml/TFwdtShryxxMapper.xml | 5 + .../exports/service/ITFwdtShryxxService.java | 14 ++ .../service/impl/TFwdtShryxxServiceImpl.java | 21 +++ .../controller/XxhbshryxxController.java | 162 +++++++++++++++++ .../kc/grab/imports/entity/Xxhbshryxx.java | 59 +++++++ .../grab/imports/mapper/XxhbshryxxMapper.java | 14 ++ .../imports/mapper/xml/XxhbshryxxMapper.xml | 5 + .../imports/service/IXxhbshryxxService.java | 30 ++++ .../service/impl/XxhbshryxxServiceImpl.java | 37 ++++ 13 files changed, 653 insertions(+) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/controller/TFwdtShryxxController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/TFwdtShryxxMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/xml/TFwdtShryxxMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/ITFwdtShryxxService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtShryxxServiceImpl.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbshryxxController.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbshryxxMapper.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbshryxxMapper.xml create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbshryxxService.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbshryxxServiceImpl.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java new file mode 100644 index 00000000..ba76384e --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java @@ -0,0 +1,70 @@ +package org.jeecg.modules.kc.grab.SynchronizationService; + +import cn.hutool.core.bean.BeanUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; +import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; +import org.jeecg.modules.kc.grab.exports.entity.TFwdtShryxx; +import org.jeecg.modules.kc.grab.exports.entity.TJwKcxxb; +import org.jeecg.modules.kc.grab.exports.service.ITFwdtShryxxService; +import org.jeecg.modules.kc.grab.exports.service.ITJwKcxxbService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbkcxxb; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbshryxx; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog; +import org.jeecg.modules.kc.grab.imports.service.IXxhbkcxxbService; +import org.jeecg.modules.kc.grab.imports.service.IXxhbshryxxService; +import org.quartz.JobExecutionContext; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.Map; + +@Slf4j +public class SyncTFwdtShryxx extends BaseSync { + + @Autowired + private ITFwdtShryxxService expService; + + @Autowired + private IXxhbshryxxService impService; + + /** + * 若参数变量名修改 QuartzJobController中也需对应修改 + */ + + @Override + public void execute(JobExecutionContext jobExecutionContext) { + start(); + run(getParamMap()); + end(); + } + + + /** + * 有参定时任务实现 + * @param param + */ + public void run(Map param){ + //查询数据 + List inDataList = expService.list(); + List outDataList = Lists.newArrayList(); + + //清洗数据 + inDataList.forEach(x -> outDataList.add(BeanUtil.toBean(x, Xxhbshryxx.class))); + + //保存到胃 + impService.syncList(outDataList); + + Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); + xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); + saveLog(xxhbsynclog, Xxhbshryxx.class); + } + + /** + * 无参定时任务实现 + */ + public void run(){ + run(null); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/controller/TFwdtShryxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/controller/TFwdtShryxxController.java new file mode 100644 index 00000000..41c63ef7 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/controller/TFwdtShryxxController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.kc.grab.exports.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.kc.grab.exports.entity.TFwdtShryxx; +import org.jeecg.modules.kc.grab.exports.service.ITFwdtShryxxService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +@Api(tags="同步数据表(shryxx)") +@RestController +@RequestMapping("/grab/xxhbshryxx") +@Slf4j +public class TFwdtShryxxController extends JeecgController { + @Autowired + private ITFwdtShryxxService xxhbshryxxService; + + /** + * 分页列表查询 + * + * @param xxhbshryxx + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "同步数据表(shryxx)-分页列表查询") + @ApiOperation(value="同步数据表(shryxx)-分页列表查询", notes="同步数据表(shryxx)-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TFwdtShryxx xxhbshryxx, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(xxhbshryxx, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = xxhbshryxxService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param xxhbshryxx + * @return + */ + @AutoLog(value = "同步数据表(shryxx)-添加") + @ApiOperation(value="同步数据表(shryxx)-添加", notes="同步数据表(shryxx)-添加") + @RequiresPermissions("grab:xxhbshryxx:add") + @PostMapping(value = "/add") + public Result add(@RequestBody TFwdtShryxx xxhbshryxx) { + xxhbshryxxService.save(xxhbshryxx); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param xxhbshryxx + * @return + */ + @AutoLog(value = "同步数据表(shryxx)-编辑") + @ApiOperation(value="同步数据表(shryxx)-编辑", notes="同步数据表(shryxx)-编辑") + @RequiresPermissions("grab:xxhbshryxx:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TFwdtShryxx xxhbshryxx) { + xxhbshryxxService.updateById(xxhbshryxx); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "同步数据表(shryxx)-通过id删除") + @ApiOperation(value="同步数据表(shryxx)-通过id删除", notes="同步数据表(shryxx)-通过id删除") + @RequiresPermissions("grab:xxhbshryxx:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + xxhbshryxxService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "同步数据表(shryxx)-批量删除") + @ApiOperation(value="同步数据表(shryxx)-批量删除", notes="同步数据表(shryxx)-批量删除") + @RequiresPermissions("grab:xxhbshryxx:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.xxhbshryxxService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "同步数据表(shryxx)-通过id查询") + @ApiOperation(value="同步数据表(shryxx)-通过id查询", notes="同步数据表(shryxx)-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + TFwdtShryxx xxhbshryxx = xxhbshryxxService.getById(id); + if(xxhbshryxx==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(xxhbshryxx); + } + + /** + * 导出excel + * + * @param request + * @param xxhbshryxx + */ + @RequiresPermissions("grab:xxhbshryxx:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, TFwdtShryxx xxhbshryxx) { + return super.exportXls(request, xxhbshryxx, TFwdtShryxx.class, "同步数据表(shryxx)"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("grab:xxhbshryxx:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TFwdtShryxx.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java new file mode 100644 index 00000000..88dcc5e6 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.kc.grab.exports.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +@Data +@TableName("t_fwdt_shryxx") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="TFwdtShryxx对象", description="同步数据表(shryxx)") +public class TFwdtShryxx implements Serializable { + private static final long serialVersionUID = 1L; + + /**工号*/ + @Excel(name = "工号", width = 15) + @ApiModelProperty(value = "工号") + private java.lang.String gh; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String xm; + /**单位号*/ + @Excel(name = "单位号", width = 15) + @ApiModelProperty(value = "单位号") + private java.lang.String dwh; + /**职务代码*/ + @Excel(name = "职务代码", width = 15) + @ApiModelProperty(value = "职务代码") + private java.lang.String zwdm; + /**职务名称*/ + @Excel(name = "职务名称", width = 15) + @ApiModelProperty(value = "职务名称") + private java.lang.String zwmc; + /**年级*/ + @Excel(name = "年级", width = 15) + @ApiModelProperty(value = "年级") + private java.lang.String nj; + /**时间戳*/ + @Excel(name = "时间戳", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "时间戳") + private java.util.Date timestamps; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/TFwdtShryxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/TFwdtShryxxMapper.java new file mode 100644 index 00000000..c46dd42f --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/TFwdtShryxxMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.grab.exports.mapper; + +import org.jeecg.modules.kc.grab.exports.entity.TFwdtShryxx; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +public interface TFwdtShryxxMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/xml/TFwdtShryxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/xml/TFwdtShryxxMapper.xml new file mode 100644 index 00000000..2a402742 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/mapper/xml/TFwdtShryxxMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/ITFwdtShryxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/ITFwdtShryxxService.java new file mode 100644 index 00000000..316d3979 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/ITFwdtShryxxService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.grab.exports.service; + +import org.jeecg.modules.kc.grab.exports.entity.TFwdtShryxx; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +public interface ITFwdtShryxxService extends IService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtShryxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtShryxxServiceImpl.java new file mode 100644 index 00000000..73471f63 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtShryxxServiceImpl.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.kc.grab.exports.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.jeecg.modules.kc.grab.exports.entity.TFwdtShryxx; +import org.jeecg.modules.kc.grab.exports.mapper.TFwdtShryxxMapper; +import org.jeecg.modules.kc.grab.exports.service.ITFwdtShryxxService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +@DS("multi-oracle") +@Service +public class TFwdtShryxxServiceImpl extends ServiceImpl implements ITFwdtShryxxService { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbshryxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbshryxxController.java new file mode 100644 index 00000000..329c0984 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/controller/XxhbshryxxController.java @@ -0,0 +1,162 @@ +package org.jeecg.modules.kc.grab.imports.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbshryxx; +import org.jeecg.modules.kc.grab.imports.service.IXxhbshryxxService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +@Api(tags="同步数据表(shryxx)") +@RestController +@RequestMapping("/grab/imports/xxhbshryxx") +@Slf4j +public class XxhbshryxxController extends JeecgController { + @Autowired + private IXxhbshryxxService xxhbshryxxService; + + /** + * 分页列表查询 + * + * @param xxhbshryxx + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "同步数据表(shryxx)-分页列表查询") + @ApiOperation(value="同步数据表(shryxx)-分页列表查询", notes="同步数据表(shryxx)-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Xxhbshryxx xxhbshryxx, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(xxhbshryxx, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = xxhbshryxxService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param xxhbshryxx + * @return + */ + @AutoLog(value = "同步数据表(shryxx)-添加") + @ApiOperation(value="同步数据表(shryxx)-添加", notes="同步数据表(shryxx)-添加") + @RequiresPermissions("grab:xxhbshryxx:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Xxhbshryxx xxhbshryxx) { + xxhbshryxxService.save(xxhbshryxx); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param xxhbshryxx + * @return + */ + @AutoLog(value = "同步数据表(shryxx)-编辑") + @ApiOperation(value="同步数据表(shryxx)-编辑", notes="同步数据表(shryxx)-编辑") + @RequiresPermissions("grab:xxhbshryxx:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Xxhbshryxx xxhbshryxx) { + xxhbshryxxService.updateById(xxhbshryxx); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "同步数据表(shryxx)-通过id删除") + @ApiOperation(value="同步数据表(shryxx)-通过id删除", notes="同步数据表(shryxx)-通过id删除") + @RequiresPermissions("grab:xxhbshryxx:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + xxhbshryxxService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "同步数据表(shryxx)-批量删除") + @ApiOperation(value="同步数据表(shryxx)-批量删除", notes="同步数据表(shryxx)-批量删除") + @RequiresPermissions("grab:xxhbshryxx:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.xxhbshryxxService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "同步数据表(shryxx)-通过id查询") + @ApiOperation(value="同步数据表(shryxx)-通过id查询", notes="同步数据表(shryxx)-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Xxhbshryxx xxhbshryxx = xxhbshryxxService.getById(id); + if(xxhbshryxx==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(xxhbshryxx); + } + + /** + * 导出excel + * + * @param request + * @param xxhbshryxx + */ + @RequiresPermissions("grab:xxhbshryxx:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Xxhbshryxx xxhbshryxx) { + return super.exportXls(request, xxhbshryxx, Xxhbshryxx.class, "同步数据表(shryxx)"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("grab:xxhbshryxx:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Xxhbshryxx.class); + } + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java new file mode 100644 index 00000000..45e88cf9 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.kc.grab.imports.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +@Data +@TableName("xxhbshryxx") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="xxhbshryxx对象", description="同步数据表(shryxx)") +public class Xxhbshryxx implements Serializable { + private static final long serialVersionUID = 1L; + + /**工号*/ + @Excel(name = "工号", width = 15) + @ApiModelProperty(value = "工号") + private java.lang.String gh; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String xm; + /**单位号*/ + @Excel(name = "单位号", width = 15) + @ApiModelProperty(value = "单位号") + private java.lang.String dwh; + /**职务代码*/ + @Excel(name = "职务代码", width = 15) + @ApiModelProperty(value = "职务代码") + private java.lang.String zwdm; + /**职务名称*/ + @Excel(name = "职务名称", width = 15) + @ApiModelProperty(value = "职务名称") + private java.lang.String zwmc; + /**年级*/ + @Excel(name = "年级", width = 15) + @ApiModelProperty(value = "年级") + private java.lang.String nj; + /**时间戳*/ + @Excel(name = "时间戳", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "时间戳") + private java.util.Date timestamps; +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbshryxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbshryxxMapper.java new file mode 100644 index 00000000..ee443a25 --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/XxhbshryxxMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.kc.grab.imports.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbshryxx; + +/** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +public interface XxhbshryxxMapper extends BaseMapper { + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbshryxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbshryxxMapper.xml new file mode 100644 index 00000000..e0da494a --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/mapper/xml/XxhbshryxxMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbshryxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbshryxxService.java new file mode 100644 index 00000000..dd1dd5ad --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/IXxhbshryxxService.java @@ -0,0 +1,30 @@ +package org.jeecg.modules.kc.grab.imports.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbshryxx; + +import java.util.Collection; + +/** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +public interface IXxhbshryxxService extends IService { + /** + * 同步数据 + * @param entityList + * @return + */ + boolean syncList(Collection entityList); + + /** + * + * @param entityList + * @param isDelete + * @return + */ + boolean syncList(Collection entityList, boolean isDelete); + +} diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbshryxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbshryxxServiceImpl.java new file mode 100644 index 00000000..31e3b64c --- /dev/null +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/service/impl/XxhbshryxxServiceImpl.java @@ -0,0 +1,37 @@ +package org.jeecg.modules.kc.grab.imports.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.kc.grab.imports.entity.Xxhbshryxx; +import org.jeecg.modules.kc.grab.imports.mapper.XxhbshryxxMapper; +import org.jeecg.modules.kc.grab.imports.service.IXxhbshryxxService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; + +/** + * @Description: 同步数据表(shryxx) + * @Author: jeecg-boot + * @Date: 2023-05-24 + * @Version: V1.0 + */ +@Service +public class XxhbshryxxServiceImpl extends ServiceImpl implements IXxhbshryxxService { + + @Override + @Transactional(rollbackFor = {Exception.class}) + public boolean syncList(Collection entityList) { + return syncList(entityList, true); + } + + @Override + @Transactional(rollbackFor = {Exception.class}) + public boolean syncList(Collection entityList, boolean isDelete) { + QueryWrapper dqw = new QueryWrapper(); + if(isDelete){ + baseMapper.delete(dqw); + } + return this.saveBatch(entityList, 1000); + } +}