|
@@ -1,13 +1,18 @@
|
|
|
package com.huimv.eartag2.manage2.controller;
|
|
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.huimv.eartag2.common.utils.Result;
|
|
|
import com.huimv.eartag2.manage2.service.BasePigpenService;
|
|
|
+import net.bytebuddy.utility.RandomString;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.Map;
|
|
|
+import java.util.concurrent.ThreadLocalRandom;
|
|
|
+
|
|
|
+import static java.util.concurrent.ThreadLocalRandom.*;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -62,14 +67,15 @@ public class BasePigpenController {
|
|
|
String buildingName = paramsMap.get("buildingName")+"";
|
|
|
|
|
|
// 栋编码
|
|
|
- String buildingCode = paramsMap.get("buildingCode")+"";
|
|
|
+// String buildingCode = paramsMap.get("buildingCode")+"";
|
|
|
+ String buildingCode = System.currentTimeMillis()+"" ;
|
|
|
// 阶段
|
|
|
String stageCode = paramsMap.get("stageCode")+"";
|
|
|
// 排序
|
|
|
String sort = paramsMap.get("sort")+"";
|
|
|
-// if(sort == null){
|
|
|
-// sort = "1";
|
|
|
-// }
|
|
|
+ if(StringUtils.isBlank(sort)){
|
|
|
+ sort = "1";
|
|
|
+ }
|
|
|
// 类型
|
|
|
Integer type = 1;
|
|
|
//
|
|
@@ -83,18 +89,18 @@ public class BasePigpenController {
|
|
|
// 栋名称
|
|
|
String buildingName = paramsMap.get("buildingName")+"";
|
|
|
// 栋编码
|
|
|
- String buildingCode = paramsMap.get("buildingCode")+"";
|
|
|
+// String buildingCode = paramsMap.get("buildingCode")+"";
|
|
|
// 阶段
|
|
|
String stageCode = paramsMap.get("stageCode")+"";
|
|
|
// 排序
|
|
|
String sort = paramsMap.get("sort")+"";
|
|
|
- if(sort == null){
|
|
|
+ if(StringUtils.isBlank(sort)){
|
|
|
sort = "1";
|
|
|
}
|
|
|
// 类型
|
|
|
Integer type = 1;
|
|
|
//
|
|
|
- return basePigpenService.editBuilding(id,buildingName,buildingCode,stageCode,Integer.parseInt(sort),type);
|
|
|
+ return basePigpenService.editBuilding(id,buildingName,stageCode,Integer.parseInt(sort),type);
|
|
|
}
|
|
|
|
|
|
// 删除栋舍
|
|
@@ -112,14 +118,15 @@ public class BasePigpenController {
|
|
|
// 栋
|
|
|
String parentId = paramsMap.get("parentId")+"";
|
|
|
// 单元
|
|
|
- String unitCode = paramsMap.get("unitCode")+"";
|
|
|
+// String unitCode = paramsMap.get("unitCode")+"";
|
|
|
+ String unitCode = System.currentTimeMillis()+"" ;
|
|
|
// 单元
|
|
|
String unitName = paramsMap.get("unitName")+"";
|
|
|
// 阶段
|
|
|
String stageCode = paramsMap.get("stageCode")+"";
|
|
|
// 排序
|
|
|
String sort = paramsMap.get("sort")+"";
|
|
|
- if(sort == null){
|
|
|
+ if(StringUtils.isBlank(sort)){
|
|
|
sort = "1";
|
|
|
}
|
|
|
// 类型
|
|
@@ -135,20 +142,20 @@ public class BasePigpenController {
|
|
|
// 栋
|
|
|
String parentId = paramsMap.get("parentId")+"";
|
|
|
// 单元
|
|
|
- String unitCode = paramsMap.get("unitCode")+"";
|
|
|
+// String unitCode = paramsMap.get("unitCode")+"";
|
|
|
// 单元
|
|
|
String unitName = paramsMap.get("unitName")+"";
|
|
|
// 阶段
|
|
|
String stageCode = paramsMap.get("stageCode")+"";
|
|
|
// 排序
|
|
|
String sort = paramsMap.get("sort")+"";
|
|
|
- if(sort == null){
|
|
|
+ if(StringUtils.isBlank(sort)){
|
|
|
sort = "1";
|
|
|
}
|
|
|
// 类型
|
|
|
Integer type = 2;
|
|
|
//
|
|
|
- return basePigpenService.editUnit(id,parentId,unitName,unitCode,stageCode,Integer.parseInt(sort),type);
|
|
|
+ return basePigpenService.editUnit(id,parentId,unitName,stageCode,Integer.parseInt(sort),type);
|
|
|
}
|
|
|
|
|
|
|