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

@@ -2,15 +2,18 @@ package com.usky.iot.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+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.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -37,5 +40,33 @@ public class BaseFacilityTypeController {
     public ApiResult<List<BaseGgpFacilityTypeVO>> typeInfo() {
         return ApiResult.success(baseFacilityTypeService.typeInfo());
     }
+    /**
+     * 设施类型分页
+     * @param typeCode  类型编码
+     * @param typeName  类型名称
+     * @param current   当前页
+     * @param size     每页条数
+     * @return
+     */
+    @Log(title = "设施类型分页", businessType = BusinessType.OTHER)
+    @GetMapping("/typePage")
+    public ApiResult<CommonPage<BaseFacilityType>> typePage(@RequestParam(value = "typeCode", required = false) String typeCode,
+                                                            @RequestParam(value = "typeName", required = false) String typeName,
+                                                            @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
+                                                            @RequestParam(value = "size", required = false, defaultValue = "10") Integer size)
+    {
+        return ApiResult.success(baseFacilityTypeService.typePage(typeCode, typeName, current, size));
+    }
+
+    /**
+     * 单位信息采集-名称模糊查询
+     *
+     * @param id   单位名称
+     * @return
+     */
+    @GetMapping("typeSelect")
+    public ApiResult<List<BaseFacilityType>> typeSelect(@RequestParam(value = "id", required = false) Integer id) {
+        return ApiResult.success(baseFacilityTypeService.typeSelect(id));
+    }
 }
 

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

@@ -1,7 +1,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;
@@ -22,4 +24,8 @@ public interface BaseFacilityTypeService extends CrudService<BaseFacilityType> {
      */
     List<BaseGgpFacilityTypeVO> typeInfo();
 
+    CommonPage<BaseFacilityType> typePage(String typeCode, String typeName, Integer current, Integer size);
+
+    List<BaseFacilityType> typeSelect(Integer id);
+
 }

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

@@ -1,12 +1,17 @@
 package com.usky.iot.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.BaseFacilityDevice;
 import com.usky.iot.domain.BaseFacilityType;
 import com.usky.iot.domain.BaseGgpFacility;
+import com.usky.iot.domain.DmpDeviceInfo;
 import com.usky.iot.mapper.BaseFacilityTypeMapper;
 import com.usky.iot.service.BaseFacilityTypeService;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -87,4 +92,22 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
         }
         return list;
     }
+    @Override
+    public CommonPage<BaseFacilityType> typePage(String typeCode, String typeName, Integer current, Integer size) {
+        IPage<BaseFacilityType> page = new Page<>(current, size);
+        LambdaQueryWrapper<BaseFacilityType> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.like(StringUtils.isNotBlank(typeName),BaseFacilityType::getTypeName,
+                typeName)
+                .eq(StringUtils.isNotBlank(typeCode),BaseFacilityType::getTypeCode,
+                        typeCode);
+        page = this.page(page,lambdaQuery);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+    }
+    @Override
+    public List<BaseFacilityType> typeSelect(Integer id) {
+        LambdaQueryWrapper<BaseFacilityType> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(null != id,BaseFacilityType::getId,id);
+        List<BaseFacilityType> list1 = this.list(lambdaQuery);
+        return list1;
+    }
 }