diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index 6b2c1e7..840f166 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,6 +8,7 @@ import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -35,8 +35,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(realtimeWorkService.list(null)); + public Object list(@RequestBody RealtimeWork realtimeWork) { + return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork)); } /** @@ -46,9 +46,7 @@ @ResponseBody public Object listPage(String condition) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = realtimeWorkService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(realtimeWorkService.listPage(page))); } /** @@ -57,8 +55,7 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(RealtimeWork realtimeWork) { - realtimeWorkService.save(realtimeWork); - return ResponseData.success(); + return realtimeWorkService.add(realtimeWork); } /** @@ -67,8 +64,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String realtimeWorkId) { - realtimeWorkService.removeById(realtimeWorkId); - return ResponseData.success(); + return realtimeWorkService.delete(realtimeWorkId); } /** @@ -77,8 +73,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeByIds(realtimeWorkIds); - return ResponseData.success(); + return realtimeWorkService.batchDelete(realtimeWorkIds); } /** @@ -87,20 +82,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(RealtimeWork realtimeWork) { - realtimeWorkService.updateById(realtimeWork); - return ResponseData.success(); + return realtimeWorkService.update(realtimeWork); } /** * 实时工作情况详情 */ -// @RequestMapping(value = "/detail/{realtimeWorkId}") -// @ResponseBody -// public Object detail(@PathVariable("realtimeWorkId") String realtimeWorkId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(realtimeWorkService.selectById(realtimeWorkId)); -// return resultData; -// } + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String realtimeWorkId) { + return ResponseData.success(realtimeWorkService.detail(realtimeWorkId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index 6b2c1e7..840f166 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,6 +8,7 @@ import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -35,8 +35,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(realtimeWorkService.list(null)); + public Object list(@RequestBody RealtimeWork realtimeWork) { + return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork)); } /** @@ -46,9 +46,7 @@ @ResponseBody public Object listPage(String condition) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = realtimeWorkService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(realtimeWorkService.listPage(page))); } /** @@ -57,8 +55,7 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(RealtimeWork realtimeWork) { - realtimeWorkService.save(realtimeWork); - return ResponseData.success(); + return realtimeWorkService.add(realtimeWork); } /** @@ -67,8 +64,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String realtimeWorkId) { - realtimeWorkService.removeById(realtimeWorkId); - return ResponseData.success(); + return realtimeWorkService.delete(realtimeWorkId); } /** @@ -77,8 +73,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeByIds(realtimeWorkIds); - return ResponseData.success(); + return realtimeWorkService.batchDelete(realtimeWorkIds); } /** @@ -87,20 +82,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(RealtimeWork realtimeWork) { - realtimeWorkService.updateById(realtimeWork); - return ResponseData.success(); + return realtimeWorkService.update(realtimeWork); } /** * 实时工作情况详情 */ -// @RequestMapping(value = "/detail/{realtimeWorkId}") -// @ResponseBody -// public Object detail(@PathVariable("realtimeWorkId") String realtimeWorkId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(realtimeWorkService.selectById(realtimeWorkId)); -// return resultData; -// } + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String realtimeWorkId) { + return ResponseData.success(realtimeWorkService.detail(realtimeWorkId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 73252da..069b5ca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -33,11 +33,6 @@ @TableField("BRIEF") private String brief; /** - * 专项名称 - */ - @TableField("SPECIAL_NAME") - private String specialName; - /** * 发现总量 */ @TableField("DISCOVERY_TOTAL") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index 6b2c1e7..840f166 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,6 +8,7 @@ import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -35,8 +35,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(realtimeWorkService.list(null)); + public Object list(@RequestBody RealtimeWork realtimeWork) { + return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork)); } /** @@ -46,9 +46,7 @@ @ResponseBody public Object listPage(String condition) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = realtimeWorkService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(realtimeWorkService.listPage(page))); } /** @@ -57,8 +55,7 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(RealtimeWork realtimeWork) { - realtimeWorkService.save(realtimeWork); - return ResponseData.success(); + return realtimeWorkService.add(realtimeWork); } /** @@ -67,8 +64,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String realtimeWorkId) { - realtimeWorkService.removeById(realtimeWorkId); - return ResponseData.success(); + return realtimeWorkService.delete(realtimeWorkId); } /** @@ -77,8 +73,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeByIds(realtimeWorkIds); - return ResponseData.success(); + return realtimeWorkService.batchDelete(realtimeWorkIds); } /** @@ -87,20 +82,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(RealtimeWork realtimeWork) { - realtimeWorkService.updateById(realtimeWork); - return ResponseData.success(); + return realtimeWorkService.update(realtimeWork); } /** * 实时工作情况详情 */ -// @RequestMapping(value = "/detail/{realtimeWorkId}") -// @ResponseBody -// public Object detail(@PathVariable("realtimeWorkId") String realtimeWorkId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(realtimeWorkService.selectById(realtimeWorkId)); -// return resultData; -// } + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String realtimeWorkId) { + return ResponseData.success(realtimeWorkService.detail(realtimeWorkId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 73252da..069b5ca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -33,11 +33,6 @@ @TableField("BRIEF") private String brief; /** - * 专项名称 - */ - @TableField("SPECIAL_NAME") - private String specialName; - /** * 发现总量 */ @TableField("DISCOVERY_TOTAL") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index 8a0c20a..05b8ca4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.model.RealtimeWork; +import java.util.List; + /** *

