工程管理

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java

@@ -71,7 +71,7 @@ public class LargeScreenController extends BaseController {
         }
     }
 
-    @Log(title = "设备分布图",businessType = BusinessType.QUERY)
+    @Log(title = "获取省份信息",businessType = BusinessType.QUERY)
     @PostMapping("getEquipmentDisByMap")
     public AjaxResult getEquipmentDisByMap(ParamsDto dto) {
         return service.getEquipmentDisByMap(dto);

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java

@@ -1,6 +1,7 @@
 package com.bonus.sgzb.largeScreen.mapper;
 
 import com.bonus.sgzb.largeScreen.domain.*;
+import com.bonus.sgzb.material.domain.EquipmentDis;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -47,7 +48,7 @@ public interface LargeScreenMapper {
      * @author cwchen
      * @date 2023/12/13 15:04
      */
-    List<EquipmentDisVo> getEquipmentDisByMap(ParamsDto dto);
+    List<EquipmentDis> getEquipmentDisByMap(ParamsDto dto);
 
     /**
      * @param dto

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java

@@ -6,6 +6,7 @@ import com.bonus.sgzb.largeScreen.domain.*;
 import com.bonus.sgzb.largeScreen.mapper.LargeScreenMapper;
 import com.bonus.sgzb.largeScreen.service.ILargeScreenService;
 import com.bonus.sgzb.largeScreen.util.CommonUtil;
+import com.bonus.sgzb.material.domain.EquipmentDis;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -70,7 +71,8 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
     public AjaxResult getEquipmentDisByMap(ParamsDto dto) {
         List<EquipmentDisVo> list = new ArrayList<>();
         try {
-
+            List<EquipmentDis> equipmentDisByMap = mapper.getEquipmentDisByMap(dto);
+            return AjaxResult.success(equipmentDisByMap);
         } catch (Exception e) {
             log.error("设备分布", e);
         }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDis.java

@@ -0,0 +1,20 @@
+package com.bonus.sgzb.material.domain;
+
+import lombok.Data;
+
+/**
+ * @author 10488
+ * 设备分布-VO
+ */
+@Data
+public class EquipmentDis {
+    /**
+     * 省份
+     */
+    private String province;
+    /**
+     * 工程数量
+     */
+    private Integer num;
+
+}

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDisVo.java

@@ -0,0 +1,51 @@
+package com.bonus.sgzb.material.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 10488
+ * 设备分布-VO
+ */
+@Data
+public class EquipmentDisVo {
+
+    /**
+     * 经度
+     */
+    private String lon;
+
+    /**
+     * 维度
+     */
+    private String lat;
+
+    /**
+     * 工程名称
+     */
+    private String lotName;
+    /**
+     * 工程id
+     */
+    private Integer lotId;
+
+    /**
+     * 机具类型名称
+     */
+    private String typeName;
+    /**
+     * 省份
+     */
+    private String province;
+    /**
+     * 工程数量
+     */
+    private Integer num;
+
+    private String longitude;
+    private String latitude;
+    private String address;
+
+    List<EquipmentDisVo> EquipmentDisList;
+}

sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml

@@ -41,7 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
     <!--设备分布-->
-    <select id="getEquipmentDisByMap" resultType="com.bonus.sgzb.largeScreen.domain.EquipmentDisVo"></select>
+    <select id="getEquipmentDisByMap" resultType="com.bonus.sgzb.largeScreen.domain.EquipmentDisVo">
+        select count(*) as num,province from bm_project_lot where province is not null
+        <if test="province!=null and province != ''">
+            AND province = #{province}
+        </if>
+        GROUP BY province
+    </select>
     <!--新购验收入库分析-->
     <select id="getAcceptanceStorage" resultType="java.util.Map">
         /*验收*/