修改

zhsq_qk-admin/src/main/java/zhsq_qk/web/controller/system/QkEmergencyRescueTeamController.java

@@ -1,26 +1,19 @@
 package zhsq_qk.web.controller.system;
 
-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 org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 import zhsq_qk.common.annotation.Log;
 import zhsq_qk.common.core.controller.BaseController;
 import zhsq_qk.common.core.domain.AjaxResult;
+import zhsq_qk.common.core.page.TableDataInfo;
 import zhsq_qk.common.enums.BusinessType;
+import zhsq_qk.common.utils.poi.ExcelUtil;
 import zhsq_qk.system.domain.QkEmergencyRescueTeam;
 import zhsq_qk.system.service.IQkEmergencyRescueTeamService;
-import zhsq_qk.common.utils.poi.ExcelUtil;
-import zhsq_qk.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 抢险救援队Controller
@@ -34,11 +27,11 @@ public class QkEmergencyRescueTeamController extends BaseController {
     @Autowired
     private IQkEmergencyRescueTeamService qkEmergencyRescueTeamService;
 
-/**
- * 查询抢险救援队列表
- */
-@PreAuthorize("@ss.hasPermi('system:team:list')")
-@GetMapping("/list")
+    /**
+     * 查询抢险救援队列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:team:list')")
+    @GetMapping("/list")
     public TableDataInfo list(QkEmergencyRescueTeam qkEmergencyRescueTeam) {
         startPage();
         List<QkEmergencyRescueTeam> list = qkEmergencyRescueTeamService.selectQkEmergencyRescueTeamList(qkEmergencyRescueTeam);
@@ -53,7 +46,7 @@ public class QkEmergencyRescueTeamController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, QkEmergencyRescueTeam qkEmergencyRescueTeam) {
         List<QkEmergencyRescueTeam> list = qkEmergencyRescueTeamService.selectQkEmergencyRescueTeamList(qkEmergencyRescueTeam);
-        ExcelUtil<QkEmergencyRescueTeam> util = new ExcelUtil<QkEmergencyRescueTeam>(QkEmergencyRescueTeam. class);
+        ExcelUtil<QkEmergencyRescueTeam> util = new ExcelUtil<QkEmergencyRescueTeam>(QkEmergencyRescueTeam.class);
         util.exportExcel(response, list, "抢险救援队数据");
     }
 
@@ -95,4 +88,21 @@ public class QkEmergencyRescueTeamController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(qkEmergencyRescueTeamService.deleteQkEmergencyRescueTeamByIds(ids));
     }
+
+    /**
+     * 可视化查询抢险救援队列表
+     */
+    @GetMapping("/selectQkEmergencyRescueTeamAllList")
+    public AjaxResult selectQkEmergencyRescueTeamAllList() {
+        return success(qkEmergencyRescueTeamService.selectQkEmergencyRescueTeamAllList());
+    }
+
+    /**
+     * 可视化根据deptId查询抢险救援队列表
+     */
+    @GetMapping(value = "/selectQkEmergencyRescueTeamByDeptId/{id}")
+    public AjaxResult selectQkEmergencyRescueTeamByDeptId(@PathVariable("id") Long id) {
+        return success(qkEmergencyRescueTeamService.selectQkEmergencyRescueTeamByDeptId(id));
+    }
+
 }

zhsq_qk-admin/src/main/java/zhsq_qk/web/controller/system/QkEmergencyShelterController.java

@@ -34,11 +34,11 @@ public class QkEmergencyShelterController extends BaseController {
     @Autowired
     private IQkEmergencyShelterService qkEmergencyShelterService;
 
-/**
- * 查询应急避难所列表
- */
-@PreAuthorize("@ss.hasPermi('system:shelter:list')")
-@GetMapping("/list")
+    /**
+     * 查询应急避难所列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:shelter:list')")
+    @GetMapping("/list")
     public TableDataInfo list(QkEmergencyShelter qkEmergencyShelter) {
         startPage();
         List<QkEmergencyShelter> list = qkEmergencyShelterService.selectQkEmergencyShelterList(qkEmergencyShelter);
@@ -95,4 +95,12 @@ public class QkEmergencyShelterController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(qkEmergencyShelterService.deleteQkEmergencyShelterByIds(ids));
     }
+
+    /**
+     * 可视化查询应急避难所列表
+     */
+    @GetMapping("/selectQkEmergencyShelterAllList")
+    public AjaxResult selectQkEmergencyShelterAllList() {
+        return success(qkEmergencyShelterService.selectQkEmergencyShelterAllList());
+    }
 }

