huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-08-05 09:34:28 +08:00
parent 348af9207f
commit 9a83966d1d
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java
View File

@ -165,18 +165,18 @@ public class PointController {
private Point updatePoints(Point point, Area area, Dept dept, Map<String, Object> record) { private Point updatePoints(Point point, Area area, Dept dept, Map<String, Object> record) {
point.setArea(area); point.setArea(area);
point.setDept(dept); point.setDept(dept);
point.setDescription(record.get("存储类型") == null ? "" : record.get("存储类型").toString().trim());
String types = record.get("类型").toString().trim(); String types = record.get("类型").toString().trim();
String lx = ""; String lx = null;
if (types.equals("缓存点")) { if ("缓存点".equals(types)) {
lx = BaseStatus.STORAGE; lx = BaseStatus.STORAGE;
} else if (types.equals("线边点位")) { } else if ("线边点位".equals(types)) {
lx = BaseStatus.BOX; lx = BaseStatus.BOX;
} }
point.setType(lx); point.setType(lx);
point.setPosX(record.get("坐标X") == null ? 0 : Double.parseDouble(record.get("坐标X").toString())); point.setPosX(record.get("排") == null ? 0 : Double.parseDouble(record.get("排").toString()));
point.setPosY(record.get("坐标Y") == null ? 0 : Double.parseDouble(record.get("坐标Y").toString())); point.setPosY(record.get("列") == null ? 0 : Double.parseDouble(record.get("列").toString()));
point.setPosZ(record.get("层") == null ? 0 : Double.parseDouble(record.get("层").toString()));
return point; return point;
} }
@ -186,18 +186,18 @@ public class PointController {
point.setName(record.get("编码").toString().trim()); point.setName(record.get("编码").toString().trim());
point.setArea(area); point.setArea(area);
point.setDept(dept); point.setDept(dept);
point.setDescription(record.get("存储类型") == null ? "" : record.get("存储类型").toString().trim());
String types = record.get("类型").toString().trim(); String types = record.get("类型").toString().trim();
String lx = ""; String lx = null;
if (types.equals("缓存点")) { if ("缓存点".equals(types)) {
lx = BaseStatus.STORAGE; lx = BaseStatus.STORAGE;
} else if (types.equals("线边点位")) { } else if ("线边点位".equals(types)) {
lx = BaseStatus.BOX; lx = BaseStatus.BOX;
} }
point.setType(lx); point.setType(lx);
point.setPosX(record.get("坐标X") == null ? 0 : Double.parseDouble(record.get("坐标X").toString())); point.setPosX(record.get("排") == null ? 0 : Double.parseDouble(record.get("排").toString()));
point.setPosY(record.get("坐标Y") == null ? 0 : Double.parseDouble(record.get("坐标Y").toString())); point.setPosY(record.get("列") == null ? 0 : Double.parseDouble(record.get("列").toString()));
point.setPosZ(record.get("层") == null ? 0 : Double.parseDouble(record.get("层").toString()));
point.setEnabled(true); point.setEnabled(true);
point.setStatus(BaseStatus.FREE); point.setStatus(BaseStatus.FREE);
return point; return point;

12
youchain-system/src/main/resources/config/application.yml
View File

@ -6,8 +6,8 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
#active: prod active: prod
active: dev #active: dev
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:
@ -36,11 +36,11 @@ spring:
redis: redis:
#数据库索引 #数据库索引
database: ${REDIS_DB:2} database: ${REDIS_DB:2}
#host: ${REDIS_HOST:192.168.100.102} host: ${REDIS_HOST:192.168.100.102}
#password: ${REDIS_PWD:123456} password: ${REDIS_PWD:123456}
host: ${REDIS_HOST:localhost} #host: ${REDIS_HOST:localhost}
password: ${REDIS_PWD:} #password: ${REDIS_PWD:}
port: ${REDIS_PORT:6379} port: ${REDIS_PORT:6379}
#连接超时时间 #连接超时时间
timeout: 5000 timeout: 5000