diff --git a/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java b/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java index bbc938f..0fc297c 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java @@ -165,18 +165,18 @@ public class PointController { private Point updatePoints(Point point, Area area, Dept dept, Map record) { point.setArea(area); point.setDept(dept); - point.setDescription(record.get("存储类型") == null ? "" : record.get("存储类型").toString().trim()); String types = record.get("类型").toString().trim(); - String lx = ""; - if (types.equals("缓存点")) { + String lx = null; + if ("缓存点".equals(types)) { lx = BaseStatus.STORAGE; - } else if (types.equals("线边点位")) { + } else if ("线边点位".equals(types)) { lx = BaseStatus.BOX; } point.setType(lx); - point.setPosX(record.get("坐标X") == null ? 0 : Double.parseDouble(record.get("坐标X").toString())); - point.setPosY(record.get("坐标Y") == null ? 0 : Double.parseDouble(record.get("坐标Y").toString())); + point.setPosX(record.get("排") == null ? 0 : Double.parseDouble(record.get("排").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; } @@ -186,18 +186,18 @@ public class PointController { point.setName(record.get("编码").toString().trim()); point.setArea(area); point.setDept(dept); - point.setDescription(record.get("存储类型") == null ? "" : record.get("存储类型").toString().trim()); String types = record.get("类型").toString().trim(); - String lx = ""; - if (types.equals("缓存点")) { + String lx = null; + if ("缓存点".equals(types)) { lx = BaseStatus.STORAGE; - } else if (types.equals("线边点位")) { + } else if ("线边点位".equals(types)) { lx = BaseStatus.BOX; } point.setType(lx); - point.setPosX(record.get("坐标X") == null ? 0 : Double.parseDouble(record.get("坐标X").toString())); - point.setPosY(record.get("坐标Y") == null ? 0 : Double.parseDouble(record.get("坐标Y").toString())); + point.setPosX(record.get("排") == null ? 0 : Double.parseDouble(record.get("排").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.setStatus(BaseStatus.FREE); return point; diff --git a/youchain-system/src/main/resources/config/application.yml b/youchain-system/src/main/resources/config/application.yml index aee462d..b97f608 100644 --- a/youchain-system/src/main/resources/config/application.yml +++ b/youchain-system/src/main/resources/config/application.yml @@ -6,8 +6,8 @@ spring: freemarker: check-template-location: false profiles: - #active: prod - active: dev + active: prod + #active: dev jackson: time-zone: GMT+8 data: @@ -36,11 +36,11 @@ spring: redis: #数据库索引 database: ${REDIS_DB:2} - #host: ${REDIS_HOST:192.168.100.102} - #password: ${REDIS_PWD:123456} + host: ${REDIS_HOST:192.168.100.102} + password: ${REDIS_PWD:123456} - host: ${REDIS_HOST:localhost} - password: ${REDIS_PWD:} + #host: ${REDIS_HOST:localhost} + #password: ${REDIS_PWD:} port: ${REDIS_PORT:6379} #连接超时时间 timeout: 5000