项目监控地图，焊口定位信息查看

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/WeldDto.java

@@ -49,7 +49,6 @@ public class WeldDto  extends BaseDto {
     @ApiModelProperty(value = "赋码日期")
     private Date codingDate;
 
-
     @ApiModelProperty(value = "监察单位")
     private String superviseDept;
 
@@ -59,9 +58,11 @@ public class WeldDto  extends BaseDto {
     @ApiModelProperty(value = "检验检测单位负责人")
     private String insPerson;
 
+    @ApiModelProperty(value = "经度")
+    private String longitude;
 
-
-
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
 
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Weld.java

@@ -70,4 +70,18 @@ public class Weld extends BaseEntity {
 	@TableField("coding_date")
     private Date codingDate;
 
+    /**
+     *经度
+     */
+    @TableField("longitude")
+    private String longitude;
+
+    /**
+     *纬度
+     */
+    @TableField("latitude")
+    private String latitude;
+
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/WeldMapper.java

@@ -31,4 +31,7 @@ public interface WeldMapper extends BaseMapper<Weld> {
 
     @Select("select * from tz_ugp_weld where `code` =#{code}")
     WeldDto getSqe(@Param("code") String code);
+
+    List<Weld> getWeldList(String region,@Param("ids")Set<String> ids);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/WeldMapper.xml

@@ -26,5 +26,19 @@
         </where>
         order by rec_date desc
     </select>
+    <select id="getWeldList" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Weld">
+    SELECT * FROM tz_ugp_weld
+        <where>
+            <if test="region != '' and region != null" >
+                and tz_ugp_weld.region like concat("%", #{region},"%")
+            </if>
+            <if test="ids !=null and ids.size > 0">
+                AND  tz_ugp_weld.project_id in
+                <foreach collection="ids" item ="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WeldController.java

@@ -214,4 +214,11 @@ public class WeldController extends BaseController {
         return ResponseHelper.buildResponse(weldServiceImpl.getWeldQRCode(HKCode));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/getWeldList")
+    @ApiOperation(httpMethod = "GET", value = "获取焊口定位信息", notes = "获取焊口定位信息")
+    public ResponseModel<List<Weld>> getWeldList(@RequestParam( value = "region",required = false )String region){
+        return ResponseHelper.buildResponse(weldServiceImpl.getWeldList(region));
+    }
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WeldServiceImpl.java

@@ -33,6 +33,7 @@ import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
+import org.thymeleaf.expression.Ids;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -203,7 +204,7 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
             weld.setProjectId(Long.valueOf(project.getSequenceNbr()));
             weld.setInstallCompany(project.getInstallationUnitId());
             weld.setCode(code);
-            weld.setRegion(project.getInstallRegion());
+            weld.setRegion(project.getInstallRegionCode());
             weld.setCodingMethod(WeldMethodEnum.自动赋码.getState());
             weld.setCodingStatus(WeldCodeEnum.已赋值.getState());
             weld.setCodingDate(new Date());
@@ -355,5 +356,17 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         page.setRecords(list);
         return page;
     }
+    /**
+     * 获取焊口定位信息
+     */
+    public List<Weld> getWeldList(String region){
+        List<Project> projectList = projectResourceService.getProjectList();
+        Set<String> ids = new HashSet<>();
+        for (Project project : projectList) {
+            ids.add(String.valueOf(project.getSequenceNbr()));
+        }
+        List<Weld> weldList = weldMapper.getWeldList(region,ids);
+        return weldList;
+    }
 
 }
\ No newline at end of file