楼宇中控及房产土地接口修改

project-zcustom/src/main/java/com/project/zcustom/controller/logistics/PlatHousingLandController.java

@@ -1,18 +1,24 @@
 package com.project.zcustom.controller.logistics;
 
+import com.project.common.annotation.Log;
+import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.common.utils.poi.ExcelUtil;
+import com.project.zcustom.domain.addional.LargeHousingLand;
 import com.project.zcustom.service.logistics.ILargeHousingLandService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 
 @RestController
 @RequestMapping("/large/housing")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class PlatHousingLandController {
+public class PlatHousingLandController extends BaseController {
 
     @Autowired
     private ILargeHousingLandService largeHousingLandService;
@@ -40,4 +46,36 @@ public class PlatHousingLandController {
     public AjaxResult getInvestFinishState() {
         return AjaxResult.success("查询成功", largeHousingLandService.getInvestFinishState());
     }
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeHousingLand entity) {
+        return AjaxResult.success("查询成功", largeHousingLandService.pagingLargePlatHousingLandList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeHousingLandService.getById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:add')")
+    @Log(title = "房产土地", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeHousingLand entity) {
+        return toAjax(largeHousingLandService.save(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:edit')")
+    @Log(title = "房产土地", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeHousingLand entity) {
+        return toAjax(largeHousingLandService.updateById(entity));
+    }
+
+    @PreAuthorize("@ss.hasPermi('zcustom:platHousingLand:remove')")
+    @Log(title = "房产土地", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeHousingLandService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
 }

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeHousingLand.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
+import com.project.common.core.domain.CustomBaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,10 +21,10 @@ import java.util.Date;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-@TableName("Large_housing_land")
-@ApiModel(value = "Large_housing_land实体类")
+@TableName("large_plat_housing_land")
+@ApiModel(value = "large_plat_housing_land实体类")
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class LargeHousingLand {
+public class LargeHousingLand extends CustomBaseEntity {
 
     /**
      * id

project-zcustom/src/main/java/com/project/zcustom/mapper/logistics/PlatHousingLandMapper.java

@@ -1,11 +1,12 @@
 package com.project.zcustom.mapper.logistics;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.project.zcustom.domain.addional.LargeHousingLand;
 
 import java.util.List;
 import java.util.Map;
 
-public interface PlatHousingLandMapper {
+public interface PlatHousingLandMapper extends BaseMapper<LargeHousingLand> {
     List<LargeHousingLand> getStockOfEstateResources();
 
     Map<String, Object> getStockOfLandResources();

project-zcustom/src/main/java/com/project/zcustom/service/logistics/ILargeHousingLandService.java

@@ -1,11 +1,23 @@
 package com.project.zcustom.service.logistics;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.zcustom.domain.addional.LargeHousingLand;
+
 import java.util.Map;
 
-public interface ILargeHousingLandService {
+public interface ILargeHousingLandService extends IService<LargeHousingLand> {
     Map<String, Object> getStockOfEstateResources();
 
     Map<String, Object> getStockOfLandResources();
 
     Map<String, Object> getInvestFinishState();
+
+    /**
+     * 分页查询房产土地列表
+     *
+     * @param largeHousingLand 房产土地
+     * @return 房产土地集合
+     */
+    public IPage<LargeHousingLand> pagingLargePlatHousingLandList(LargeHousingLand largeHousingLand);
 }

project-zcustom/src/main/java/com/project/zcustom/service/logistics/impl/LargeHousingLandServiceImpl.java

@@ -1,5 +1,10 @@
 package com.project.zcustom.service.logistics.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.utils.StringUtils;
 import com.project.zcustom.domain.addional.LargeHousingLand;
 import com.project.zcustom.mapper.logistics.PlatHousingLandMapper;
 import com.project.zcustom.service.logistics.ILargeHousingLandService;
@@ -12,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 @Service
-public class LargeHousingLandServiceImpl implements ILargeHousingLandService {
+public class LargeHousingLandServiceImpl extends ServiceImpl<PlatHousingLandMapper, LargeHousingLand> implements ILargeHousingLandService {
 
     @Autowired
     private PlatHousingLandMapper platHousingLandMapper;
@@ -40,4 +45,45 @@ public class LargeHousingLandServiceImpl implements ILargeHousingLandService {
     public Map<String, Object> getInvestFinishState(){
         return platHousingLandMapper.getInvestFinishState();
     }
+
+    /**
+     * 分页查询房产土地列表
+     *
+     * @param largePlatHousingLand 房产土地
+     * @return 房产土地集合
+     */
+    @Override
+    public IPage<LargeHousingLand> pagingLargePlatHousingLandList(LargeHousingLand largePlatHousingLand) {
+        IPage<LargeHousingLand> page = new Page<>(largePlatHousingLand.getPageNum(), largePlatHousingLand.getPageSize());
+        LambdaQueryWrapper<LargeHousingLand> lqw = getLambdaQueryWrapper(largePlatHousingLand);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeHousingLand::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+    /**
+     * 组装查询条件
+     */
+    private LambdaQueryWrapper<LargeHousingLand> getLambdaQueryWrapper(LargeHousingLand largePlatHousingLand) {
+        LambdaQueryWrapper<LargeHousingLand> lqw = new LambdaQueryWrapper<LargeHousingLand>();
+        if (StringUtils.isNotBlank(largePlatHousingLand.getHousing())){
+            lqw.eq(LargeHousingLand::getHousing ,largePlatHousingLand.getHousing());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getAcreage())){
+            lqw.eq(LargeHousingLand::getAcreage ,largePlatHousingLand.getAcreage());
+        }
+        if (StringUtils.isNotBlank(largePlatHousingLand.getType())){
+            lqw.eq(LargeHousingLand::getType ,largePlatHousingLand.getType());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getConstructionTime())){
+            lqw.eq(LargeHousingLand::getConstructionTime ,largePlatHousingLand.getConstructionTime());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getOwnershipFlag())){
+            lqw.eq(LargeHousingLand::getOwnershipFlag ,largePlatHousingLand.getOwnershipFlag());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getInvestmentPlanFlag())){
+            lqw.eq(LargeHousingLand::getInvestmentPlanFlag ,largePlatHousingLand.getInvestmentPlanFlag());
+        }
+        return lqw;
+    }
 }

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatBuildingServiceImpl.java

@@ -314,7 +314,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
 
     public JSONArray getThisAmmeterDetail(String type){
         // TODO
-        /*return buildingService.repeat(ApiUrlConfig.getControlElectricityDetail(), "type=" + type);*/
+        /*return JSONArray.parseArray(buildingService.repeat(ApiUrlConfig.getControlElectricityDetail(), "type=" + type));*/
         String str = "[\n" +
                 "        {\n" +
                 "            \"number\": \"1# 1-3\",\n" +
@@ -419,7 +419,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
     public JSONArray getAbnormalPoint(String type){
         // TODO
         /*
-        return buildingService.repeat(ApiUrlConfig.getControlAlertDetails(), "type=" + type);
+        return JSONArray.parseArray(buildingService.repeat(ApiUrlConfig.getControlAlertDetails(), "type=" + type));
         */
         String str = "[\n" +
                 "        {\n" +