From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001 From: puhanshu <a9236326> Date: 星期二, 16 八月 2022 19:08:32 +0800 Subject: [PATCH] 服务范围优化 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 10 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java index 2e67981..1d1e4ae 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java @@ -59,6 +59,17 @@ } /** + * 分页查询所有数据 + * + * @param comActAcidRecordDTO 查询实体 + * @return 所有数据 + */ + @PostMapping("exportNew") + public R exportNew(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) { + return this.comActAcidRecordService.exportNew(comActAcidRecordDTO); + } + + /** * 通过主键查询单条数据 * * @param id 主键 @@ -66,7 +77,7 @@ */ @GetMapping("{id}") public R selectOne(@PathVariable("id") Long id) { - return R.ok(this.comActAcidRecordService.getById(id)); + return this.comActAcidRecordService.detailByCommunity(id); } /** @@ -88,13 +99,20 @@ */ @PostMapping("/update") public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) { - ComActAcidRecord comActAcidRecord=new ComActAcidRecord(); - BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord); - if(StringUtils.isNotEmpty(comActAcidRecord.getLocalCity())){ - this.comActAcidRecordService.updateById(comActAcidRecord); - } - return R.ok(); + return this.comActAcidRecordService.updateLocalCity(comActAcidRecordVO); } + + /** + * 小程序修改填报记录 + * + * @param comActAcidRecordVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/updateApplets") + public R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO) { + return this.comActAcidRecordService.updateApplets(comActAcidRecordVO); + } + /** * 删除数据 @@ -104,7 +122,7 @@ */ @GetMapping("del") public R delete(@RequestParam("id") Long id) { - return R.ok(this.comActAcidRecordService.removeById(id)); + return this.comActAcidRecordService.delete(id); } /** @@ -121,12 +139,30 @@ * @return */ @GetMapping("fiveCountPlus") - public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity){ - return this.comActAcidRecordService.fiveCountPlus(date,localCity); + public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount){ + return this.comActAcidRecordService.fiveCountPlus(date,localCity,loginAccount); + } + + /** + * 图标统计 + * @return + */ + @GetMapping("charts") + public R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity){ + return this.comActAcidRecordService.charts(date,localCity); } @GetMapping("/statics") public R statics(@RequestParam("date")String date){ return this.comActAcidRecordService.statics(date); } + + @GetMapping("/detailByApp") + public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){ + return this.comActAcidRecordService.detailByApp(id,localCity); + } + @GetMapping("/test") + public R test(){ + return this.comActAcidRecordService.test(); + } } -- Gitblit v1.7.1