Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/EquipmentSpecificDto.java

@@ -33,4 +33,6 @@ public class EquipmentSpecificDto extends BaseDTO<EquipmentSpecificDto> {
     private String team;
     private String carId;
 
+    private String bizOrgCode;
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java

@@ -163,4 +163,13 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "位置信息")
 	private String area;
 
+
+	@ApiModelProperty(value = "经度")
+	@TableField(value = "longitude")
+	private Double longitude;
+
+	@ApiModelProperty(value = "纬度")
+	@TableField(value = "latitude")
+	private Double latitude;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentOnCarVo.java

@@ -69,4 +69,5 @@ public class EquipmentOnCarVo {
 
     private String equipDefinitionName;
 
+    private String bizOrgCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/EquipSpecificDto.java

@@ -39,4 +39,6 @@ public class EquipSpecificDto extends BaseEntity {
      */
     private Page<?> page;
 
+    private String bizOrgCode;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1152,6 +1152,20 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             equipmentDetail.setEquipmentName(equipment.getName());
             equipmentSpecific.setEquipmentCode(equipmentCode);
             equipmentSpecific.setName(equipmentDetail.getName());
+
+            if (StringUtils.isNotEmpty(equipmentDetail.getArea())) {
+                String[] addressData = equipmentDetail.getArea().split("@address@");
+                if (addressData.length > 1) {
+                    equipmentDetail.setArea(addressData[0]);
+                    JSONObject langLatObj = JSON.parseObject(addressData[1]);
+                    if (StringUtils.isNotEmpty(langLatObj.getString("longitude"))) {
+                        equipmentDetail.setLongitude(Double.valueOf(langLatObj.getString("longitude")));
+                    }
+                    if (StringUtils.isNotEmpty(langLatObj.getString("latitude"))) {
+                        equipmentDetail.setLatitude(Double.valueOf(langLatObj.getString("latitude")));
+                    }
+                }
+            }
         }
         Long warehouseStructureId = null;
         if (!ObjectUtils.isEmpty(equipmentSpecific.getStockDetail())) {

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2618,4 +2618,31 @@
         </sql>
     </changeSet>
 
+
+    <changeSet author="tw" id="20220301-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_detail" columnName="longitude"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_detail add `longitude`</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_detail` ADD COLUMN  `longitude` double(18,14) DEFAULT NULL COMMENT '经度'
+        </sql>
+    </changeSet>
+
+    <changeSet author="tw" id="20220301-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_detail" columnName="latitude"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_detail add `latitude`</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_detail` ADD COLUMN `latitude` double(18,14) DEFAULT NULL COMMENT '纬度'
+        </sql>
+    </changeSet>
+
+
+
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1074,6 +1074,12 @@
             <if test="vo.agencyId != null and vo.agencyId != ''">
                 AND es.`agency_id` = #{vo.agencyId}
             </if>
+
+            <if test="vo.bizOrgCode != null and vo.bizOrgCode != ''">
+                AND es.`biz_org_code` LIKE CONCAT(#{vo.bizOrgCode}, '%')
+            </if>
+
+
             AND sd.amount > 0
         </where>
         GROUP BY