diff --git a/pom.xml b/pom.xml
index c95faee..38db8bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,18 @@
5.9.0
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java
index a9d80d3..8d55db9 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java
@@ -9,6 +9,7 @@ import com.shxy.xymanager_common.model.DyLineTreeListModel;
import com.shxy.xymanager_common.model.DyListModel;
import com.shxy.xymanager_common.model.TerminalPhotosModel;
import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
+import com.shxy.xymanager_common.vo.DyListVo;
import com.shxy.xymanager_common.vo.LastTowerVo;
import com.shxy.xymanager_service.service.DyLevelService;
import io.swagger.annotations.Api;
@@ -19,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,9 +52,9 @@ public class DyLevelController extends BaseController {
@ApiOperation(value = "郑州测试获取电压等级树状列表接口", notes = "郑州测试获取电压等级树状列表接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getzzdyTreeList")
- @Log(title = "获取电压等级树状列表接口", type = "查询")
- public ResponseReult getzzdyTreeList(@Param("type") Integer type,@Param("lineid") Integer lineid) {
- ServiceBody serviceBody = dyLevelService.getdyTreeList(type,lineid);
+ @Log(title = "郑州测试获取电压等级树状列表接口", type = "查询")
+ public ResponseReult getzzdyTreeList(@RequestBody @Validated DyListVo vo) {
+ ServiceBody serviceBody = dyLevelService.getzzdyTreeList(vo.getType(),vo.getLineid());
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
@@ -60,6 +62,19 @@ public class DyLevelController extends BaseController {
}
}
+// @ApiOperation(value = "郑州测试获取电压等级树状列表接口", notes = "郑州测试获取电压等级树状列表接口", httpMethod = "POST")
+// @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+// @RequestMapping("/getzzdyTreeList")
+// @Log(title = "获取电压等级树状列表接口", type = "查询")
+// public ResponseReult getzzdyTreeList(@Param("type") Integer type,@Param("lineid") Integer lineid) {
+// ServiceBody serviceBody = dyLevelService.getdyTreeList(type,lineid);
+// if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+// return ResponseReult.success(serviceBody.getData());
+// } else {
+// return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+// }
+// }
+
@ApiOperation(value = "获取电压等级列表", notes = "获取电压等级列表", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getdyList")
diff --git a/xymanager_common/pom.xml b/xymanager_common/pom.xml
index 98e772f..4e3d63b 100644
--- a/xymanager_common/pom.xml
+++ b/xymanager_common/pom.xml
@@ -133,6 +133,17 @@
easyexcel
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ThirdUser.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ThirdUser.java
new file mode 100644
index 0000000..31c1f18
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ThirdUser.java
@@ -0,0 +1,48 @@
+//package com.shxy.xymanager_common.entity;
+//
+//import java.io.Serializable;
+//import java.util.Date;
+//
+//public class ThirdUser implements Serializable {
+// private Integer name;
+//
+// private String password;
+//
+// private Date tokenEffectTime;
+//
+// private String token;
+//
+// private static final long serialVersionUID = 1L;
+//
+// public Integer getName() {
+// return name;
+// }
+//
+// public void setName(Integer name) {
+// this.name = name;
+// }
+//
+// public String getPassword() {
+// return password;
+// }
+//
+// public void setPassword(String password) {
+// this.password = password == null ? null : password.trim();
+// }
+//
+// public Date getTokenEffectTime() {
+// return tokenEffectTime;
+// }
+//
+// public void setTokenEffectTime(Date tokenEffectTime) {
+// this.tokenEffectTime = tokenEffectTime;
+// }
+//
+// public String getToken() {
+// return token;
+// }
+//
+// public void setToken(String token) {
+// this.token = token == null ? null : token.trim();
+// }
+//}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/http/HttpStatus.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/http/HttpStatus.java
index ff0fc3d..1082578 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/http/HttpStatus.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/http/HttpStatus.java
@@ -39,6 +39,11 @@ public class HttpStatus {
public static final int HTTP_GATEWAY_TIMEOUT = 504;
public static final int HTTP_VERSION = 505;
+
+ public static final String HTTP_OK_Str = "200";
+ public static final String TOKEN = "token";
+ public static final String CODE = "code";
+
public HttpStatus() {
}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/http/OkHttpUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/http/OkHttpUtils.java
new file mode 100644
index 0000000..7377ca8
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/http/OkHttpUtils.java
@@ -0,0 +1,70 @@
+//package com.shxy.xymanager_common.util.http;
+//import com.alibaba.fastjson.JSONObject;
+//import io.github.admin4j.http.HttpRequest;
+//import io.github.admin4j.http.core.Pair;
+//import io.github.admin4j.http.util.HttpUtil;
+//import okhttp3.Response;
+//
+//import java.io.File;
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+//public class OkHttpUtils {
+//
+// public static JSONObject get(String url, Map queryParams) throws IOException {
+// Response response = HttpUtil.get(url, queryParams);
+// return JSONObject.parseObject(response.body().string());
+// }
+//
+// public static JSONObject get(String url, Map queryParams, Map headers) throws IOException {
+// HttpRequest httpRequest = HttpRequest.get(url);
+// setParams(queryParams, httpRequest);
+// Response response = httpRequest.queryParams().headers(headers).execute();
+// return JSONObject.parseObject(response.body().string());
+// }
+//
+// public static JSONObject post(String url, String json) throws IOException {
+// Response response = HttpUtil.post(url, json);
+// assert response.body() != null;
+// return JSONObject.parseObject(response.body().string());
+// }
+//
+// public static JSONObject postForm(String url, Map formParams) throws IOException {
+// Response response = HttpUtil.postForm(url, formParams);
+// assert response.body() != null;
+// return JSONObject.parseObject(response.body().string());
+// }
+//
+// public static JSONObject post(String url, String json, Map headers) throws IOException {
+// HttpRequest httpRequest = HttpRequest.post(url);
+// httpRequest.setBody(json);
+// Response response = httpRequest.headers(headers).execute();
+// return JSONObject.parseObject(response.body().string());
+// }
+//
+// private static void setParams(Map queryParams, HttpRequest httpRequest) {
+// List pairs = new ArrayList<>(queryParams.size());
+// queryParams.forEach((x, y) -> pairs.add(Pair.of(x, y)));
+// if (pairs.size() > 0) {
+// pairs.forEach(httpRequest::queryParams);
+// }
+// }
+//
+// private static JSONObject upload() throws IOException {
+// File file = new File("C:\\Users\\andanyang\\Downloads\\Sql.txt");
+// Map formParams = new HashMap<>();
+// formParams.put("key", "test");
+// formParams.put("file", file);
+// formParams.put("token", "WXyUseb-D4sCum-EvTIDYL-mEehwDtrSBg-Zca7t:qgOcR2gUoKmxt-VnsNb657Oatzo=:eyJzY29wZSI6InpoYW56aGkiLCJkZWFkbGluZSI6MTY2NTMwNzUxNH0=");
+// Response response = HttpUtil.upload("https://upload.qiniup.com/", formParams);
+// return JSONObject.parseObject(response.body().string());
+// }
+//
+// private static void download() throws IOException {
+// HttpUtil.down("https://gitee.com/admin4j/common-http","path/");
+// }
+//
+//}
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/DyListVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/DyListVo.java
new file mode 100644
index 0000000..c0f22e3
--- /dev/null
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/DyListVo.java
@@ -0,0 +1,21 @@
+package com.shxy.xymanager_common.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+@ApiModel(value = "查询列表对象", description = "查询列表对象")
+public class DyListVo {
+
+
+ @ApiModelProperty(value = "是否收藏", example = "0--删除收藏 1--收藏")
+ private Integer type;
+
+ @ApiModelProperty(value = "查询列表对象数组", required = true)
+ private List lineid;
+
+}
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java
index 25308ef..b8c5ea9 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java
@@ -15,8 +15,6 @@ public interface DyLevelDao {
List selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("status") Integer status);
- int deleteByPrimaryKey(Integer id);
-
int insert(DyLevel record);
int insertSelective(DyLevel record);
@@ -27,6 +25,8 @@ public interface DyLevelDao {
List selectTreeList( @Param("status") Integer status,@Param("lineid") Integer lineid);
+ List selectListTreeList( @Param("status") Integer status,@Param("list") List list);
+
List selectTreeListByChannelId(@Param("channelid") Integer channelid, @Param("status") Integer status);
int updateByPrimaryKeySelective(DyLevel record);
diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml
index 213e6e6..de9b98e 100644
--- a/xymanager_dao/src/main/resources/generatorConfig.xml
+++ b/xymanager_dao/src/main/resources/generatorConfig.xml
@@ -5,7 +5,7 @@
+ location="D:\WorkTool\IntellijIdea\maven_repository\mysql\mysql-connector-java\8.0.27\mysql-connector-java-8.0.27.jar"/>
@@ -35,7 +35,7 @@
也可以使用“MAVEN”来自动生成，这样生成的代码会在target/generatord-source目录下
-->
+ targetProject="D:/Project/JAVAProject/xympbackend/xymanager_common/src/main/java">
@@ -285,5 +285,16 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml
index b058413..ce3a224 100644
--- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml
@@ -212,6 +212,42 @@
+
+