diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java
index 073c72cd02637d7e8f53b5339ccaa37c9b71c05d..86624fb742e14ff2c0514741a80fff2041ce3c1b 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentDetailController.java
@@ -70,9 +70,10 @@ public class ComponentDetailController {
                                     @ApiParam(name = "regCondName",value = "部件上报案件条件名称",required = true)@RequestParam("regCondName") String regCondName,
                                     @ApiParam(name = "issueDescription",value = "部件上报案件描述情况",required = false)@RequestParam(value = "issueDescription",required = false) String issueDescription,
                                     @ApiParam(name = "pictureIds",value = "图片id组",required = true)@RequestParam("pictureIds") List<String> pictureIds,
-                                    @ApiParam(name = "collectorNickName",value = "采集人员昵称",required = true)@RequestParam("collectorNickName") String collectorNickName) {
+                                    @ApiParam(name = "collectorNickName",value = "采集人员昵称",required = true)@RequestParam("collectorNickName") String collectorNickName,
+                                    @ApiParam(name = "componentCollectionWays",value = "部件采集方式:1.部件采集 2.问题上报",required = true)@RequestParam("componentCollectionWays") String componentCollectionWays) {
 
-        return componentDetailService.componentAcquisition(componentName,componentCode,componentSuperName,componentSuperCode,componentTypeName,componentTypeCode,componentAddress,xCode,yCode,patrolInspectionTime,regCondCode,regCondName,issueDescription,pictureIds,collectorNickName);
+        return componentDetailService.componentAcquisition(componentName,componentCode,componentSuperName,componentSuperCode,componentTypeName,componentTypeCode,componentAddress,xCode,yCode,patrolInspectionTime,regCondCode,regCondName,issueDescription,pictureIds,collectorNickName,componentCollectionWays);
     }
 
     @ApiOperation(value = "获取今日巡检数，部件采集总数，上报采集总数")
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentIssuesReportController.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentIssuesReportController.java
index fd986e247dbe8f4c2edd61b334e2b4545dc2d1dd..55f64377a78d9cbed86c4bc8f0d267253d4211d2 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentIssuesReportController.java
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/controller/ComponentIssuesReportController.java
@@ -69,9 +69,10 @@ public class ComponentIssuesReportController {
                                     @ApiParam(name = "regCondName",value = "部件上报案件条件名称",required = true)@RequestParam("regCondName") String regCondName,
                                     @ApiParam(name = "issueDescription",value = "部件上报案件描述情况",required = true)@RequestParam(value = "issueDescription",required = false) String issueDescription,
                                     @ApiParam(name = "pictureIds",value = "图片id组",required = true)@RequestParam("pictureIds") List<String> pictureIds,
-                                    @ApiParam(name = "reportNickName",value = "上报人员昵称",required = true)@RequestParam("reportNickName") String reportNickName) {
+                                    @ApiParam(name = "reportNickName",value = "上报人员昵称",required = true)@RequestParam("reportNickName") String reportNickName,
+                                    @ApiParam(name = "componentCollectionWays",value = "部件采集方式:1.部件采集 2.问题上报",required = true)@RequestParam("componentCollectionWays") String componentCollectionWays) {
 
-        return componentIssuesReportService.componentReport(componentName,componentCode,componentSuperName,componentSuperCode,componentTypeName,componentTypeCode,componentAddress,xCode,yCode,reportTime,regCondCode,regCondName,issueDescription,pictureIds,reportNickName);
+        return componentIssuesReportService.componentReport(componentName,componentCode,componentSuperName,componentSuperCode,componentTypeName,componentTypeCode,componentAddress,xCode,yCode,reportTime,regCondCode,regCondName,issueDescription,pictureIds,reportNickName,componentCollectionWays);
     }
 
 }
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/entity/ComponentDetail.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/entity/ComponentDetail.java
index ed623b41311e880513f75dcd493828a4c2c5798d..c23b86cdb682cd5f704c3b972c4d6de276739895 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/entity/ComponentDetail.java
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/entity/ComponentDetail.java
@@ -55,6 +55,9 @@ public class ComponentDetail extends BaseEntity {
     @ApiModelProperty(value = "巡检时间")
     private LocalDateTime patrolInspectionTime;
 
+    @ApiModelProperty(value = "部件采集方式:1.部件采集 2.问题上报")
+    private String componentCollectionWays;
+
 
     public static final String COMPONENT_SUPER_NAME = "component_super_name";
 
@@ -78,4 +81,6 @@ public class ComponentDetail extends BaseEntity {
 
     public static final String PATROL_INSPECTION_TIME = "patrol_inspection_time";
 
+    public static final String COMPONENT_COLLECTION_WAYS = "component_collection_ways";
+
 }
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentDetailService.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentDetailService.java
index c1917eb31f46c62c7d37cce315dbe6fd2a1c1035..bb05819a38525856bfdd9fc96cc197417b0fe8ae 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentDetailService.java
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentDetailService.java
@@ -63,6 +63,7 @@ public interface ComponentDetailService extends IService<ComponentDetail> {
      * @param issueDescription
      * @param pictureIds
      * @param collectorNickName
+     * @param componentCollectionWays
      * @return
      */
     ResultBean componentAcquisition(String componentName,
@@ -79,7 +80,8 @@ public interface ComponentDetailService extends IService<ComponentDetail> {
                                     String regCondName,
                                     String issueDescription,
                                     List<String> pictureIds,
-                                    String collectorNickName);
+                                    String collectorNickName,
+                                    String componentCollectionWays);
     /**
      * @Description 获取今日巡检数，部件采集总数，上报采集总数
      * @Date 2021/11/3 15:27
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentIssuesReportService.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentIssuesReportService.java
index f8dfd6031f68fb1de12cd8f79a114aea674adef7..30e184d7043f951d020373c472f0eaaee1a4d746 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentIssuesReportService.java
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/ComponentIssuesReportService.java
@@ -55,11 +55,12 @@ public interface ComponentIssuesReportService extends IService<ComponentIssuesRe
      * @param issueDescription
      * @param pictureIds
      * @param reportNickName
+     * @param componentCollectionWays
      * @return
      * @Description 问题上报
      * @Date 2021/11/5 11:17
      */
-    ResultBean componentReport(String componentName, String componentCode, String componentSuperName, String componentSuperCode, String componentTypeName, String componentTypeCode, String componentAddress, String xCode, String yCode, LocalDateTime reportTime, String regCondCode, String regCondName, String issueDescription, List<String> pictureIds, String reportNickName);
+    ResultBean componentReport(String componentName, String componentCode, String componentSuperName, String componentSuperCode, String componentTypeName, String componentTypeCode, String componentAddress, String xCode, String yCode, LocalDateTime reportTime, String regCondCode, String regCondName, String issueDescription, List<String> pictureIds, String reportNickName, String componentCollectionWays);
 
 }
 
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java
index ebf79677ae751ac7a2e8ef8583df596046e45aea..32c8236cd06608d5ac3a4a431ea8a45d047b782d 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentDetailServiceImpl.java
@@ -2,6 +2,8 @@ package com.hncy.service.wechat.applet.biz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.hncy.common.dto.ResultBean;
 import com.hncy.common.exception.custom.BusinessException;
@@ -160,13 +162,15 @@ public class ComponentDetailServiceImpl extends ServiceImpl<ComponentDetailMappe
         componentDetails.stream().forEach(componentDetail -> {
             componentAcquisitionVo.setComponentTypeCode(componentDetail.getComponentTypeCode());
             componentAcquisitionVo.setComponentTypeName(componentDetail.getComponentTypeName());
-            ComponentSubsVo componentSubsVo = new ComponentSubsVo();
-            BeanUtils.copyProperties(componentDetail,componentSubsVo);
-            ComponentIssueReportRelation componentIssueReportRelation = componentIssueReportRelationMapper.selectIssueIdByComponentId(componentDetail.getId());
-            ComponentIssuesReport componentIssuesReport = componentIssuesReportMapper.selectById(componentIssueReportRelation.getComponentIssuesId());
-            componentSubsVo.setRegCondName(componentIssuesReport.getRegCondName());
-            componentSubsVo.setRegCondCode(componentIssuesReport.getRegCondCode());
-            componentSubsVos.add(componentSubsVo);
+            if(ObjectUtil.isNotEmpty(componentDetail.getComponentLogo())) {
+                ComponentSubsVo componentSubsVo = new ComponentSubsVo();
+                BeanUtils.copyProperties(componentDetail,componentSubsVo);
+                ComponentIssueReportRelation componentIssueReportRelation = componentIssueReportRelationMapper.selectIssueIdByComponentId(componentDetail.getId());
+                ComponentIssuesReport componentIssuesReport = componentIssuesReportMapper.selectById(componentIssueReportRelation.getComponentIssuesId());
+                componentSubsVo.setRegCondName(componentIssuesReport.getRegCondName());
+                componentSubsVo.setRegCondCode(componentIssuesReport.getRegCondCode());
+                componentSubsVos.add(componentSubsVo);
+            }
         });
         Map<String, List<ComponentSubsVo>> collect = componentSubsVos
                                                     .stream()
@@ -201,7 +205,8 @@ public class ComponentDetailServiceImpl extends ServiceImpl<ComponentDetailMappe
                                            String regCondName,
                                            String issueDescription,
                                            List<String> pictureIds,
-                                           String collectorNickName) {
+                                           String collectorNickName,
+                                           String componentCollectionWays) {
 
         //部件详情
         ComponentDetail componentDetail = new ComponentDetail();
@@ -215,6 +220,7 @@ public class ComponentDetailServiceImpl extends ServiceImpl<ComponentDetailMappe
         componentDetail.setXCode(xCode);
         componentDetail.setYCode(yCode);
         componentDetail.setPatrolInspectionTime(patrolInspectionTime);
+        componentDetail.setComponentCollectionWays(componentCollectionWays);
         componentDetail.setDeleted(0);
         componentDetail.setGmtCreate(DateTime.now());
         componentDetail.setCreateBy(collectorNickName);
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentIssuesReportServiceImpl.java b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentIssuesReportServiceImpl.java
index 0a83365d731000a49f2dc5d101deb7e098fc558f..64fd55a2d1cc3cfe2c10757707532e2edc4da6a0 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentIssuesReportServiceImpl.java
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/java/com/hncy/service/wechat/applet/biz/service/impl/ComponentIssuesReportServiceImpl.java
@@ -74,7 +74,7 @@ public class ComponentIssuesReportServiceImpl extends ServiceImpl<ComponentIssue
     }
 
     @Override
