diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 6e7c38b..b6e42c2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -1,7 +1,6 @@ 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; @@ -10,10 +9,12 @@ import com.casic.missiles.modular.system.service.ISummaryService; 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; +import java.util.HashMap; import java.util.List; /** @@ -36,8 +37,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(summaryService.list(null)); + public Object list(@RequestBody HashMap map) { + return ResponseData.success(summaryService.getSummaryList(map)); } /** @@ -45,11 +46,9 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(@RequestBody HashMap map) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = summaryService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(summaryService.listPage(page,map))); } /** @@ -57,9 +56,8 @@ */ @RequestMapping(value = "/add") @ResponseBody - public Object add(Summary summary) { - summaryService.save(summary); - return ResponseData.success(); + public Object add(@RequestBody Summary summary) { + return summaryService.add(summary); } /** @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String summaryId) { - summaryService.removeById(summaryId); - return ResponseData.success(); + return summaryService.delete(summaryId); } /** @@ -77,9 +74,8 @@ */ @RequestMapping(value = "/batchDelete") @ResponseBody - public Object delete(@RequestParam("summaryIds") List summaryIds) { - summaryService.removeBatchByIds(summaryIds); - return ResponseData.success(); + public Object delete(@RequestParam List summaryIds) { + return summaryService.batchDelete(summaryIds); } /** @@ -88,21 +84,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Summary summary) { - summaryService.updateById(summary); - return ResponseData.success(); + return summaryService.update(summary); } /** * 舆情综述详情 */ -// @RequestMapping(value = "/detail/{summaryId}") -// @ResponseBody -// public Object detail(@PathVariable("summaryId") String summaryId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(summaryService.selectById(summaryId)); -// return resultData; -// } -//} + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String summaryId) { + return ResponseData.success(summaryService.detail(summaryId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 6e7c38b..b6e42c2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -1,7 +1,6 @@ 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; @@ -10,10 +9,12 @@ import com.casic.missiles.modular.system.service.ISummaryService; 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; +import java.util.HashMap; import java.util.List; /** @@ -36,8 +37,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(summaryService.list(null)); + public Object list(@RequestBody HashMap map) { + return ResponseData.success(summaryService.getSummaryList(map)); } /** @@ -45,11 +46,9 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(@RequestBody HashMap map) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = summaryService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(summaryService.listPage(page,map))); } /** @@ -57,9 +56,8 @@ */ @RequestMapping(value = "/add") @ResponseBody - public Object add(Summary summary) { - summaryService.save(summary); - return ResponseData.success(); + public Object add(@RequestBody Summary summary) { + return summaryService.add(summary); } /** @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String summaryId) { - summaryService.removeById(summaryId); - return ResponseData.success(); + return summaryService.delete(summaryId); } /** @@ -77,9 +74,8 @@ */ @RequestMapping(value = "/batchDelete") @ResponseBody - public Object delete(@RequestParam("summaryIds") List summaryIds) { - summaryService.removeBatchByIds(summaryIds); - return ResponseData.success(); + public Object delete(@RequestParam List summaryIds) { + return summaryService.batchDelete(summaryIds); } /** @@ -88,21 +84,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Summary summary) { - summaryService.updateById(summary); - return ResponseData.success(); + return summaryService.update(summary); } /** * 舆情综述详情 */ -// @RequestMapping(value = "/detail/{summaryId}") -// @ResponseBody -// public Object detail(@PathVariable("summaryId") String summaryId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(summaryService.selectById(summaryId)); -// return resultData; -// } -//} + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String summaryId) { + return ResponseData.success(summaryService.detail(summaryId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java index 72872af..6094532 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java @@ -2,7 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.Summary; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** *

@@ -14,4 +19,7 @@ */ public interface SummaryMapper extends BaseMapper

{ + List getSummaryList(@Param("map") HashMap map); + + Page getSummaryList(Page page,@Param("map") HashMap map); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 6e7c38b..b6e42c2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -1,7 +1,6 @@ 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; @@ -10,10 +9,12 @@ import com.casic.missiles.modular.system.service.ISummaryService; 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; +import java.util.HashMap; import java.util.List; /** @@ -36,8 +37,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(summaryService.list(null)); + public Object list(@RequestBody HashMap map) { + return ResponseData.success(summaryService.getSummaryList(map)); } /** @@ -45,11 +46,9 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(@RequestBody HashMap map) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = summaryService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(summaryService.listPage(page,map))); } /** @@ -57,9 +56,8 @@ */ @RequestMapping(value = "/add") @ResponseBody - public Object add(Summary summary) { - summaryService.save(summary); - return ResponseData.success(); + public Object add(@RequestBody Summary summary) { + return summaryService.add(summary); } /** @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String summaryId) { - summaryService.removeById(summaryId); - return ResponseData.success(); + return summaryService.delete(summaryId); } /** @@ -77,9 +74,8 @@ */ @RequestMapping(value = "/batchDelete") @ResponseBody - public Object delete(@RequestParam("summaryIds") List summaryIds) { - summaryService.removeBatchByIds(summaryIds); - return ResponseData.success(); + public Object delete(@RequestParam List summaryIds) { + return summaryService.batchDelete(summaryIds); } /** @@ -88,21 +84,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Summary summary) { - summaryService.updateById(summary); - return ResponseData.success(); + return summaryService.update(summary); } /** * 舆情综述详情 */ -// @RequestMapping(value = "/detail/{summaryId}") -// @ResponseBody -// public Object detail(@PathVariable("summaryId") String summaryId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(summaryService.selectById(summaryId)); -// return resultData; -// } -//} + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String summaryId) { + return ResponseData.success(summaryService.detail(summaryId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java index 72872af..6094532 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java @@ -2,7 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.Summary; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** *

@@ -14,4 +19,7 @@ */ public interface SummaryMapper extends BaseMapper

{ + List getSummaryList(@Param("map") HashMap map); + + Page getSummaryList(Page page,@Param("map") HashMap map); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index 8eaa144..d9d62fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -6,6 +6,7 @@ + @@ -22,7 +23,21 @@ - ID AS id, BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + + + + + + + and ID = #{map.id} + + + and SPECIAL_NAME like CONCAT('%',#{map.specialName},'%') + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 6e7c38b..b6e42c2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -1,7 +1,6 @@ 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; @@ -10,10 +9,12 @@ import com.casic.missiles.modular.system.service.ISummaryService; 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; +import java.util.HashMap; import java.util.List; /** @@ -36,8 +37,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(summaryService.list(null)); + public Object list(@RequestBody HashMap map) { + return ResponseData.success(summaryService.getSummaryList(map)); } /** @@ -45,11 +46,9 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(@RequestBody HashMap map) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = summaryService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(summaryService.listPage(page,map))); } /** @@ -57,9 +56,8 @@ */ @RequestMapping(value = "/add") @ResponseBody - public Object add(Summary summary) { - summaryService.save(summary); - return ResponseData.success(); + public Object add(@RequestBody Summary summary) { + return summaryService.add(summary); } /** @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String summaryId) { - summaryService.removeById(summaryId); - return ResponseData.success(); + return summaryService.delete(summaryId); } /** @@ -77,9 +74,8 @@ */ @RequestMapping(value = "/batchDelete") @ResponseBody - public Object delete(@RequestParam("summaryIds") List summaryIds) { - summaryService.removeBatchByIds(summaryIds); - return ResponseData.success(); + public Object delete(@RequestParam List summaryIds) { + return summaryService.batchDelete(summaryIds); } /** @@ -88,21 +84,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Summary summary) { - summaryService.updateById(summary); - return ResponseData.success(); + return summaryService.update(summary); } /** * 舆情综述详情 */ -// @RequestMapping(value = "/detail/{summaryId}") -// @ResponseBody -// public Object detail(@PathVariable("summaryId") String summaryId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(summaryService.selectById(summaryId)); -// return resultData; -// } -//} + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String summaryId) { + return ResponseData.success(summaryService.detail(summaryId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java index 72872af..6094532 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java @@ -2,7 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.Summary; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** *

@@ -14,4 +19,7 @@ */ public interface SummaryMapper extends BaseMapper

{ + List getSummaryList(@Param("map") HashMap map); + + Page getSummaryList(Page page,@Param("map") HashMap map); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index 8eaa144..d9d62fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -6,6 +6,7 @@ + @@ -22,7 +23,21 @@ - ID AS id, BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + + + + + + + and ID = #{map.id} + + + and SPECIAL_NAME like CONCAT('%',#{map.specialName},'%') + + 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 069b5ca..73252da 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,6 +33,11 @@ @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/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 6e7c38b..b6e42c2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -1,7 +1,6 @@ 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; @@ -10,10 +9,12 @@ import com.casic.missiles.modular.system.service.ISummaryService; 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; +import java.util.HashMap; import java.util.List; /** @@ -36,8 +37,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(summaryService.list(null)); + public Object list(@RequestBody HashMap map) { + return ResponseData.success(summaryService.getSummaryList(map)); } /** @@ -45,11 +46,9 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(@RequestBody HashMap map) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = summaryService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(summaryService.listPage(page,map))); } /** @@ -57,9 +56,8 @@ */ @RequestMapping(value = "/add") @ResponseBody - public Object add(Summary summary) { - summaryService.save(summary); - return ResponseData.success(); + public Object add(@RequestBody Summary summary) { + return summaryService.add(summary); } /** @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String summaryId) { - summaryService.removeById(summaryId); - return ResponseData.success(); + return summaryService.delete(summaryId); } /** @@ -77,9 +74,8 @@ */ @RequestMapping(value = "/batchDelete") @ResponseBody - public Object delete(@RequestParam("summaryIds") List summaryIds) { - summaryService.removeBatchByIds(summaryIds); - return ResponseData.success(); + public Object delete(@RequestParam List summaryIds) { + return summaryService.batchDelete(summaryIds); } /** @@ -88,21 +84,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Summary summary) { - summaryService.updateById(summary); - return ResponseData.success(); + return summaryService.update(summary); } /** * 舆情综述详情 */ -// @RequestMapping(value = "/detail/{summaryId}") -// @ResponseBody -// public Object detail(@PathVariable("summaryId") String summaryId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(summaryService.selectById(summaryId)); -// return resultData; -// } -//} + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String summaryId) { + return ResponseData.success(summaryService.detail(summaryId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java index 72872af..6094532 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java @@ -2,7 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.Summary; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** *

@@ -14,4 +19,7 @@ */ public interface SummaryMapper extends BaseMapper

{ + List getSummaryList(@Param("map") HashMap map); + + Page getSummaryList(Page page,@Param("map") HashMap map); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index 8eaa144..d9d62fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -6,6 +6,7 @@ + @@ -22,7 +23,21 @@ - ID AS id, BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + + + + + + + and ID = #{map.id} + + + and SPECIAL_NAME like CONCAT('%',#{map.specialName},'%') + + 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 069b5ca..73252da 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,6 +33,11 @@ @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/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java index faa06de..bd840ac 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java @@ -1,9 +1,13 @@ 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.Summary; +import java.util.HashMap; +import java.util.List; + /** *

* 舆情综述 服务类 @@ -14,4 +18,17 @@ */ public interface ISummaryService extends IService

{ + Object getSummaryList(HashMap map); + + Page listPage(Page page, HashMap map); + + Object add(Summary summary); + + Object batchDelete(List summaryIds); + + Object delete(String summaryId); + + Object update(Summary summary); + + Object detail(String summaryId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 6e7c38b..b6e42c2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -1,7 +1,6 @@ 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; @@ -10,10 +9,12 @@ import com.casic.missiles.modular.system.service.ISummaryService; 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; +import java.util.HashMap; import java.util.List; /** @@ -36,8 +37,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(summaryService.list(null)); + public Object list(@RequestBody HashMap map) { + return ResponseData.success(summaryService.getSummaryList(map)); } /** @@ -45,11 +46,9 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(@RequestBody HashMap map) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = summaryService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(summaryService.listPage(page,map))); } /** @@ -57,9 +56,8 @@ */ @RequestMapping(value = "/add") @ResponseBody - public Object add(Summary summary) { - summaryService.save(summary); - return ResponseData.success(); + public Object add(@RequestBody Summary summary) { + return summaryService.add(summary); } /** @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String summaryId) { - summaryService.removeById(summaryId); - return ResponseData.success(); + return summaryService.delete(summaryId); } /** @@ -77,9 +74,8 @@ */ @RequestMapping(value = "/batchDelete") @ResponseBody - public Object delete(@RequestParam("summaryIds") List summaryIds) { - summaryService.removeBatchByIds(summaryIds); - return ResponseData.success(); + public Object delete(@RequestParam List summaryIds) { + return summaryService.batchDelete(summaryIds); } /** @@ -88,21 +84,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Summary summary) { - summaryService.updateById(summary); - return ResponseData.success(); + return summaryService.update(summary); } /** * 舆情综述详情 */ -// @RequestMapping(value = "/detail/{summaryId}") -// @ResponseBody -// public Object detail(@PathVariable("summaryId") String summaryId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(summaryService.selectById(summaryId)); -// return resultData; -// } -//} + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String summaryId) { + return ResponseData.success(summaryService.detail(summaryId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java index 72872af..6094532 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java @@ -2,7 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.Summary; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** *

@@ -14,4 +19,7 @@ */ public interface SummaryMapper extends BaseMapper

{ + List getSummaryList(@Param("map") HashMap map); + + Page getSummaryList(Page page,@Param("map") HashMap map); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index 8eaa144..d9d62fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -6,6 +6,7 @@ + @@ -22,7 +23,21 @@ - ID AS id, BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + + + + + + + and ID = #{map.id} + + + and SPECIAL_NAME like CONCAT('%',#{map.specialName},'%') + + 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 069b5ca..73252da 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,6 +33,11 @@ @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/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java index faa06de..bd840ac 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java @@ -1,9 +1,13 @@ 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.Summary; +import java.util.HashMap; +import java.util.List; + /** *

* 舆情综述 服务类 @@ -14,4 +18,17 @@ */ public interface ISummaryService extends IService

{ + Object getSummaryList(HashMap map); + + Page listPage(Page page, HashMap map); + + Object add(Summary summary); + + Object batchDelete(List summaryIds); + + Object delete(String summaryId); + + Object update(Summary summary); + + Object detail(String summaryId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java index d9eea6d..9962b9d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java @@ -1,11 +1,17 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.SummaryMapper; import com.casic.missiles.modular.system.model.Summary; import com.casic.missiles.modular.system.service.ISummaryService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; + /** *

* 舆情综述 服务实现类 @@ -17,4 +23,53 @@ @Service public class SummaryServiceImpl extends ServiceImpl implements ISummaryService { + @Resource + private SummaryMapper summaryMapper; + + @Override + public Object getSummaryList(HashMap map) { + return summaryMapper.getSummaryList(map); + } + + @Override + public Page

listPage(Page page, HashMap map) { + return summaryMapper.getSummaryList(page,map); + } + + @Override + public Object add(Summary summary) { + if(summaryMapper.insert(summary) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object batchDelete(List summaryIds) { + if(summaryMapper.deleteBatchIds(summaryIds) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object delete(String summaryId) { + if(summaryMapper.deleteById(summaryId) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object update(Summary summary) { + if(summaryMapper.updateById(summary) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object detail(String summaryId) { + return summaryMapper.selectById(summaryId); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 6e7c38b..b6e42c2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -1,7 +1,6 @@ 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; @@ -10,10 +9,12 @@ import com.casic.missiles.modular.system.service.ISummaryService; 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; +import java.util.HashMap; import java.util.List; /** @@ -36,8 +37,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(summaryService.list(null)); + public Object list(@RequestBody HashMap map) { + return ResponseData.success(summaryService.getSummaryList(map)); } /** @@ -45,11 +46,9 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(@RequestBody HashMap map) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = summaryService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(summaryService.listPage(page,map))); } /** @@ -57,9 +56,8 @@ */ @RequestMapping(value = "/add") @ResponseBody - public Object add(Summary summary) { - summaryService.save(summary); - return ResponseData.success(); + public Object add(@RequestBody Summary summary) { + return summaryService.add(summary); } /** @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String summaryId) { - summaryService.removeById(summaryId); - return ResponseData.success(); + return summaryService.delete(summaryId); } /** @@ -77,9 +74,8 @@ */ @RequestMapping(value = "/batchDelete") @ResponseBody - public Object delete(@RequestParam("summaryIds") List summaryIds) { - summaryService.removeBatchByIds(summaryIds); - return ResponseData.success(); + public Object delete(@RequestParam List summaryIds) { + return summaryService.batchDelete(summaryIds); } /** @@ -88,21 +84,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Summary summary) { - summaryService.updateById(summary); - return ResponseData.success(); + return summaryService.update(summary); } /** * 舆情综述详情 */ -// @RequestMapping(value = "/detail/{summaryId}") -// @ResponseBody -// public Object detail(@PathVariable("summaryId") String summaryId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(summaryService.selectById(summaryId)); -// return resultData; -// } -//} + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String summaryId) { + return ResponseData.success(summaryService.detail(summaryId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java index 72872af..6094532 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java @@ -2,7 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.Summary; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** *

@@ -14,4 +19,7 @@ */ public interface SummaryMapper extends BaseMapper

{ + List getSummaryList(@Param("map") HashMap map); + + Page getSummaryList(Page page,@Param("map") HashMap map); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index 8eaa144..d9d62fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -6,6 +6,7 @@ + @@ -22,7 +23,21 @@ - ID AS id, BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + + + + + + + and ID = #{map.id} + + + and SPECIAL_NAME like CONCAT('%',#{map.specialName},'%') + + 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 069b5ca..73252da 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,6 +33,11 @@ @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/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java index faa06de..bd840ac 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java @@ -1,9 +1,13 @@ 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.Summary; +import java.util.HashMap; +import java.util.List; + /** *

* 舆情综述 服务类 @@ -14,4 +18,17 @@ */ public interface ISummaryService extends IService

{ + Object getSummaryList(HashMap map); + + Page listPage(Page page, HashMap map); + + Object add(Summary summary); + + Object batchDelete(List summaryIds); + + Object delete(String summaryId); + + Object update(Summary summary); + + Object detail(String summaryId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java index d9eea6d..9962b9d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java @@ -1,11 +1,17 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.SummaryMapper; import com.casic.missiles.modular.system.model.Summary; import com.casic.missiles.modular.system.service.ISummaryService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; + /** *

* 舆情综述 服务实现类 @@ -17,4 +23,53 @@ @Service public class SummaryServiceImpl extends ServiceImpl implements ISummaryService { + @Resource + private SummaryMapper summaryMapper; + + @Override + public Object getSummaryList(HashMap map) { + return summaryMapper.getSummaryList(map); + } + + @Override + public Page

listPage(Page page, HashMap map) { + return summaryMapper.getSummaryList(page,map); + } + + @Override + public Object add(Summary summary) { + if(summaryMapper.insert(summary) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object batchDelete(List summaryIds) { + if(summaryMapper.deleteBatchIds(summaryIds) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object delete(String summaryId) { + if(summaryMapper.deleteById(summaryId) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object update(Summary summary) { + if(summaryMapper.updateById(summary) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object detail(String summaryId) { + return summaryMapper.selectById(summaryId); + } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 25b849c..29bc64e 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -19,7 +19,7 @@ # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/**/** #flowable数据源和多数据源配置 db: init: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index 7362375..4cc991e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -78,7 +78,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("judgmentIds") List judgmentIds) { - judgmentService.removeBatchByIds(judgmentIds); + judgmentService.removeByIds(judgmentIds); return ResponseData.success(); } 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 e0f7696..191b51c 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 @@ -76,7 +76,7 @@ @RequestMapping(value = "/batchDelete") @ResponseBody public Object delete(@RequestParam("realtimeWorkIds") List realtimeWorkIds) { - realtimeWorkService.removeBatchByIds(realtimeWorkIds); + realtimeWorkService.removeByIds(realtimeWorkIds); return ResponseData.success(); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index 6e7c38b..b6e42c2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -1,7 +1,6 @@ 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; @@ -10,10 +9,12 @@ import com.casic.missiles.modular.system.service.ISummaryService; 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; +import java.util.HashMap; import java.util.List; /** @@ -36,8 +37,8 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { - return ResponseData.success(summaryService.list(null)); + public Object list(@RequestBody HashMap map) { + return ResponseData.success(summaryService.getSummaryList(map)); } /** @@ -45,11 +46,9 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(@RequestBody HashMap map) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper<>(); - page = summaryService.page(page, query); - return ResponseData.success(super.packForBT(page)); + return ResponseData.success(super.packForBT(summaryService.listPage(page,map))); } /** @@ -57,9 +56,8 @@ */ @RequestMapping(value = "/add") @ResponseBody - public Object add(Summary summary) { - summaryService.save(summary); - return ResponseData.success(); + public Object add(@RequestBody Summary summary) { + return summaryService.add(summary); } /** @@ -68,8 +66,7 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam String summaryId) { - summaryService.removeById(summaryId); - return ResponseData.success(); + return summaryService.delete(summaryId); } /** @@ -77,9 +74,8 @@ */ @RequestMapping(value = "/batchDelete") @ResponseBody - public Object delete(@RequestParam("summaryIds") List summaryIds) { - summaryService.removeBatchByIds(summaryIds); - return ResponseData.success(); + public Object delete(@RequestParam List summaryIds) { + return summaryService.batchDelete(summaryIds); } /** @@ -88,21 +84,15 @@ @RequestMapping(value = "/update") @ResponseBody public Object update(Summary summary) { - summaryService.updateById(summary); - return ResponseData.success(); + return summaryService.update(summary); } /** * 舆情综述详情 */ -// @RequestMapping(value = "/detail/{summaryId}") -// @ResponseBody -// public Object detail(@PathVariable("summaryId") String summaryId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(summaryService.selectById(summaryId)); -// return resultData; -// } -//} + @RequestMapping(value = "/detail") + @ResponseBody + public Object detail(@RequestParam String summaryId) { + return ResponseData.success(summaryService.detail(summaryId)); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java index 72872af..6094532 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/SummaryMapper.java @@ -2,7 +2,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.Summary; +import org.apache.ibatis.annotations.Param; + +import java.util.HashMap; +import java.util.List; /** *

@@ -14,4 +19,7 @@ */ public interface SummaryMapper extends BaseMapper

{ + List getSummaryList(@Param("map") HashMap map); + + Page getSummaryList(Page page,@Param("map") HashMap map); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml index 8eaa144..d9d62fd 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/SummaryMapper.xml @@ -6,6 +6,7 @@ + @@ -22,7 +23,21 @@ - ID AS id, BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + ID AS id,SPECIAL_NAME AS specialName,BRIEF AS brief, DISCOVERY_TOTAL AS discoveryTotal, DISCOVERY_PUBLIC AS discoveryPublic, DISCOVERY_SECRET AS discoverySecret, DISCOVERY_ABORD AS discoveryAbord, FOREIGN_TOTAL AS foreignTotal, FOREIGN_PROCESSED AS foreignProcessed, FOREIGN_ADD AS foreignAdd, PROCESS_TOTAL AS processTotal, PROCESS_BROWSE AS processBrowse, PROCESS_GREAT AS processGreat, CREATE_TIME AS createTime, DESCRIPTION AS description + + + + + + + and ID = #{map.id} + + + and SPECIAL_NAME like CONCAT('%',#{map.specialName},'%') + + 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 069b5ca..73252da 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,6 +33,11 @@ @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/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java index faa06de..bd840ac 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java @@ -1,9 +1,13 @@ 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.Summary; +import java.util.HashMap; +import java.util.List; + /** *

* 舆情综述 服务类 @@ -14,4 +18,17 @@ */ public interface ISummaryService extends IService

{ + Object getSummaryList(HashMap map); + + Page listPage(Page page, HashMap map); + + Object add(Summary summary); + + Object batchDelete(List summaryIds); + + Object delete(String summaryId); + + Object update(Summary summary); + + Object detail(String summaryId); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java index d9eea6d..9962b9d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/SummaryServiceImpl.java @@ -1,11 +1,17 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.SummaryMapper; import com.casic.missiles.modular.system.model.Summary; import com.casic.missiles.modular.system.service.ISummaryService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; + /** *

* 舆情综述 服务实现类 @@ -17,4 +23,53 @@ @Service public class SummaryServiceImpl extends ServiceImpl implements ISummaryService { + @Resource + private SummaryMapper summaryMapper; + + @Override + public Object getSummaryList(HashMap map) { + return summaryMapper.getSummaryList(map); + } + + @Override + public Page

listPage(Page page, HashMap map) { + return summaryMapper.getSummaryList(page,map); + } + + @Override + public Object add(Summary summary) { + if(summaryMapper.insert(summary) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object batchDelete(List summaryIds) { + if(summaryMapper.deleteBatchIds(summaryIds) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object delete(String summaryId) { + if(summaryMapper.deleteById(summaryId) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object update(Summary summary) { + if(summaryMapper.updateById(summary) > 0){ + return ResponseData.success(); + } + return ResponseData.error("操作失败"); + } + + @Override + public Object detail(String summaryId) { + return summaryMapper.selectById(summaryId); + } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 25b849c..29bc64e 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -19,7 +19,7 @@ # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/**/** #flowable数据源和多数据源配置 db: init: diff --git a/pom.xml b/pom.xml index 590d42c..fbfd088 100644 --- a/pom.xml +++ b/pom.xml @@ -64,13 +64,8 @@ com.baomidou - mybatis-plus - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-generator - ${mybatis-plus-generator.version} + mybatis-plus-boot-starter + ${mybatis-plus-boot-starter} com.alibaba