* 实时工作情况 服务类 @@ -14,4 +17,17 @@ */ public interface IRealtimeWorkService extends IService { + Object realtimeWorkList(RealtimeWork realtimeWork); + + Page listPage(Page page); + + Object add(RealtimeWork realtimeWork); + + Object delete(String realtimeWorkId); + + Object batchDelete(List realtimeWorkIds); + + Object update(RealtimeWork realtimeWork); + + Object detail(String realtimeWorkId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java index 6b2c1e7..840f166 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,6 +8,7 @@ import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -35,8 +35,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(realtimeWorkService.list(null)); + public Object list(@RequestBody RealtimeWork realtimeWork) { + return ResponseData.success(realtimeWorkService.realtimeWorkList(realtimeWork)); } /** @@ -46,9 +46,7 @@ @ResponseBody public Object listPage(String condition) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = realtimeWorkService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(realtimeWorkService.listPage(page))); } /** @@ -57,8 +55,7 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(RealtimeWork realtimeWork) { - realtimeWorkService.save(realtimeWork); - return ResponseData.success(); + return realtimeWorkService.add(realtimeWork); } /** @@ -67,8 +64,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String realtimeWorkId) { - realtimeWorkService.removeById(realtimeWorkId); - return ResponseData.success(); + return realtimeWorkService.delete(realtimeWorkId); } /** @@ -77,8 +73,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeByIds(realtimeWorkIds); - return ResponseData.success(); + return realtimeWorkService.batchDelete(realtimeWorkIds); } /** @@ -87,20 +82,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(RealtimeWork realtimeWork) { - realtimeWorkService.updateById(realtimeWork); - return ResponseData.success(); + return realtimeWorkService.update(realtimeWork); } /** * 实时工作情况详情 */ -// @RequestMapping(value = "/detail/{realtimeWorkId}") -// @ResponseBody -// public Object detail(@PathVariable("realtimeWorkId") String realtimeWorkId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(realtimeWorkService.selectById(realtimeWorkId)); -// return resultData; -// } + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String realtimeWorkId) { + return ResponseData.success(realtimeWorkService.detail(realtimeWorkId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java index 73252da..069b5ca 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Summary.java @@ -33,11 +33,6 @@ @TableField("BRIEF") private String brief; /** - * 专项名称 - */ - @TableField("SPECIAL_NAME") - private String specialName; - /** * 发现总量 */ @TableField("DISCOVERY_TOTAL") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java index 8a0c20a..05b8ca4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.modular.system.model.RealtimeWork; +import java.util.List; + /** *

* 实时工作情况 服务类 @@ -14,4 +17,17 @@ */ public interface IRealtimeWorkService extends IService { + Object realtimeWorkList(RealtimeWork realtimeWork); + + Page listPage(Page page); + + Object add(RealtimeWork realtimeWork); + + Object delete(String realtimeWorkId); + + Object batchDelete(List realtimeWorkIds); + + Object update(RealtimeWork realtimeWork); + + Object detail(String realtimeWorkId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java index 47a0434..3eb5512 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java @@ -1,11 +1,17 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.modular.system.model.RealtimeWork; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.RealtimeWorkMapper; +import com.casic.missiles.modular.system.model.RealtimeWork; import com.casic.missiles.modular.system.service.IRealtimeWorkService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** *

* 实时工作情况 服务实现类 @@ -17,4 +23,55 @@ @Service public class RealtimeWorkServiceImpl extends ServiceImpl implements IRealtimeWorkService { + @Resource + private RealtimeWorkMapper realtimeWorkMapper; + + @Override + public Object realtimeWorkList(RealtimeWork realtimeWork) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(realtimeWork.getId()!=0,"ID",realtimeWork.getId()); + return realtimeWorkMapper.selectList(wrapper); + } + + @Override + public Page listPage(Page page) { + return realtimeWorkMapper.selectPage(page,null); + } + + @Override + public Object add(RealtimeWork realtimeWork) { + if(realtimeWorkMapper.insert(realtimeWork) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object delete(String realtimeWorkId) { + if(realtimeWorkMapper.deleteById(realtimeWorkId) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object batchDelete(List realtimeWorkIds) { + if(realtimeWorkMapper.deleteBatchIds(realtimeWorkIds) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object update(RealtimeWork realtimeWork) { + if(realtimeWorkMapper.updateById(realtimeWork) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object detail(String realtimeWorkId) { + return realtimeWorkMapper.selectById(realtimeWorkId); + } }