Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseBuildController.java

@@ -114,7 +114,7 @@ public class BaseBuildController {
     @GetMapping("typeFacilityInfo")
     public ApiResult<List<BaseBuildFacility>> typeFacilityInfo(@RequestParam(value = "id") Integer id,
                                                                @RequestParam(value = "floor") String floor,
-                                                               @RequestParam(value = "typeCode") String typeCode) {
+                                                               @RequestParam(value = "typeCode",required = false) String typeCode) {
         return ApiResult.success(baseBuildService.typeFacilityInfo(id,floor,typeCode));
     }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseBuildPlaneController.java

@@ -1,9 +1,14 @@
 package com.usky.iot.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.iot.domain.BaseBuild;
+import com.usky.iot.domain.BaseBuildPlane;
+import com.usky.iot.service.BaseBuildPlaneService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +18,33 @@ import org.springframework.stereotype.Controller;
  * @author han
  * @since 2023-08-17
  */
-@Controller
+@RestController
 @RequestMapping("/baseBuildPlane")
 public class BaseBuildPlaneController {
+    @Autowired
+    private BaseBuildPlaneService baseBuildPlaneService;
 
+    /**
+     * 新增
+     * @param baseBuildPlane
+     * @return
+     */
+    @PostMapping
+    ApiResult<Void> add(@RequestBody BaseBuildPlane baseBuildPlane){
+        baseBuildPlaneService.add(baseBuildPlane);
+        return ApiResult.success();
+    }
+
+    /**
+     * 列表
+     * @param buildId
+     * @param floor
+     * @return
+     */
+    @GetMapping("dataList")
+    ApiResult<List<BaseBuildPlane>> dataList(@RequestParam(value = "buildId") Integer buildId,
+                                             @RequestParam(value = "floor",required = false) String floor){
+        return ApiResult.success(baseBuildPlaneService.dataList(buildId,floor));
+    }
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacility.java

@@ -95,6 +95,16 @@ public class BaseBuildFacility implements Serializable {
      */
     private String contactPhone;
 
+    /**
+     * 平面X轴坐标
+     */
+    private String planeX;
+
+    /**
+     * 平面Y轴坐标
+     */
+    private String planeY;
+
     /**
      * X轴坐标
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildPlane.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -50,6 +52,7 @@ public class BaseBuildPlane implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/BaseBuildPlaneService.java

@@ -1,8 +1,11 @@
 package com.usky.iot.service;
 
+import com.usky.iot.domain.BaseBuild;
 import com.usky.iot.domain.BaseBuildPlane;
 import com.usky.common.mybatis.core.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  * 建筑楼层平面图 服务类
@@ -12,5 +15,7 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2023-08-17
  */
 public interface BaseBuildPlaneService extends CrudService<BaseBuildPlane> {
+    void add(BaseBuildPlane baseBuildPlane);
 
+    List<BaseBuildPlane> dataList(Integer buildId,String floor);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildPlaneServiceImpl.java

@@ -1,11 +1,24 @@
 package com.usky.iot.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.BaseBuild;
+import com.usky.iot.domain.BaseBuildFacilityRelate;
 import com.usky.iot.domain.BaseBuildPlane;
 import com.usky.iot.mapper.BaseBuildPlaneMapper;
 import com.usky.iot.service.BaseBuildPlaneService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Calendar;
+import java.util.List;
+
 /**
  * <p>
  * 建筑楼层平面图 服务实现类
@@ -17,4 +30,21 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseBuildPlaneServiceImpl extends AbstractCrudService<BaseBuildPlaneMapper, BaseBuildPlane> implements BaseBuildPlaneService {
 
+    @Override
+    public void add(BaseBuildPlane baseBuildPlane){
+        baseBuildPlane.setCreateBy(SecurityUtils.getUsername());
+        baseBuildPlane.setCreateTime(LocalDateTime.now());
+        this.save(baseBuildPlane);
+
+    }
+
+    @Override
+    public List<BaseBuildPlane> dataList(Integer buildId,String floor){
+        LambdaQueryWrapper<BaseBuildPlane> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper
+                .eq(!ObjectUtils.isEmpty(buildId),BaseBuildPlane::getBuildId,buildId)
+                .eq(StringUtils.isNotBlank(floor),BaseBuildPlane::getFloor,floor);
+        List<BaseBuildPlane> list = this.list(queryWrapper);
+        return list;
+    }
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -281,17 +281,18 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,id);
         List<BaseBuildFacilityRelate> baseBuildFacilityList = baseBuildFacilityRelateService.list(queryWrapper);
         List<Integer> facilityIdList = new ArrayList<>();
+        List<BaseBuildFacility> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(baseBuildFacilityList)) {
             for (int i = 0; i < baseBuildFacilityList.size(); i++) {
                 facilityIdList.add(baseBuildFacilityList.get(i).getFacilityId());
             }
+            LambdaQueryWrapper<BaseBuildFacility> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.in(BaseBuildFacility::getId,facilityIdList)
+                    .eq(StringUtils.isNotBlank(typeCode),BaseBuildFacility::getFacilityType,typeCode)
+                    .eq(StringUtils.isNotBlank(floor),BaseBuildFacility::getFloor,floor)
+                    .eq(BaseBuildFacility::getDeleteFlag,0);
+            list = baseBuildFacilityService.list(queryWrapper1);
         }
-        LambdaQueryWrapper<BaseBuildFacility> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.in(BaseBuildFacility::getId,facilityIdList)
-                .eq(BaseBuildFacility::getFacilityType,typeCode)
-                .eq(BaseBuildFacility::getFloor,floor)
-                .eq(BaseBuildFacility::getDeleteFlag,0);
-        List<BaseBuildFacility> list = baseBuildFacilityService.list(queryWrapper1);
         return list;
     }
 

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildFacilityMapper.xml

@@ -14,6 +14,8 @@
         <result column="device_id" property="deviceId" />
         <result column="contact" property="contact" />
         <result column="contact_phone" property="contactPhone" />
+        <result column="plane_x" property="planeX" />
+        <result column="plane_y" property="planeY" />
         <result column="coordinate_x" property="coordinateX" />
         <result column="coordinate_y" property="coordinateY" />
         <result column="coordinate_z" property="coordinateZ" />