From 6e0bdd06b00fb18ca25dd26612cf40b788fba20f Mon Sep 17 00:00:00 2001 From: hansha Date: Fri, 26 Apr 2024 09:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E5=AF=B9=E5=BA=94=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SzxcDataScreenController.java | 90 +++++++++++++++++++ .../controller/SzxcHkbgRecardController.java | 27 +++--- .../ruoyi/szxc/mapper/SzxcJmInfoMapper.java | 9 ++ .../szxc/mapper/SzxcPublicActivilyMapper.java | 7 +- .../szxc/mapper/SzxcWishManageMapper.java | 3 + .../szxc/service/ISzxcJmInfoService.java | 7 ++ .../service/ISzxcPublicActivilyService.java | 6 +- .../szxc/service/ISzxcWishManageService.java | 3 + .../impl/SzxcHkbgRecardServiceImpl.java | 2 + .../service/impl/SzxcJmInfoServiceImpl.java | 15 ++++ .../impl/SzxcPublicActivilyServiceImpl.java | 6 ++ .../impl/SzxcWishManageServiceImpl.java | 6 ++ .../mapper/szxc/SzxcHkbgRecardMapper.xml | 6 +- .../mapper/szxc/SzxcJmInfoMapper.xml | 49 ++++++++++ .../mapper/szxc/SzxcPublicActivilyMapper.xml | 12 ++- .../mapper/szxc/SzxcWishManageMapper.xml | 11 +++ 16 files changed, 241 insertions(+), 18 deletions(-) create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDataScreenController.java diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDataScreenController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDataScreenController.java new file mode 100644 index 0000000..1820208 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcDataScreenController.java @@ -0,0 +1,90 @@ +package com.ruoyi.szxc.controller; + +import com.ruoyi.szxc.service.ISzxcJmInfoService; +import com.ruoyi.szxc.service.ISzxcPublicActivilyService; +import com.ruoyi.szxc.service.ISzxcWishManageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * 数据大屏Controller + * + * @author hs + * @date 2024-03-15 + */ +@RestController +@RequestMapping("/szxc/data") +public class SzxcDataScreenController { + @Autowired + private ISzxcJmInfoService szxcJmInfoService; + + @Autowired + private ISzxcPublicActivilyService szxcPublicActivilyService; + + @Autowired + private ISzxcWishManageService szxcWishManageService; + + /** + * 按dept_id分组 查询性别数据 + * @return + */ + @PreAuthorize("@ss.hasPermi('szxc:sjdp:sex')") + @GetMapping("/sex") + public List> getDataBySex() + { + List> result = szxcJmInfoService.getDataBySex(); + return result; + } + + /** + * 按dept_id分年龄段查询数据 + * @return + */ + @GetMapping("/age") + @PreAuthorize("@ss.hasPermi('szxc:sjdp:age')") + public List> getDataByAge() + { + List> result = szxcJmInfoService.getDataByAge(); + return result; + } + + /** + * 按dept_id分组，查询人员标签数据 + * @return + */ + @GetMapping("/tag") + @PreAuthorize("@ss.hasPermi('szxc:sjdp:tag')") + public List> getDataByTag() + { + List> result = szxcJmInfoService.getDataByTag(); + return result; + } + /** + * 按dept_id分组，查询活动情况 + * @return + */ + @GetMapping("/active") + @PreAuthorize("@ss.hasPermi('szxc:sjdp:active')") + public List> getActiveData() + { + List> result = szxcPublicActivilyService.getActiveData(); + return result; + } + /** + * 按dept_id分组，查询心愿类型情况 + * @return + */ + @GetMapping("/wish") + @PreAuthorize("@ss.hasPermi('szxc:sjdp:wish')") + public List> getWishData() + { + List> result = szxcWishManageService.getWishData(); + return result; + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHkbgRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHkbgRecardController.java index 130c97d..d8184ae 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHkbgRecardController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcHkbgRecardController.java @@ -1,25 +1,19 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.szxc.domain.SzxcHkbgRecard; import com.ruoyi.szxc.service.ISzxcHkbgRecardService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 户口变更记录Controller @@ -77,6 +71,11 @@ public class SzxcHkbgRecardController extends BaseController @PostMapping public AjaxResult add(@RequestBody SzxcHkbgRecard szxcHkbgRecard) { + //根据前端传递过来的部门存储，如果没传则存储当前用户的部门 + if(szxcHkbgRecard.getDeptId()==null){ + szxcHkbgRecard.setDeptId(getDeptId()); + } + szxcHkbgRecard.setUserId(getUserId()); return toAjax(szxcHkbgRecardService.insertSzxcHkbgRecard(szxcHkbgRecard)); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmInfoMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmInfoMapper.java index 80a1d6a..949cea5 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmInfoMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmInfoMapper.java @@ -1,8 +1,10 @@ package com.ruoyi.szxc.mapper; import com.ruoyi.szxc.domain.SzxcJmInfo; +import org.apache.ibatis.annotations.MapKey; import java.util.List; +import java.util.Map; /** * 居民信息Mapper接口 @@ -59,4 +61,11 @@ public interface SzxcJmInfoMapper * @return 结果 */ public int deleteSzxcJmInfoByIds(Long[] ids); + + @MapKey("") + List> getDataByAge(); + @MapKey("") + List> getDataBySex(); + @MapKey("") + List> getDataByTag(); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcPublicActivilyMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcPublicActivilyMapper.java index 5d552cc..47b3037 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcPublicActivilyMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcPublicActivilyMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.szxc.mapper; -import java.util.List; import com.ruoyi.szxc.domain.SzxcPublicActivily; +import org.apache.ibatis.annotations.MapKey; + +import java.util.List; +import java.util.Map; /** * 公益活动Mapper接口 @@ -58,4 +61,6 @@ public interface SzxcPublicActivilyMapper * @return 结果 */ public int deleteSzxcPublicActivilyByIds(Long[] ids); + @MapKey("") + List> getActiveData(); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWishManageMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWishManageMapper.java index 2be6b13..88fd661 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWishManageMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcWishManageMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.szxc.mapper; import com.ruoyi.szxc.domain.SzxcWishManage; import java.util.List; +import java.util.Map; /** * 心愿管理Mapper接口 @@ -59,4 +60,6 @@ public interface SzxcWishManageMapper * @return 结果 */ public int deleteSzxcWishManageByIds(Long[] ids); + + List> getWishData(); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmInfoService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmInfoService.java index bc43bb2..556f7b3 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmInfoService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmInfoService.java @@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.szxc.domain.SzxcJmInfo; import java.util.List; +import java.util.Map; /** * 居民信息Service接口 @@ -60,4 +61,10 @@ public interface ISzxcJmInfoService * @return 结果 */ public int deleteSzxcJmInfoById(Long id); + + List> getDataByAge(); + + List> getDataBySex(); + + List> getDataByTag(); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcPublicActivilyService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcPublicActivilyService.java index c1d3c15..da2955a 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcPublicActivilyService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcPublicActivilyService.java @@ -1,8 +1,10 @@ package com.ruoyi.szxc.service; -import java.util.List; import com.ruoyi.szxc.domain.SzxcPublicActivily; +import java.util.List; +import java.util.Map; + /** * 公益活动Service接口 * @@ -58,4 +60,6 @@ public interface ISzxcPublicActivilyService * @return 结果 */ public int deleteSzxcPublicActivilyById(Long id); + + List> getActiveData(); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWishManageService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWishManageService.java index 417b14c..c5551f8 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWishManageService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcWishManageService.java @@ -3,6 +3,7 @@ package com.ruoyi.szxc.service; import com.ruoyi.szxc.domain.SzxcWishManage; import java.util.List; +import java.util.Map; /** * 心愿管理Service接口 @@ -59,4 +60,6 @@ public interface ISzxcWishManageService * @return 结果 */ public int deleteSzxcWishManageById(Long id); + + List> getWishData(); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHkbgRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHkbgRecardServiceImpl.java index 9209045..4ff6617 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHkbgRecardServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcHkbgRecardServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.szxc.service.impl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.szxc.domain.SzxcHkbgRecard; import com.ruoyi.szxc.domain.SzxcJmInfo; @@ -45,6 +46,7 @@ public class SzxcHkbgRecardServiceImpl implements ISzxcHkbgRecardService * @return 户口变更记录 */ @Override + @DataScope(deptAlias = "h") public List selectSzxcHkbgRecardList(SzxcHkbgRecard szxcHkbgRecard) { return szxcHkbgRecardMapper.selectSzxcHkbgRecardList(szxcHkbgRecard); diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java index 1dd274e..bf868f0 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmInfoServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.List; +import java.util.Map; /** * 居民信息Service业务层处理 @@ -132,4 +133,18 @@ public class SzxcJmInfoServiceImpl implements ISzxcJmInfoService { return szxcJmInfoMapper.deleteSzxcJmInfoById(id); } + + @Override + public List> getDataByTag() { + return szxcJmInfoMapper.getDataByTag(); + } + + @Override + public List> getDataBySex() { + return szxcJmInfoMapper.getDataBySex(); + } + @Override + public List> getDataByAge() { + return szxcJmInfoMapper.getDataByAge(); + } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java index 42225b6..62d144a 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcPublicActivilyServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 公益活动Service业务层处理 @@ -85,6 +86,11 @@ public class SzxcPublicActivilyServiceImpl implements ISzxcPublicActivilyService return szxcPublicActivilyMapper.deleteSzxcPublicActivilyByIds(ids); } + @Override + public List> getActiveData() { + return szxcPublicActivilyMapper.getActiveData(); + } + /** * 删除公益活动信息 * diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java index e3572af..24db4dd 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcWishManageServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 心愿管理Service业务层处理 @@ -85,6 +86,11 @@ public class SzxcWishManageServiceImpl implements ISzxcWishManageService return szxcWishManageMapper.deleteSzxcWishManageByIds(ids); } + @Override + public List> getWishData() { + return szxcWishManageMapper.getWishData() ; + } + /** * 删除心愿管理信息 * diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml index 0ade021..80e0faa 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml @@ -37,7 +37,7 @@ diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml index e13e8f0..6045c4d 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml @@ -91,6 +91,55 @@ where id = #{id} + + + + + + insert into szxc_jm_info diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml index 7b95f46..063cdae 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml @@ -52,7 +52,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + + insert into szxc_public_activily diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml index f1b8fd6..889faad 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml @@ -71,6 +71,17 @@ where id = #{id} + + insert into szxc_wish_manage