-    public ResultBean componentReport(String componentName, String componentCode, String componentSuperName, String componentSuperCode, String componentTypeName, String componentTypeCode, String componentAddress, String xCode, String yCode, LocalDateTime reportTime, String regCondCode, String regCondName, String issueDescription, List<String> pictureIds, String reportNickName) {
+    public ResultBean componentReport(String componentName, String componentCode, String componentSuperName, String componentSuperCode, String componentTypeName, String componentTypeCode, String componentAddress, String xCode, String yCode, LocalDateTime reportTime, String regCondCode, String regCondName, String issueDescription, List<String> pictureIds, String reportNickName, String componentCollectionWays) {
         //部件详情
         ComponentDetail componentDetail = new ComponentDetail();
         componentDetail.setComponentName(componentName);
@@ -84,6 +84,7 @@ public class ComponentIssuesReportServiceImpl extends ServiceImpl<ComponentIssue
         componentDetail.setComponentTypeName(componentTypeName);
         componentDetail.setComponentTypeCode(componentTypeCode);
         componentDetail.setComponentAddress(componentAddress);
+        componentDetail.setComponentCollectionWays(componentCollectionWays);
         componentDetail.setXCode(xCode);
         componentDetail.setYCode(yCode);
         componentDetail.setPatrolInspectionTime(null);
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/application.yml b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/application.yml
index ec2145428459020e4fb5756ecd2052b2df8423fa..7942d4f6a7e02d3fb5d000d5e58f51c6f57e1f65 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/application.yml
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 26
+  port: 32
 #  port: 50732
 spring:
   profiles:
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/mapper/ComponentDetailMapper.xml b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/mapper/ComponentDetailMapper.xml
index 7ccf0348156344d42c7ec73a82a3ba36fc97d568..5184e11fb780eda590ff3466da03900d69560c26 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/mapper/ComponentDetailMapper.xml
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/mapper/ComponentDetailMapper.xml
@@ -21,6 +21,7 @@
         <result column="x_code" property="xCode" />
         <result column="y_code" property="yCode" />
         <result column="patrol_inspection_time" property="patrolInspectionTime" />
+        <result column="component_collection_ways" property="componentCollectionWays" />
     </resultMap>
 
     <resultMap id="BaseResultMapVO" type="com.hncy.service.wechat.applet.biz.vo.ComponentTypesVo">
@@ -45,7 +46,7 @@
         gmt_modified,
         update_by,
         deleted,
-        component_super_name, component_super_code, component_type_name, component_type_code, component_name, component_code, component_logo, component_address, x_code, y_code, patrol_inspection_time
+        component_super_name, component_super_code, component_type_name, component_type_code, component_name, component_code, component_logo, component_address, x_code, y_code, patrol_inspection_time, component_collection_ways
     </sql>
     <update id="savepatrolInspectionTime">
         UPDATE component_detail set patrol_inspection_time = #{patrolInspectionTime}
@@ -65,11 +66,13 @@
     </select>
     <select id="judgeAIComponentIsExist"
             resultType="com.hncy.service.wechat.applet.biz.entity.ComponentDetail">
-        SELECT * FROM component_detail
-        WHERE component_type_name = #{componentTypeName}
-        AND x_code like concat("%",#{xCode},"%")
-        AND y_code like concat("%",#{yCode},"%")
-        ANd deleted = 0
+        SELECT *,
+        (6371 * acos(cos(radians(#{yCode})) * cos(radians(y_code)) * cos(radians(x_code) - radians(#{xCode})) + sin(radians(#{yCode})) * sin(radians(y_code)))) AS distance
+        FROM component_detail
+        WHERE deleted = 0
+        AND component_type_name = #{componentTypeName}
+        AND component_collection_ways = '1'
+        ORDER BY distance LIMIT 0,1
     </select>
     <select id="selectAllTypesBySub"
             resultMap="BaseResultMapSubVO">
@@ -89,19 +92,23 @@
     <select id="selectTodaySum" resultType="java.lang.String">
         SELECT COUNT(*) FROM component_detail
         WHERE DATEDIFF (patrol_inspection_time, NOW()) = 0
+        AND component_collection_ways = '1'
     </select>
     <select id="selectTodayComponentsSum" resultType="java.lang.String">
         SELECT COUNT(*) FROM component_detail
         WHERE DATEDIFF (gmt_create, NOW()) = 0
+        AND component_collection_ways = '1'
     </select>
     <select id="selectTodayComponentsTypeSum"
             resultType="com.hncy.service.wechat.applet.biz.entity.ComponentDetail">
         SELECT * FROM component_detail
         WHERE DATEDIFF (patrol_inspection_time, NOW()) = 0
+        AND component_collection_ways = '1'
     </select>
     <select id="selectSumComponents" resultType="java.lang.String">
         SELECT count(*) FROM component_detail
         WHERE deleted = 0
+        AND component_collection_ways = '1'
     </select>
     <select id="selectSumComponentsByMounth"
             resultMap="CountMounthComponentDto">
diff --git a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/mapper/ComponentPictureMapper.xml b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/mapper/ComponentPictureMapper.xml
index 583738144c107b28d88747eb295c3699159506d8..696590dd40a0fce2b583c688ba27dbefe74bb195 100644
--- a/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/mapper/ComponentPictureMapper.xml
+++ b/service-biz/service-wechat-applet/service-wechat-applet-biz/src/main/resources/mapper/ComponentPictureMapper.xml
@@ -27,9 +27,9 @@
         deleted,
         component_picture_name, component_picture_size, component_picture_url, component_picture_type, storage_form
     </sql>
-    <delete id="deletePictures">
+    <update id="deletePictures">
         UPDATE component_picture SET deleted = 1
         WHERE id = #{id}
-    </delete>
+    </update>
 
 </mapper>