diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java index 512aa3bb..5e5daeda 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java @@ -9,18 +9,16 @@ import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Joiner; +import com.jianwei.common.core.domain.BaseEntity; +import com.kms.build.domain.BsSgcjsjdBuiProInfo; +import com.kms.build.domain.dto.LatitudeLongitude; +import com.kms.build.service.BsSgcjsjdBuiProInfoService; import com.kms.config.WaterRequestUtil; import com.kms.config.WaterResult; import com.kms.config.singleDomain.SingleMenu; import com.kms.config.singleDomain.SingleUser; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.AjaxResult; import com.jianwei.common.utils.StringUtils; @@ -40,6 +38,10 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/test/user") public class TestController extends BaseController { + + @Autowired + BsSgcjsjdBuiProInfoService service; + private final static Map users = new LinkedHashMap(); { users.put(1, new UserEntity(1, "admin", "admin123", "15888888888")); @@ -49,8 +51,8 @@ public class TestController extends BaseController @Autowired WaterRequestUtil waterRequestUtil; - @GetMapping("test") - public WaterResult test(){ + @PostMapping("test") + public WaterResult test(@RequestBody BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo){ WaterResult waterResult = waterRequestUtil.getRolePage(); // List singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class); // List singleAllMenus = new ArrayList<>(); diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java index 593e9f1e..52a3c11f 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java @@ -85,9 +85,7 @@ public class BsSgcjsjdBuiProInfoController extends BaseController @ApiOperation("项目基本信息管理列表") public IPage list(@RequestBody SearchParam sp) { - IPage specialProjectInfoIPage = bsSgcjsjdBuiProInfoService.selectPage1(sp); - return specialProjectInfoIPage; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java index dc260c93..8e1eaa78 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java @@ -1,7 +1,9 @@ package com.kms.build.domain; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.build.domain.dto.LatitudeLongitude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -252,4 +254,10 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity private String bindStatus; + private String pointLatitudeLongitudeList; + + private String lineLatitudeLongitudeList; + + private String allLatitudeLongitudeList; + } diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml index 1291cde5..e4932f07 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml @@ -41,6 +41,7 @@ FROM sys_user_pro + 1 = 1 AND user_id=#{userId}) @@ -55,6 +56,7 @@ order by pi.${orderBy} desc + 1 = 1 and project_name like concat('%',#{projectName},'%')