新增：产品种植面积发布查询。

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/BigScreamController.java

@@ -36,4 +36,11 @@ public class BigScreamController  {
         return CommonResult.success(map);
     }
 
+    @ApiOperation("获取产品分布信息")
+    @GetMapping("/1/data3")
+    public CommonResult data13(){
+        List<Map<String, Object>> map = bigScreamService.data4();
+        return CommonResult.success(map);
+    }
+
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/BigScreamDao.java

@@ -9,4 +9,18 @@ public interface BigScreamDao {
     public Map<String,Object> data1(@Param("id")Long id);
 
     public List<Map<String,Object>> data2(@Param("compType")String compType);
+
+    /**
+     * 获取产品分布信息
+     * lym
+     * @return
+     */
+    public List<Map<String,Object>> data4();
+
+    /**
+     * 获取产品种植面积分布信息
+     * lym
+     * @return
+     */
+    public List<Map<String,Object>> data5(@org.apache.ibatis.annotations.Param("productName") String productName);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/BigScreamService.java

@@ -22,4 +22,10 @@ public interface BigScreamService {
      */
     public Map<String,Object> data3();
 
+    /**
+     * 获取产品分布信息
+     * lym
+     * @return
+     */
+    public List<Map<String,Object>> data4();
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/BigScreamServiceImpl.java

@@ -30,4 +30,9 @@ public class BigScreamServiceImpl implements BigScreamService {
     public Map<String, Object> data3() {
         return null;
     }
+
+    @Override
+    public List<Map<String,Object>> data4() {
+        return bigScreamDao.data4();
+    }
 }

forest-admin/admin-server/src/main/resources/dao/BigScreamDao.xml

@@ -30,4 +30,25 @@
             </if>
 
     </select>
+
+    <resultMap id="productMap" type="java.util.Map">
+        <collection property="productList" javaType="java.util.List" select="com.hwrj.cloud.admin.dao.BigScreamDao.data5"
+            column="{productName=name}" ofType="java.util.Map">
+        </collection>
+    </resultMap>
+
+    <!-- 获取产品分布信息 lym -->
+    <select id="data4" resultMap="productMap">
+        SELECT id,parent_id AS parentId,`name`,product_unit AS productUnit FROM pms_product_category
+            WHERE parent_id = 0 AND show_status = 1
+            ORDER BY sort ASC
+    </select>
+
+    <!-- 获取产品种植面积分布信息 lym -->
+    <select id="data5" resultType="map">
+        SELECT a.latitude AS lat,a.longitude AS lng,b.plant_area AS value FROM ums_member_origin a
+        INNER JOIN ums_member_origin_product b ON a.id = b.fk_origin_id
+        WHERE a.state = 0 AND b.state = 0
+        AND b.product_name = #{productName}
+    </select>
 </mapper>