经纬度

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<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
     {
         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<SingleMenu> singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class);
 //        List<SingleMenu> singleAllMenus = new ArrayList<>();

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<BsSgcjsjdBuiProInfo> sp)
     {
-
         IPage<BsSgcjsjdBuiProInfo> specialProjectInfoIPage = bsSgcjsjdBuiProInfoService.selectPage1(sp);
-
         return specialProjectInfoIPage;
 
     }

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;
+
 }

jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml

@@ -41,6 +41,7 @@
             FROM
             sys_user_pro
             <where>
+                1 = 1
                 <if test="userId!=null and userId!=''">
                     AND user_id=#{userId})
                 </if>
@@ -55,6 +56,7 @@
             order by pi.${orderBy} desc
         </if>
         <if test="userType==00">
+            1 = 1
             <where>
                 <if test="projectName!=null and projectName!=''">
                     and project_name like concat('%',#{projectName},'%')