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

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

@@ -6,15 +6,11 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.iot.domain.BaseFacilityType;
-import com.usky.iot.domain.DmpDeviceInfo;
 import com.usky.iot.service.BaseFacilityTypeService;
-import com.usky.iot.service.BaseGgpFacilityService;
 import com.usky.iot.service.vo.BaseGgpFacilityTypeVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
-
 import java.util.List;
 
 /**
@@ -32,7 +28,7 @@ public class BaseFacilityTypeController {
     @Autowired
     private BaseFacilityTypeService baseFacilityTypeService;
     /**
-     * 设施类型信息查询
+     * 设施类型查看查询
      *
      * @return
      */
@@ -59,7 +55,7 @@ public class BaseFacilityTypeController {
     }
 
     /**
-     * 单位信息采集-名称模糊查询
+     * 设施类型根据ID查询
      *
      * @param id   单位名称
      * @return
@@ -68,5 +64,37 @@ public class BaseFacilityTypeController {
     public ApiResult<List<BaseFacilityType>> typeSelect(@RequestParam(value = "id", required = false) Integer id) {
         return ApiResult.success(baseFacilityTypeService.typeSelect(id));
     }
+
+    /**
+     * 新增
+     * @param baseFacilityType
+     * @return
+     */
+    @PostMapping("/add")
+    public ApiResult<Void> add(@RequestBody BaseFacilityType baseFacilityType){
+        baseFacilityTypeService.add(baseFacilityType);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param baseFacilityType
+     * @return
+     */
+    @PutMapping("/edit")
+    public ApiResult<Void> edit(@RequestBody BaseFacilityType baseFacilityType){
+        baseFacilityTypeService.update(baseFacilityType);
+        return ApiResult.success();
+    }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id)
+    {
+        baseFacilityTypeService.remove(id);
+        return ApiResult.success();
+    }
 }
 

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

@@ -10,10 +10,7 @@ import com.usky.iot.domain.BaseBuild;
 import com.usky.iot.domain.BaseGgpFacility;
 import com.usky.iot.domain.DmpDeviceInfo;
 import com.usky.iot.service.BaseGgpFacilityService;
-import com.usky.iot.service.vo.BaseGgpFacilityExportVo;
-import com.usky.iot.service.vo.BaseGgpFacilityRequest;
-import com.usky.iot.service.vo.BaseGgpFacilityTypeVO;
-import com.usky.iot.service.vo.DmpDeviceInfoRequest;
+import com.usky.iot.service.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -74,7 +71,7 @@ public class BaseGgpFacilityController {
 
 
     /**
-     * 删除记录
+     * 删除
      */
     @DeleteMapping("/{id}")
     public ApiResult<Void> remove(@PathVariable("id") Integer id)
@@ -142,5 +139,16 @@ public class BaseGgpFacilityController {
         return ApiResult.success(baseGgpFacilityService.buildInfo(buildNum, id, current, size));
     }
 
+    /**
+     * 地理信息-撒点
+     *
+     * @param baseGgpFacilityVO
+     * @return
+     */
+    @PostMapping("baseGgpFacilityList")
+    public ApiResult<List<BaseGgpFacility>> baseGgpFacilityList(@RequestBody BaseGgpFacilityVO baseGgpFacilityVO) {
+        return ApiResult.success(baseGgpFacilityService.baseGgpFacilityList(baseGgpFacilityVO));
+    }
+
 }
 

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

@@ -3,11 +3,9 @@ package com.usky.iot.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.iot.domain.BaseFacilityType;
 import com.usky.common.mybatis.core.CrudService;
-import com.usky.iot.domain.DmpDeviceInfo;
 import com.usky.iot.service.vo.BaseGgpFacilityTypeVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -28,4 +26,10 @@ public interface BaseFacilityTypeService extends CrudService<BaseFacilityType> {
 
     List<BaseFacilityType> typeSelect(Integer id);
 
+    boolean add(BaseFacilityType baseFacilityType);
+
+    void update(BaseFacilityType baseFacilityType);
+
+    boolean remove(Integer id);
+
 }

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

@@ -7,6 +7,7 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.iot.domain.DmpDeviceInfo;
 import com.usky.iot.service.vo.BaseGgpFacilityExportVo;
 import com.usky.iot.service.vo.BaseGgpFacilityRequest;
+import com.usky.iot.service.vo.BaseGgpFacilityVO;
 
 import java.util.List;
 
@@ -34,4 +35,12 @@ public interface BaseGgpFacilityService extends CrudService<BaseGgpFacility> {
     CommonPage<DmpDeviceInfo> deviceInfo(String deviceId,Integer id,Integer current,Integer size);
 
     CommonPage<BaseBuild> buildInfo(String buildNum, Integer id, Integer current, Integer size);
+
+    /**
+     * 地理信息-撒点
+     *
+     * @param baseGgpFacilityVO
+     * @return
+     */
+    List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO);
 }

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

@@ -21,6 +21,7 @@ import com.usky.iot.service.vo.BaseGgpFacilityTypeVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -110,4 +111,23 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
         List<BaseFacilityType> list1 = this.list(lambdaQuery);
         return list1;
     }
+
+    @Override
+    public boolean add(BaseFacilityType baseFacilityType) {
+        baseFacilityType.setCreatedBy(SecurityUtils.getUsername());
+        baseFacilityType.setCreatedTime(LocalDateTime.now());
+        return this.save(baseFacilityType);
+    }
+
+    @Override
+    public void update(BaseFacilityType baseFacilityType) {
+        baseFacilityType.setUpdatedTime(LocalDateTime.now());
+        baseFacilityType.setUpdatedBy(SecurityUtils.getUsername());
+        this.updateById(baseFacilityType);
+    }
+
+    @Override
+    public boolean remove(Integer id) {
+        return this.removeById(id);
+    }
 }

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

@@ -13,7 +13,9 @@ import com.usky.iot.mapper.BaseGgpFacilityMapper;
 import com.usky.iot.service.*;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.service.vo.BaseGgpFacilityExportVo;
+import com.usky.iot.service.vo.BaseGgpFacilityListVO;
 import com.usky.iot.service.vo.BaseGgpFacilityRequest;
+import com.usky.iot.service.vo.BaseGgpFacilityVO;
 import com.usky.system.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -185,4 +187,15 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
         }
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
+
+    @Override
+    public List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO) {
+        LambdaQueryWrapper<BaseGgpFacility> query = Wrappers.lambdaQuery();
+        query.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown, baseGgpFacilityVO.getStreetTown());
+        query.in(CollectionUtils.isNotEmpty(baseGgpFacilityVO.getFacilityType()),BaseGgpFacility::getFacilityType,
+                baseGgpFacilityVO.getFacilityType());
+
+        List<BaseGgpFacility> list = this.list(query);
+        return list;
+    }
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseGgpFacilityListVO.java

@@ -0,0 +1,24 @@
+package com.usky.iot.service.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import com.usky.iot.domain.BaseGgpFacility;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-22
+ */
+@Data
+public class BaseGgpFacilityListVO {
+
+        private BaseGgpFacility baseGgpFacility;
+
+        private JSONObject extendData;
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseGgpFacilityVO.java

@@ -0,0 +1,24 @@
+package com.usky.iot.service.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-06
+ */
+@Data
+public class BaseGgpFacilityVO {
+
+        private Integer id;
+
+        private String streetTown;
+
+        private List<Integer> facilityType;
+
+}