diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index ecd3266..21d2394 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -179,10 +179,6 @@ public class BabyModel extends BaseModel { this.week = week; } - public void setYn(Integer yn) { - this.yn = yn; - } - /** * 生日 */ @@ -212,7 +208,7 @@ public class BabyModel extends BaseModel { private Date mbirth; // 助产结构名称 private String org; - private int week; + private Integer week; private String cardNo; @@ -235,12 +231,12 @@ public class BabyModel extends BaseModel { /** * 性别 */ - private int sex; + private Integer sex; /** * 访视状态 */ - private int visitstatus=-1; + private Integer visitstatus=-1; /** * 小孩名称 */ @@ -249,11 +245,11 @@ public class BabyModel extends BaseModel { private Integer yn; - public int getYn() { + public Integer getYn() { return yn; } - public void setYn(int yn) { + public void setYn(Integer yn) { this.yn = yn; } @@ -290,19 +286,19 @@ public class BabyModel extends BaseModel { this.birth = birth; } - public int getSex() { + public Integer getSex() { return sex; } - public void setSex(int sex) { + public void setSex(Integer sex) { this.sex = sex; } - public int getVisitstatus() { + public Integer getVisitstatus() { return visitstatus; } - public void setVisitstatus(int visitstatus) { + public void setVisitstatus(Integer visitstatus) { this.visitstatus = visitstatus; } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java index 63735e1..05aa17e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java @@ -114,7 +114,7 @@ public class BabyVisitModel extends BaseModel { private String deformity; // 听力情况 - private int hearing; + private Integer hearing; // 疾病筛查 private String disease; @@ -129,22 +129,22 @@ public class BabyVisitModel extends BaseModel { private double height; // 喂养方式 - private int feedType; + private Integer feedType; // 吃奶量 - private int eatMilk; + private Integer eatMilk; // 吃奶次数 - private int eatTime; + private Integer eatTime; // 呕吐 - private int emesis; + private Integer emesis; // 大便 private String shit; // 大便次数 - private int shitTimes; + private Integer shitTimes; // 体温 private double temperature; @@ -250,11 +250,11 @@ public class BabyVisitModel extends BaseModel { this.deformity = deformity; } - public int getHearing() { + public Integer getHearing() { return hearing; } - public void setHearing(int hearing) { + public void setHearing(Integer hearing) { this.hearing = hearing; } @@ -290,35 +290,35 @@ public class BabyVisitModel extends BaseModel { this.height = height; } - public int getFeedType() { + public Integer getFeedType() { return feedType; } - public void setFeedType(int feedType) { + public void setFeedType(Integer feedType) { this.feedType = feedType; } - public int getEatMilk() { + public Integer getEatMilk() { return eatMilk; } - public void setEatMilk(int eatMilk) { + public void setEatMilk(Integer eatMilk) { this.eatMilk = eatMilk; } - public int getEatTime() { + public Integer getEatTime() { return eatTime; } - public void setEatTime(int eatTime) { + public void setEatTime(Integer eatTime) { this.eatTime = eatTime; } - public int getEmesis() { + public Integer getEmesis() { return emesis; } - public void setEmesis(int emesis) { + public void setEmesis(Integer emesis) { this.emesis = emesis; } @@ -330,11 +330,11 @@ public class BabyVisitModel extends BaseModel { this.shit = shit; } - public int getShitTimes() { + public Integer getShitTimes() { return shitTimes; } - public void setShitTimes(int shitTimes) { + public void setShitTimes(Integer shitTimes) { this.shitTimes = shitTimes; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java index 1a1e69d..241449c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java @@ -24,7 +24,7 @@ public class BasicConfig extends BaseModel { private String name; - private int enable; + private Integer enable; private String typeId; @@ -36,11 +36,11 @@ public class BasicConfig extends BaseModel { this.typeId = typeId; } - public int getEnable() { + public Integer getEnable() { return enable; } - public void setEnable(int enable) { + public void setEnable(Integer enable) { this.enable = enable; } @@ -52,7 +52,7 @@ public class BasicConfig extends BaseModel { this.name = name; } - private int yn; + private Integer yn; public String getId() { return id; @@ -78,11 +78,11 @@ public class BasicConfig extends BaseModel { this.code = code; } - public int getYn() { + public Integer getYn() { return yn; } - public void setYn(int yn) { + public void setYn(Integer yn) { this.yn = yn; } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DataPermissionsModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DataPermissionsModel.java index 3389bfc..8920855 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DataPermissionsModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DataPermissionsModel.java @@ -57,13 +57,13 @@ public class DataPermissionsModel extends BaseModel { public static class SimplePermission { //1 自己 2 自己科室 3 全部科室 4 - private int type=PermissionTypeEnums.ONLY_SELF.getId(); + private Integer type=PermissionTypeEnums.ONLY_SELF.getId(); - public int getType() { + public Integer getType() { return type; } - public void setType(int type) { + public void setType(Integer type) { this.type = type; } private List deptid; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 792e831..6a8c200 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -396,11 +396,11 @@ public class Patients extends BaseModel { this.dueType = dueType; } - public int getIsVisit() { + public Integer getIsVisit() { return isVisit; } - public void setIsVisit(int isVisit) { + public void setIsVisit(Integer isVisit) { this.isVisit = isVisit; } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PuerperaModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PuerperaModel.java index 47c41d8..038eb39 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PuerperaModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PuerperaModel.java @@ -47,7 +47,7 @@ public class PuerperaModel extends BaseModel { /** * 产妇年龄 */ - private int age; + private Integer age; /** * 产妇手机号 */ @@ -68,11 +68,11 @@ public class PuerperaModel extends BaseModel { /** * 是否访视 */ - private int isVisit; + private Integer isVisit; /** * 是否有效 */ - private int yn; + private Integer yn; public String getCardNo() { return cardNo; @@ -92,10 +92,10 @@ public class PuerperaModel extends BaseModel { public void setDueType(String dueType) { this.dueType = dueType; } - public int getIsVisit() { + public Integer getIsVisit() { return isVisit; } - public void setIsVisit(int isVisit) { + public void setIsVisit(Integer isVisit) { this.isVisit = isVisit; } public String getId() { @@ -104,10 +104,10 @@ public class PuerperaModel extends BaseModel { public void setId(String id) { this.id = id; } - public int getYn() { + public Integer getYn() { return yn; } - public void setYn(int yn) { + public void setYn(Integer yn) { this.yn = yn; } public String getName() { @@ -116,10 +116,10 @@ public class PuerperaModel extends BaseModel { public void setName(String name) { this.name = name; } - public int getAge() { + public Integer getAge() { return age; } - public void setAge(int age) { + public void setAge(Integer age) { this.age = age; } public String getPhone() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/VisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/VisitModel.java index 960b13a..a52ee2f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/VisitModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/VisitModel.java @@ -35,11 +35,11 @@ public class VisitModel extends BaseModel { /** * 住院分娩 */ - private int due; + private Integer due; /** * 心法接生 */ - private int xinType; + private Integer xinType; /** * 乳房 @@ -261,19 +261,19 @@ public class VisitModel extends BaseModel { this.wound = wound; } - public int getDue() { + public Integer getDue() { return due; } - public void setDue(int due) { + public void setDue(Integer due) { this.due = due; } - public int getXinType() { + public Integer getXinType() { return xinType; } - public void setXinType(int xinType) { + public void setXinType(Integer xinType) { this.xinType = xinType; } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java index 482bbcf..c1dd003 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java @@ -1,12 +1,22 @@ package com.lyms.platform.data.controller; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.data.service.DataImportTaskService; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.query.BasicConfigQuery; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Created by riecard on 15/10/26. @@ -18,6 +28,9 @@ public class TaskController extends BaseController { @Autowired private DataImportTaskService dataImportTaskService; + @Autowired + private BasicConfigService basicConfigService; + @RequestMapping(value = "/index") public ModelAndView index() { @@ -45,6 +58,40 @@ public class TaskController extends BaseController { } else if ("fullUpdateUsers".equals(sid)) { dataImportTaskService.fullUpdateUsers(); writeString(response, "success"); + } else if ("codeinit".equals(sid)) { + try { + List list = FileUtils.readLines(new File("d:/streets.csv")); + Map codeMap = new HashMap<>(); + for (String line:list) { + line = line.replace("\"", ""); + String[] array = line.split(","); + if (array.length >= 3 && StringUtils.isNotBlank(array[1]) && StringUtils.isNotBlank(array[2])) { + codeMap.put(array[2], array[1]); + } + if (array.length >= 5 && StringUtils.isNotBlank(array[3]) && StringUtils.isNotBlank(array[4])) { + codeMap.put(array[4], array[3]); + } + if (array.length >= 7 && StringUtils.isNotBlank(array[5]) && StringUtils.isNotBlank(array[6])) { + codeMap.put(array[6], array[5]); + } + if (array.length >= 11 && StringUtils.isNotBlank(array[9]) && StringUtils.isNotBlank(array[10])) { + codeMap.put(array[10], array[9]); + } + } + List configList = basicConfigService.queryBasicConfig(new BasicConfigQuery()); + BasicConfig u = new BasicConfig(); + for (BasicConfig config:configList) { + String code = codeMap.get(config.getName()); + if (StringUtils.isNotBlank(code)) { + u.setId(config.getId()); + u.setCode(code); + basicConfigService.updateBasicConfig(u); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + writeString(response, "success"); } else { @@ -53,6 +100,10 @@ public class TaskController extends BaseController { } + public static void main(String[] args) { + + } + } diff --git a/platform-data-api/src/main/webapp/WEB-INF/vm/task/index.vm b/platform-data-api/src/main/webapp/WEB-INF/vm/task/index.vm index 60a95ae..0af4af1 100644 --- a/platform-data-api/src/main/webapp/WEB-INF/vm/task/index.vm +++ b/platform-data-api/src/main/webapp/WEB-INF/vm/task/index.vm @@ -33,6 +33,14 @@ + + 初始化省市区乡镇code + + 无 + + + +