添加数据大屏对应接口

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<Map<String, Object>> getDataBySex()
+    {
+        List<Map<String, Object>> result = szxcJmInfoService.getDataBySex();
+        return result;
+    }
+
+    /**
+     * 按dept_id分年龄段查询数据
+     * @return
+     */
+    @GetMapping("/age")
+    @PreAuthorize("@ss.hasPermi('szxc:sjdp:age')")
+    public List<Map<String, Object>> getDataByAge()
+    {
+        List<Map<String, Object>> result = szxcJmInfoService.getDataByAge();
+        return result;
+    }
+
+    /**
+     * 按dept_id分组，查询人员标签数据
+     * @return
+     */
+    @GetMapping("/tag")
+    @PreAuthorize("@ss.hasPermi('szxc:sjdp:tag')")
+    public List<Map<String, Object>> getDataByTag()
+    {
+        List<Map<String, Object>> result = szxcJmInfoService.getDataByTag();
+        return result;
+    }
+    /**
+     * 按dept_id分组，查询活动情况
+     * @return
+     */
+    @GetMapping("/active")
+    @PreAuthorize("@ss.hasPermi('szxc:sjdp:active')")
+    public List<Map<String, Object>> getActiveData()
+    {
+        List<Map<String, Object>> result = szxcPublicActivilyService.getActiveData();
+        return result;
+    }
+    /**
+     * 按dept_id分组，查询心愿类型情况
+     * @return
+     */
+    @GetMapping("/wish")
+    @PreAuthorize("@ss.hasPermi('szxc:sjdp:wish')")
+    public List<Map<String, Object>> getWishData()
+    {
+        List<Map<String, Object>> result = szxcWishManageService.getWishData();
+        return result;
+    }
+}

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 org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.page.TableDataInfo;
+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));
     }
 

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<Map<String, Object>> getDataByAge();
+    @MapKey("")
+    List<Map<String, Object>> getDataBySex();
+    @MapKey("")
+    List<Map<String, Object>> getDataByTag();
 }

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<Map<String, Object>> getActiveData();
 }

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<Map<String, Object>> getWishData();
 }

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<Map<String, Object>> getDataByAge();
+
+    List<Map<String, Object>> getDataBySex();
+
+    List<Map<String, Object>> getDataByTag();
 }

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<Map<String, Object>> getActiveData();
 }

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<Map<String, Object>> getWishData();
 }

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<SzxcHkbgRecard> selectSzxcHkbgRecardList(SzxcHkbgRecard szxcHkbgRecard)
     {
         return szxcHkbgRecardMapper.selectSzxcHkbgRecardList(szxcHkbgRecard);

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<Map<String, Object>> getDataByTag() {
+        return szxcJmInfoMapper.getDataByTag();
+    }
+
+    @Override
+    public List<Map<String, Object>> getDataBySex() {
+        return szxcJmInfoMapper.getDataBySex();
+    }
+    @Override
+    public List<Map<String, Object>> getDataByAge() {
+        return szxcJmInfoMapper.getDataByAge();
+    }
 }

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<Map<String, Object>> getActiveData() {
+        return szxcPublicActivilyMapper.getActiveData();
+    }
+
     /**
      * 删除公益活动信息
      * 

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<Map<String, Object>> getWishData() {
+        return szxcWishManageMapper.getWishData() ;
+    }
+
     /**
      * 删除心愿管理信息
      * 

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml

@@ -37,7 +37,7 @@
     </sql>
 
     <select id="selectSzxcHkbgRecardList" parameterType="SzxcHkbgRecard" resultMap="SzxcHkbgRecardResult">
-        <include refid="selectSzxcHkbgRecardVo"/>
+        <include refid="selectSzxcHkbgRecardVo"/> as h
         <where>
             <if test="acountNo != null "> and acount_no = #{acountNo}</if>
             <if test="jmId != null "> and jm_id = #{jmId}</if>
@@ -58,6 +58,10 @@
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
+            <!--数据范围过滤-->
+            <if test="params.dataScope != null and params.dataScope != ''">
+                ${params.dataScope}
+            </if>
         </where>
     </select>
 

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml

@@ -91,6 +91,55 @@
         where id = #{id}
     </select>
 
+    <select id="getDataBySex"  resultType="java.util.Map">
+        SELECT count(*) headCount,
+        count(IF(sex=0,TRUE,NULL)) man,
+        count(IF(sex=1,TRUE,NULL)) women,
+        j.dept_name
+        FROM `szxc_jm_info` j
+        GROUP BY  dept_id;
+    </select>
+
+    <select id="getDataByAge"  resultType="java.util.Map">
+        SELECT dept_name,
+      <![CDATA[  COUNT(CASE WHEN ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) >= 0
+        and ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) <= 12 THEN '0-12岁' END) '0-12岁',
+        COUNT(CASE WHEN ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) >= 13
+        and ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) <= 17 THEN '13-17岁' END) '13-17岁',
+        COUNT(CASE WHEN ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) >= 18
+        and ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) <= 22 THEN '18-22岁' END) '18-22岁',
+        COUNT( CASE WHEN ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) >= 23
+        and ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) <= 30 THEN '23-30岁' END) '23-30岁',
+        COUNT(CASE WHEN ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) >= 31
+        and ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) <= 59 THEN '31-59岁' END ) '31-59岁',
+        COUNT( CASE WHEN ROUND(DATEDIFF(CURDATE(), born_date)/365.2422) >= 60 THEN '60岁以上' END) '60岁以上' ]]>
+        from szxc_jm_info  GROUP BY dept_id
+    </select>
+
+    <select id="getDataByTag"  resultType="java.util.Map">
+      SELECT dept_name,
+		    count(IF(t.tag_name='党员',TRUE,NULL)) '党员',
+		    count(IF(t.tag_name='老人',TRUE,NULL)) '老人',
+		    count(IF(t.tag_name='重点人群',TRUE,NULL)) '重点人群',
+		    count(IF(t.tag_name='退役军人',TRUE,NULL)) '退役军人',
+		    count(IF(t.tag_name='退休人员',TRUE,NULL)) '退休人员',
+		    count(IF(t.tag_name='残疾人',TRUE,NULL)) '残疾人',
+		    count(IF(t.tag_name='计划生育',TRUE,NULL)) '计划生育',
+		    count(IF(t.tag_name='劳动保障',TRUE,NULL)) '劳动保障',
+		    count(IF(t.tag_name='奖励',TRUE,NULL)) '奖励',
+		    count(IF(t.tag_name='统战',TRUE,NULL)) '统战',
+		    count(IF(t.tag_name='公益岗',TRUE,NULL)) '公益岗',
+		    count(IF(t.tag_name='统战',TRUE,NULL)) '统战',
+		    count(IF(t.tag_name='脱享户',TRUE,NULL)) '脱享户',
+		    count(IF(t.tag_name='边缘户',TRUE,NULL)) '边缘户',
+		    count(IF(t.tag_name='居民保险',TRUE,NULL)) '居民保险',
+		    count(IF(t.tag_name='其他',TRUE,NULL)) '其他'
+		from szxc_jm_info j
+		left join szxc_jm_tag jt on  j.id=jt.jm_id
+		left join szxc_person_tag t on  t.id=jt.tag_id
+      GROUP BY j.dept_id
+    </select>
+
     <insert id="insertSzxcJmInfo" parameterType="SzxcJmInfo" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_jm_info
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcPublicActivilyMapper.xml

@@ -52,7 +52,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSzxcPublicActivilyVo"/>
         where id = #{id}
     </select>
-        
+
+    <select id="getActiveData"  resultType="java.util.Map">
+       select  dept_name,
+			   count(*)   num,
+		       count(IF(status='0',TRUE,NULL)) '待开始',
+		       count(IF(status='1',TRUE,NULL)) '进行中',
+		       count(IF(status='2',TRUE,NULL)) '已结束'
+	   from    szxc_public_activily
+       GROUP   BY dept_id
+    </select>
+
     <insert id="insertSzxcPublicActivily" parameterType="SzxcPublicActivily" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_public_activily
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcWishManageMapper.xml

@@ -71,6 +71,17 @@
         where id = #{id}
     </select>
 
+    <select id="getWishData"  resultType="java.util.Map">
+       select  dept_name,
+			   count(*)   num,
+		       count(IF(wish_type='0',TRUE,NULL)) '困难扶持',
+		       count(IF(wish_type='1',TRUE,NULL)) '物品需求',
+		       count(IF(wish_type='2',TRUE,NULL)) '药品需求',
+		       count(IF(wish_type='3',TRUE,NULL)) '其它'
+	   from    szxc_wish_manage
+       GROUP   BY dept_id
+    </select>
+
     <insert id="insertSzxcWishManage" parameterType="SzxcWishManage" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_wish_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">