Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-12 be9da335cb28e12e1439c24e4596f069e342d83f

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/farm/entity/Farm.java

@@ -103,4 +103,15 @@
     * 360全景url
     */
    private String panoramic;

    /**
     * 经度
     */
    private String longitude;

    /**
     * 纬度
     */
    private String latitude;

}

 src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml

@@ -11,7 +11,7 @@
               slogan,
               introduce,
               picture,
               panoramic,
               panoramic,longitude,latitude,
               ST_ASTEXT(position) as position
        from
            sys_farm
@@ -33,6 +33,7 @@
               slogan,
               introduce,
               picture,
               panoramic,longitude,latitude,
               ST_ASTEXT(position) as position
        from
            sys_farm
@@ -63,6 +64,8 @@
        city = #{farm.city},
        district = #{farm.district},
        panoramic = #{farm.panoramic},
        longitude = #{farm.longitude},
        latitude = #{farm.latitude},
        <if test="farm.position!=null and farm.position!=''">
            position = ST_GeomFromText(${farm.position}),
        </if>
@@ -72,7 +75,8 @@

    <!--自定义新增农场围栏数据-->
    <insert id="saveFarmInfo">
        insert into  sys_farm (farm_name,farm_address,farm_area,slogan,introduce,picture,position,create_time,update_time,dept_id,province,city,district,panoramic)
        insert into  sys_farm (farm_name,farm_address,farm_area,slogan,introduce,picture,position,
                               create_time,update_time,dept_id,province,city,district,panoramic,longitude,latitude)
        values
        (#{farm.farmName},#{farm.farmAddress},#{farm.farmArea},#{farm.slogan},#{farm.introduce},#{farm.picture},
        <choose>
@@ -83,7 +87,7 @@
                null,
            </otherwise>
        </choose>
        #{farm.createTime},#{farm.updateTime},#{farm.deptId},#{farm.province},#{farm.city},#{farm.district},#{farm.panoramic})
        #{farm.createTime},#{farm.updateTime},#{farm.deptId},#{farm.province},#{farm.city},#{farm.district},#{farm.panoramic},#{farm.longitude},#{farm.latitude})
    </insert>

    <!--详情信息（自定义查询)-->
@@ -98,7 +102,7 @@
               province,
               city,
               district,
               panoramic,
               panoramic,longitude,latitude,
               ST_ASTEXT(position) as position,dept_id
        from
            sys_farm

 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml

@@ -26,7 +26,7 @@
        c.dict_value as dica,
        v.farm_name as deptname,
        l.farm_id as farmId,
        l.land_type
        l.land_type,l.type
        FROM `sys_land` l
        LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'land' AND is_deleted = 0 <if
        test="land.tenantId!=null and land.tenantId != ''">