zhsq_qk-admin/src/main/java/zhsq_qk/web/controller/system/QkRescueSuppliesController.java

@@ -1,26 +1,19 @@
 package zhsq_qk.web.controller.system;
 
-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 org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 import zhsq_qk.common.annotation.Log;
 import zhsq_qk.common.core.controller.BaseController;
 import zhsq_qk.common.core.domain.AjaxResult;
+import zhsq_qk.common.core.page.TableDataInfo;
 import zhsq_qk.common.enums.BusinessType;
+import zhsq_qk.common.utils.poi.ExcelUtil;
 import zhsq_qk.system.domain.QkRescueSupplies;
 import zhsq_qk.system.service.IQkRescueSuppliesService;
-import zhsq_qk.common.utils.poi.ExcelUtil;
-import zhsq_qk.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 防汛抗旱物资储备Controller
@@ -34,11 +27,11 @@ public class QkRescueSuppliesController extends BaseController {
     @Autowired
     private IQkRescueSuppliesService qkRescueSuppliesService;
 
-/**
- * 查询防汛抗旱物资储备列表
- */
-@PreAuthorize("@ss.hasPermi('system:supplies:list')")
-@GetMapping("/list")
+    /**
+     * 查询防汛抗旱物资储备列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:supplies:list')")
+    @GetMapping("/list")
     public TableDataInfo list(QkRescueSupplies qkRescueSupplies) {
         startPage();
         List<QkRescueSupplies> list = qkRescueSuppliesService.selectQkRescueSuppliesList(qkRescueSupplies);
@@ -53,7 +46,7 @@ public class QkRescueSuppliesController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, QkRescueSupplies qkRescueSupplies) {
         List<QkRescueSupplies> list = qkRescueSuppliesService.selectQkRescueSuppliesList(qkRescueSupplies);
-        ExcelUtil<QkRescueSupplies> util = new ExcelUtil<QkRescueSupplies>(QkRescueSupplies. class);
+        ExcelUtil<QkRescueSupplies> util = new ExcelUtil<QkRescueSupplies>(QkRescueSupplies.class);
         util.exportExcel(response, list, "防汛抗旱物资储备数据");
     }
 
@@ -95,4 +88,20 @@ public class QkRescueSuppliesController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(qkRescueSuppliesService.deleteQkRescueSuppliesByIds(ids));
     }
+
+    /**
+     * 可视化查询防汛抗旱物资储备列表
+     */
+    @GetMapping("/selectQkRescueSuppliesAllList")
+    public AjaxResult selectQkRescueSuppliesAllList() {
+        return success(qkRescueSuppliesService.selectQkRescueSuppliesAllList());
+    }
+
+    /**
+     * 可视化根据deptId查询防汛抗旱物资储备列表
+     */
+    @GetMapping("/selectQkRescueSuppliesByDeptId/{id}")
+    public AjaxResult selectQkRescueSuppliesByDeptId(@PathVariable("id") Long id) {
+        return success(qkRescueSuppliesService.selectQkRescueSuppliesByDeptId(id));
+    }
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/domain/QkRescueSupplies.java

@@ -11,85 +11,116 @@ import zhsq_qk.common.core.domain.BaseEntity;
  * @author lc
  * @date 2024-07-18
  */
-public class QkRescueSupplies extends BaseEntity
-        {
-private static final long serialVersionUID = 1L;
-
-        /** 主键id */
-        private Long id;
-
-        /** 品种 */
-                @Excel(name = "品种")
-        private String varieties;
-
-        /** 价值（万元） */
-                @Excel(name = "价值", readConverterExp = "万=元")
-        private String cost;
-
-        /** 备注 */
-                @Excel(name = "备注")
-        private String remarks;
-
-        /** 经度 */
-                @Excel(name = "经度")
-        private String longitude;
-
-        /** 纬度 */
-                @Excel(name = "纬度")
-        private String latitude;
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public Long getId() {
-            return id;
-        }
-        public void setVarieties(String varieties) {
-            this.varieties = varieties;
-        }
-
-        public String getVarieties() {
-            return varieties;
-        }
-        public void setCost(String cost) {
-            this.cost = cost;
-        }
-
-        public String getCost() {
-            return cost;
-        }
-        public void setRemarks(String remarks) {
-            this.remarks = remarks;
-        }
-
-        public String getRemarks() {
-            return remarks;
-        }
-        public void setLongitude(String longitude) {
-            this.longitude = longitude;
-        }
-
-        public String getLongitude() {
-            return longitude;
-        }
-        public void setLatitude(String latitude) {
-            this.latitude = latitude;
-        }
-
-        public String getLatitude() {
-            return latitude;
-        }
-
-@Override
-public String toString() {
-    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-        .append("id", getId())
-        .append("varieties", getVarieties())
-        .append("cost", getCost())
-        .append("remarks", getRemarks())
-        .append("longitude", getLongitude())
-        .append("latitude", getLatitude())
-            .toString();
-}
+public class QkRescueSupplies extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 品种
+     */
+    @Excel(name = "品种")
+    private String varieties;
+
+    /**
+     * 价值（万元）
+     */
+    @Excel(name = "价值", readConverterExp = "万=元")
+    private String cost;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /**
+     * 经度
+     */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /**
+     * 所属部门
+     */
+    @Excel(name = "所属部门")
+    private String dept;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setVarieties(String varieties) {
+        this.varieties = varieties;
+    }
+
+    public String getVarieties() {
+        return varieties;
+    }
+
+    public void setCost(String cost) {
+        this.cost = cost;
+    }
+
+    public String getCost() {
+        return cost;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setDept(String dept) {
+        this.dept = dept;
+    }
+
+    public String getDept() {
+        return dept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("varieties", getVarieties())
+                .append("cost", getCost())
+                .append("remarks", getRemarks())
+                .append("longitude", getLongitude())
+                .append("latitude", getLatitude())
+                .append("dept", getDept())
+                .toString();
+    }
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/mapper/QkEmergencyRescueTeamMapper.java

@@ -58,4 +58,9 @@ public interface QkEmergencyRescueTeamMapper {
      * @return 结果
      */
     public int deleteQkEmergencyRescueTeamByIds(Long[] ids);
+
+    List<QkEmergencyRescueTeam> selectQkEmergencyRescueTeamAllList();
+
+    List<QkEmergencyRescueTeam> selectQkEmergencyRescueTeamByDeptId(Long id);
+
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/mapper/QkEmergencyShelterMapper.java

@@ -58,4 +58,6 @@ public interface QkEmergencyShelterMapper {
      * @return 结果
      */
     public int deleteQkEmergencyShelterByIds(Long[] ids);
+
+    List<QkEmergencyShelter> selectQkEmergencyShelterAllList();
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/mapper/QkRescueSuppliesMapper.java

@@ -58,4 +58,9 @@ public interface QkRescueSuppliesMapper {
      * @return 结果
      */
     public int deleteQkRescueSuppliesByIds(Long[] ids);
+
+    List<QkRescueSupplies> selectQkRescueSuppliesAllList();
+
+    List<QkRescueSupplies> selectQkRescueSuppliesByDeptId(Long id);
+
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/service/IQkEmergencyRescueTeamService.java

@@ -58,4 +58,9 @@ public interface IQkEmergencyRescueTeamService {
      * @return 结果
      */
     public int deleteQkEmergencyRescueTeamById(Long id);
+
+    List<QkEmergencyRescueTeam> selectQkEmergencyRescueTeamAllList();
+
+    List<QkEmergencyRescueTeam> selectQkEmergencyRescueTeamByDeptId(Long id);
+
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/service/IQkEmergencyShelterService.java

@@ -58,4 +58,7 @@ public interface IQkEmergencyShelterService {
      * @return 结果
      */
     public int deleteQkEmergencyShelterById(Long id);
+
+    List<QkEmergencyShelter> selectQkEmergencyShelterAllList();
+
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/service/IQkRescueSuppliesService.java

@@ -58,4 +58,8 @@ public interface IQkRescueSuppliesService {
      * @return 结果
      */
     public int deleteQkRescueSuppliesById(Long id);
+
+    List<QkRescueSupplies> selectQkRescueSuppliesAllList();
+
+    List<QkRescueSupplies> selectQkRescueSuppliesByDeptId(Long id);
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/service/impl/QkEmergencyRescueTeamServiceImpl.java

@@ -83,4 +83,22 @@ public class QkEmergencyRescueTeamServiceImpl implements IQkEmergencyRescueTeamS
     public int deleteQkEmergencyRescueTeamById(Long id) {
         return qkEmergencyRescueTeamMapper.deleteQkEmergencyRescueTeamById(id);
     }
+
+    /**
+     * 查询抢险救援队列表
+     *
+     *
+     * @return 抢险救援队
+     */
+    @Override
+    public List<QkEmergencyRescueTeam> selectQkEmergencyRescueTeamAllList() {
+        return qkEmergencyRescueTeamMapper.selectQkEmergencyRescueTeamAllList();
+    }
+
+    @Override
+    public List<QkEmergencyRescueTeam> selectQkEmergencyRescueTeamByDeptId(Long id) {
+        return qkEmergencyRescueTeamMapper.selectQkEmergencyRescueTeamByDeptId(id);
+    }
+
+
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/service/impl/QkEmergencyShelterServiceImpl.java

@@ -83,4 +83,9 @@ public class QkEmergencyShelterServiceImpl implements IQkEmergencyShelterService
     public int deleteQkEmergencyShelterById(Long id) {
         return qkEmergencyShelterMapper.deleteQkEmergencyShelterById(id);
     }
+
+    @Override
+    public List<QkEmergencyShelter> selectQkEmergencyShelterAllList() {
+        return qkEmergencyShelterMapper.selectQkEmergencyShelterAllList();
+    }
 }

zhsq_qk-system/src/main/java/zhsq_qk/system/service/impl/QkRescueSuppliesServiceImpl.java

@@ -83,4 +83,14 @@ public class QkRescueSuppliesServiceImpl implements IQkRescueSuppliesService {
     public int deleteQkRescueSuppliesById(Long id) {
         return qkRescueSuppliesMapper.deleteQkRescueSuppliesById(id);
     }
+
+    @Override
+    public List<QkRescueSupplies> selectQkRescueSuppliesAllList() {
+        return qkRescueSuppliesMapper.selectQkRescueSuppliesAllList();
+    }
+
+    @Override
+    public List<QkRescueSupplies> selectQkRescueSuppliesByDeptId(Long id) {
+        return qkRescueSuppliesMapper.selectQkRescueSuppliesByDeptId(id);
+    }
 }

zhsq_qk-system/src/main/resources/mapper/system/QkEmergencyRescueTeamMapper.xml

@@ -209,4 +209,39 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectQkEmergencyRescueTeamAllList" parameterType="QkEmergencyRescueTeam" resultMap="QkEmergencyRescueTeamResult">
+        SELECT
+            id,
+            sd.dept_name as dept,
+            longitude,
+            latitude
+        FROM
+            qk_emergency_rescue_team qk
+                LEFT JOIN sys_dept sd ON qk.dept_id = sd.dept_id
+        GROUP BY
+            qk.dept_id
+    </select>
+
+    <select id="selectQkEmergencyRescueTeamByDeptId" parameterType="QkEmergencyRescueTeam" resultMap="QkEmergencyRescueTeamResult">
+        SELECT id,
+               name,
+               user_name,
+               dept,
+               post,
+               company,
+               emergency_rescue,
+               city,
+               area,
+               township,
+               village,
+               phone,
+               effect,
+               longitude,
+               latitude,
+               sd.dept_name as dept
+        FROM qk_emergency_rescue_team qk
+                 LEFT JOIN sys_dept sd ON qk.dept_id = sd.dept_id
+        where qk.dept_id = #{deptId}
+    </select>
 </mapper>

zhsq_qk-system/src/main/resources/mapper/system/QkEmergencyShelterMapper.xml

@@ -162,4 +162,8 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectQkEmergencyShelterAllList" parameterType="QkEmergencyShelter" resultMap="QkEmergencyShelterResult">
+        <include refid="selectQkEmergencyShelterVo"/>
+    </select>
 </mapper>

zhsq_qk-system/src/main/resources/mapper/system/QkRescueSuppliesMapper.xml

@@ -8,6 +8,7 @@
             <result property="id" column="id"/>
             <result property="varieties" column="varieties"/>
             <result property="cost" column="cost"/>
+            <result property="dept" column="dept"/>
             <result property="remarks" column="remarks"/>
             <result property="longitude" column="longitude"/>
             <result property="latitude" column="latitude"/>
@@ -107,4 +108,30 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectQkRescueSuppliesAllList" parameterType="QkRescueSupplies" resultMap="QkRescueSuppliesResult">
+        SELECT
+            id,
+            sd.dept_name AS dept,
+            longitude,
+            latitude
+        FROM
+            qk_rescue_supplies qk
+                LEFT JOIN sys_dept sd ON qk.dept_id = sd.dept_id
+        GROUP BY
+            qk.dept_id
+    </select>
+
+    <select id="selectQkRescueSuppliesByDeptId" parameterType="QkRescueSupplies" resultMap="QkRescueSuppliesResult">
+        SELECT id,
+               varieties,
+               cost,
+               remarks,
+               longitude,
+               latitude,
+               sd.dept_name AS dept
+        FROM qk_rescue_supplies qk
+                 LEFT JOIN sys_dept sd ON qk.dept_id = sd.dept_id
+        where qk.dept_id = #{deptId}
+    </select>
 </mapper>