From d2a436897e8e01c0da56daac413732367938a920 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 17 Mar 2021 11:48:42 +0800 Subject: [PATCH 1/6] 202103 --- .../beneficiation/api/DebugController.java | 2 +- .../beneficiation/bean/vo/ParameterVo.java | 5 +++++ .../service/ParameterService.java | 22 +++++++++++++++---- .../src/main/resources/application.yml | 4 ++-- .../resources/application-greenvalley.yml | 5 +++-- tall/src/main/resources/application.yml | 4 ++-- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java b/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java index 23148be1..45bd13a0 100644 --- a/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java @@ -23,7 +23,7 @@ public class DebugController { @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) public JsonResponse debug(HttpServletRequest request) throws Exception { - return JsonResponse.newInstance().ok("测试"); + return JsonResponse.newInstance().ok("测aaaaaa11"); } diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java index 2675ffa6..0974712e 100644 --- a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java @@ -154,6 +154,11 @@ public class ParameterVo { this.maxValue = maxValue; } + public ThresholdValue(String type, String key) { + this.type = type; + this.key = key; + } + public ThresholdValue() { } } diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java b/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java index 7c1cf23d..2a2daab9 100644 --- a/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java @@ -71,7 +71,7 @@ public class ParameterService implements IParameterService{ }); } parameterInfo.setTransducers(transducers); - //查询变频器和电磁阀 + //查询电耳 List parameters = recordDao.queryParameter(); if(CollectionUtil.isNotEmpty(parameters)){ parameters.forEach(parameter -> { @@ -82,11 +82,25 @@ public class ParameterService implements IParameterService{ value.setKey("实时" + a); value.setType("thresholdValue" + a); //查询设备的阀值1 - value.setThresholdValue1(recordDao.getThresholdValue(value.getId(),1)); + ParameterVo.ThresholdValue thresholdValue1 = recordDao.getThresholdValue(value.getId(), 1); + if(ObjectUtil.isNull(thresholdValue1)){ + thresholdValue1 = new ParameterVo.ThresholdValue("thresholdValue1","阀值1"); + } + value.setThresholdValue1(thresholdValue1); + //阀值2 - value.setThresholdValue2(recordDao.getThresholdValue(value.getId(),2)); + ParameterVo.ThresholdValue thresholdValue2 = recordDao.getThresholdValue(value.getId(), 1); + if(ObjectUtil.isNull(thresholdValue2)){ + thresholdValue2 = new ParameterVo.ThresholdValue("thresholdValue2","阀值2"); + } + value.setThresholdValue2(thresholdValue2); + //阀值3 - value.setThresholdValue3(recordDao.getThresholdValue(value.getId(),3)); + ParameterVo.ThresholdValue thresholdValue3 = recordDao.getThresholdValue(value.getId(), 1); + if(ObjectUtil.isNull(thresholdValue3)){ + thresholdValue3 = new ParameterVo.ThresholdValue("thresholdValue3","阀值3"); + } + value.setThresholdValue3(thresholdValue3); i++; } } diff --git a/beneficiation/src/main/resources/application.yml b/beneficiation/src/main/resources/application.yml index ac92adb9..a47f2a7b 100644 --- a/beneficiation/src/main/resources/application.yml +++ b/beneficiation/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/tall/src/main/resources/application-greenvalley.yml b/tall/src/main/resources/application-greenvalley.yml index fa815963..aea6965e 100644 --- a/tall/src/main/resources/application-greenvalley.yml +++ b/tall/src/main/resources/application-greenvalley.yml @@ -12,9 +12,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: host: 127.0.0.1 - password: admin + password: 111111 port: 5672 - username: 111111 + username: admin redis: database: 0 host: 127.0.0.1 @@ -34,6 +34,7 @@ eureka: ip-address: 82.156.116.247 gatewayUrl: http://82.156.116.247 /gateway/ notGatewayUrl: http://82.156.116.247 / +smsCode: 1 file: domain: http://82.156.116.247 /gateway/tall/v1.0/ imgDomain: http://82.156.116.247 /gateway/tall/v1.0/uploads \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..9e02c3e8 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: greenvalley + include: util-greenvalley,common From 5d78f54c35ae3fe4582501a5a51fc1f0f85759ba Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 18 Mar 2021 12:53:12 +0800 Subject: [PATCH 2/6] la --- .../tcm/api/ConferenceRecordsController.java | 2 +- .../com/ccsens/tcm/api/PatientController.java | 10 ++ .../com/ccsens/tcm/bean/dto/ConRecDto.java | 20 +++ .../com/ccsens/tcm/bean/dto/PatientDto.java | 10 ++ .../ccsens/tcm/bean/po/ConferenceRecords.java | 22 ++++ .../tcm/bean/po/ConferenceRecordsExample.java | 120 ++++++++++++++++++ .../bean/po/ConferenceRecordsWithBLOBs.java | 39 ------ .../tcm/bean/vo/BiologicalSamplesVo.java | 6 + .../java/com/ccsens/tcm/bean/vo/ConRecVo.java | 7 + .../com/ccsens/tcm/bean/vo/PatientVo.java | 3 + .../ccsens/tcm/service/ConferenceService.java | 4 +- .../tcm/service/IConferenceService.java | 2 +- .../ccsens/tcm/service/IPatientService.java | 2 + .../ccsens/tcm/service/PatientService.java | 11 ++ .../main/resources/mapper_dao/PatientDao.xml | 9 +- .../mapper_raw/ConferenceRecordsMapper.xml | 66 +++++++--- 16 files changed, 269 insertions(+), 64 deletions(-) delete mode 100644 tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsWithBLOBs.java diff --git a/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java b/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java index 59cb41c7..0928237b 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java @@ -71,7 +71,7 @@ public class ConferenceRecordsController { @MustLogin @ApiOperation(value = "查看会议记录", notes = "zy:") @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse getConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + public JsonResponse getConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("统计每个医院的完成情况：{}",params); ConRecVo.SelConRecVo selConRecVo = conferenceService.getConference(params.getParam()); log.info("查找每个医院的病例完成情况"); diff --git a/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java b/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java index f865fab8..46fe5b40 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java @@ -41,6 +41,16 @@ public class PatientController { log.info("添加患者基本信息成功"); return JsonResponse.newInstance().ok(); } + + @MustLogin + @ApiOperation(value = "修改患者的完成状态", notes = "w:修改患者的完成状态") + @RequestMapping(value = "/upPatientMes", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse upPatientMes(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("修改患者基本信息：{}",params); + patientService.upPatientMes(params.getParam(),params.getUserId()); + log.info("修改患者基本信息成功"); + return JsonResponse.newInstance().ok(); + } @MustLogin @ApiOperation(value = "查询患者基本信息", notes = "w:查询患者基本信息") @RequestMapping(value = "/selPatientMes", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java index ccf5741e..8fcc3ee7 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java @@ -48,6 +48,14 @@ public class ConRecDto { @NotNull(message = "任务id不能为空") @ApiModelProperty("任务id") private Long taskId; + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务开始时间") + private Date taskStartTime; + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务结束时间") + private Date taskEndTimek; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("开始时间") private Date startTime; @@ -78,4 +86,16 @@ public class ConRecDto { @ApiModelProperty("任务id") private Long taskId; } + @Data + @ApiModel("查看会议记录dto") + public class GetConference { + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务开始时间") + private Date taskStartTime; + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务结束时间") + private Date taskEndTimek; + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java index 1451ba1d..e530909d 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java @@ -147,4 +147,14 @@ public class PatientDto { @ApiModelProperty("结束时间，必须填") private String endTime=""; } + @Data + @ApiModel("修改病人的状态") + public static class UpPatient { + @NotNull + @ApiModelProperty("病人id") + private Long id; + @NotNull + @ApiModelProperty("录入状态：0：新建 1：数据搜集中 2数据搜集完成 3数据搜集超时 4：废弃") + private Byte inputStatus; + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java index bb5adf4e..437d1e41 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java @@ -8,6 +8,10 @@ public class ConferenceRecords implements Serializable { private Long taskId; + private Date taskStartTime; + + private Date taskEndTime; + private Date startTime; private Date endTime; @@ -48,6 +52,22 @@ public class ConferenceRecords implements Serializable { this.taskId = taskId; } + public Date getTaskStartTime() { + return taskStartTime; + } + + public void setTaskStartTime(Date taskStartTime) { + this.taskStartTime = taskStartTime; + } + + public Date getTaskEndTime() { + return taskEndTime; + } + + public void setTaskEndTime(Date taskEndTime) { + this.taskEndTime = taskEndTime; + } + public Date getStartTime() { return startTime; } @@ -144,6 +164,8 @@ public class ConferenceRecords implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", taskId=").append(taskId); + sb.append(", taskStartTime=").append(taskStartTime); + sb.append(", taskEndTime=").append(taskEndTime); sb.append(", startTime=").append(startTime); sb.append(", endTime=").append(endTime); sb.append(", place=").append(place); diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java index 642b351e..5a9e342f 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java @@ -225,6 +225,126 @@ public class ConferenceRecordsExample { return (Criteria) this; } + public Criteria andTaskStartTimeIsNull() { + addCriterion("task_start_time is null"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeIsNotNull() { + addCriterion("task_start_time is not null"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeEqualTo(Date value) { + addCriterion("task_start_time =", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeNotEqualTo(Date value) { + addCriterion("task_start_time <>", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeGreaterThan(Date value) { + addCriterion("task_start_time >", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeGreaterThanOrEqualTo(Date value) { + addCriterion("task_start_time >=", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeLessThan(Date value) { + addCriterion("task_start_time <", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeLessThanOrEqualTo(Date value) { + addCriterion("task_start_time <=", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeIn(List values) { + addCriterion("task_start_time in", values, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeNotIn(List values) { + addCriterion("task_start_time not in", values, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeBetween(Date value1, Date value2) { + addCriterion("task_start_time between", value1, value2, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeNotBetween(Date value1, Date value2) { + addCriterion("task_start_time not between", value1, value2, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeIsNull() { + addCriterion("task_end_time is null"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeIsNotNull() { + addCriterion("task_end_time is not null"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeEqualTo(Date value) { + addCriterion("task_end_time =", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeNotEqualTo(Date value) { + addCriterion("task_end_time <>", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeGreaterThan(Date value) { + addCriterion("task_end_time >", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeGreaterThanOrEqualTo(Date value) { + addCriterion("task_end_time >=", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeLessThan(Date value) { + addCriterion("task_end_time <", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeLessThanOrEqualTo(Date value) { + addCriterion("task_end_time <=", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeIn(List values) { + addCriterion("task_end_time in", values, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeNotIn(List values) { + addCriterion("task_end_time not in", values, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeBetween(Date value1, Date value2) { + addCriterion("task_end_time between", value1, value2, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeNotBetween(Date value1, Date value2) { + addCriterion("task_end_time not between", value1, value2, "taskEndTime"); + return (Criteria) this; + } + public Criteria andStartTimeIsNull() { addCriterion("start_time is null"); return (Criteria) this; diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsWithBLOBs.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsWithBLOBs.java deleted file mode 100644 index 69a18558..00000000 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsWithBLOBs.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ccsens.tcm.bean.po; - -import java.io.Serializable; - -public class ConferenceRecordsWithBLOBs extends ConferenceRecords implements Serializable { - private String discussionContent; - - private String meetingMinutes; - - private static final long serialVersionUID = 1L; - - public String getDiscussionContent() { - return discussionContent; - } - - public void setDiscussionContent(String discussionContent) { - this.discussionContent = discussionContent == null ? null : discussionContent.trim(); - } - - public String getMeetingMinutes() { - return meetingMinutes; - } - - public void setMeetingMinutes(String meetingMinutes) { - this.meetingMinutes = meetingMinutes == null ? null : meetingMinutes.trim(); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", discussionContent=").append(discussionContent); - sb.append(", meetingMinutes=").append(meetingMinutes); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java index ae6f88ec..9e913781 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java @@ -1,9 +1,12 @@ package com.ccsens.tcm.bean.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data public class BiologicalSamplesVo { @Data @@ -17,6 +20,9 @@ public class BiologicalSamplesVo { private Byte sampleType; @ApiModelProperty("采集时间") private Integer collectTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + private Date updateAt; } @Data @ApiModel("统计医院生物样本数量") diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java index 1ab3944e..cd027395 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -19,6 +20,12 @@ public class ConRecVo { private Long id; @ApiModelProperty("任务id") private Long taskId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务开始时间") + private Date taskStartTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务结束时间") + private Date taskEndTimek; @ApiModelProperty("会议开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java index 18fcb320..bf753325 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java @@ -33,6 +33,9 @@ public class PatientVo { private String hosName; @ApiModelProperty("搜集次数") private Integer collectionNum; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + private Date updateAt; } @Data @ApiModel("经过搜索条件查询的患者集合") diff --git a/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java b/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java index 323c180d..bf56ed49 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java @@ -60,10 +60,10 @@ public class ConferenceService implements IConferenceService{ } @Override - public ConRecVo.SelConRecVo getConference(ConRecDto.ConferenceTask param) { + public ConRecVo.SelConRecVo getConference(ConRecDto.GetConference param) { ConRecVo.SelConRecVo selConRecVo = new ConRecVo.SelConRecVo(); ConferenceRecordsExample conferenceRecordsExample = new ConferenceRecordsExample(); - conferenceRecordsExample.createCriteria().andTaskIdEqualTo(param.getTaskId()); + conferenceRecordsExample.createCriteria().andTaskStartTimeGreaterThan(param.getTaskStartTime()).andTaskEndTimeLessThan(param.getTaskEndTimek()); List conferenceRecordsList = conferenceRecordsMapper.selectByExample(conferenceRecordsExample); if(CollectionUtil.isNotEmpty(conferenceRecordsList)){ BeanUtil.copyProperties(conferenceRecordsList.get(0),selConRecVo); diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java b/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java index 9ef05d66..7ecaf59f 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java @@ -24,5 +24,5 @@ public interface IConferenceService { * @param param 任务id * @return 返回会议内容 */ - ConRecVo.SelConRecVo getConference(ConRecDto.ConferenceTask param); + ConRecVo.SelConRecVo getConference(ConRecDto.GetConference param); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java index 8ec3feb2..3239e86a 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -80,4 +80,6 @@ public interface IPatientService { List stringLists(Long testQuestionsId); List selByHosAllYBS(Long id); + + void upPatientMes(PatientDto.UpPatient param, Long userId); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java index acc0f559..12e990f1 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -419,5 +419,16 @@ public class PatientService implements IPatientService { return patientDao.selByHosAllYBS(id); } + @Override + public void upPatientMes(PatientDto.UpPatient param, Long userId) { + PatientInformationExample patientInformationExample=new PatientInformationExample(); + patientInformationExample.createCriteria().andIdEqualTo(param.getId()).andRecStatusEqualTo((byte)0); + PatientInformation patientInformation=new PatientInformation(); + patientInformation.setId(param.getId()); + patientInformation.setInputStatus(param.getInputStatus()); + patientInformation.setUserId(userId); + patientInformationMapper.updateByExampleSelective(patientInformation,patientInformationExample); + } + } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index ed90bd3e..26999425 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -46,7 +46,8 @@ tpi.hospital_id AS hospitalId, th.name as hosName, ti.name, - ti.collection_num as collectionNum + ti.collection_num as collectionNum, + tpi.update_at as updateAt FROM t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id left join t_hospital th on th.rec_status=0 and th.id=tpi.hospital_id @@ -141,6 +142,7 @@ ) t ) + order by tpi.update_at desc select @@ -109,26 +111,35 @@ - insert into t_conference_records (id, task_id, start_time, - end_time, place, host, - participants, discussion_content, meeting_minutes, - user_id, created_at, update_at, - rec_status) - values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP}, - #{endTime,jdbcType=TIMESTAMP}, #{place,jdbcType=VARCHAR}, #{host,jdbcType=VARCHAR}, - #{participants,jdbcType=VARCHAR}, #{discussionContent,jdbcType=VARCHAR}, #{meetingMinutes,jdbcType=VARCHAR}, - #{userId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updateAt,jdbcType=TIMESTAMP}, - #{recStatus,jdbcType=TINYINT}) + + SELECT LAST_INSERT_ID() + + insert into t_conference_records (task_id, task_start_time, task_end_time, + start_time, end_time, place, + host, participants, discussion_content, + meeting_minutes, user_id, created_at, + update_at, rec_status) + values (#{taskId,jdbcType=BIGINT}, #{taskStartTime,jdbcType=TIMESTAMP}, #{taskEndTime,jdbcType=TIMESTAMP}, + #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{place,jdbcType=VARCHAR}, + #{host,jdbcType=VARCHAR}, #{participants,jdbcType=VARCHAR}, #{discussionContent,jdbcType=VARCHAR}, + #{meetingMinutes,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updateAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + SELECT LAST_INSERT_ID() + insert into t_conference_records - - id, - task_id, + + task_start_time, + + + task_end_time, + start_time, @@ -164,12 +175,15 @@ - - #{id,jdbcType=BIGINT}, - #{taskId,jdbcType=BIGINT}, + + #{taskStartTime,jdbcType=TIMESTAMP}, + + + #{taskEndTime,jdbcType=TIMESTAMP}, + #{startTime,jdbcType=TIMESTAMP}, @@ -220,6 +234,12 @@ task_id = #{record.taskId,jdbcType=BIGINT}, + + task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP}, + + + task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP}, + start_time = #{record.startTime,jdbcType=TIMESTAMP}, @@ -262,6 +282,8 @@ update t_conference_records set id = #{record.id,jdbcType=BIGINT}, task_id = #{record.taskId,jdbcType=BIGINT}, + task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP}, + task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP}, start_time = #{record.startTime,jdbcType=TIMESTAMP}, end_time = #{record.endTime,jdbcType=TIMESTAMP}, place = #{record.place,jdbcType=VARCHAR}, @@ -283,6 +305,12 @@ task_id = #{taskId,jdbcType=BIGINT}, + + task_start_time = #{taskStartTime,jdbcType=TIMESTAMP}, + + + task_end_time = #{taskEndTime,jdbcType=TIMESTAMP}, + start_time = #{startTime,jdbcType=TIMESTAMP}, @@ -322,6 +350,8 @@ update t_conference_records set task_id = #{taskId,jdbcType=BIGINT}, + task_start_time = #{taskStartTime,jdbcType=TIMESTAMP}, + task_end_time = #{taskEndTime,jdbcType=TIMESTAMP}, start_time = #{startTime,jdbcType=TIMESTAMP}, end_time = #{endTime,jdbcType=TIMESTAMP}, place = #{place,jdbcType=VARCHAR}, From d8aebd00b2d5922f42528f72f718d2e6e331239c Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 18 Mar 2021 14:36:04 +0800 Subject: [PATCH 3/6] 20210318v1.0 --- .../com/ccsens/beneficiation/service/ParameterService.java | 5 +++-- beneficiation/src/main/resources/application.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java b/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java index 2a2daab9..cb99042c 100644 --- a/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java @@ -215,7 +215,8 @@ public class ParameterService implements IParameterService{ byte addr2 = (byte) (equipmentType.getAddr() & 0xff); log.info("计算addr的高低值：{}---{}",addr1,addr2); - byte[] center = new byte[]{(byte)0x10,(byte)0x06,addr1,addr2,uc1,uc2}; +// byte[] center = new byte[]{(byte)0x10,(byte)0x10,addr1,addr2,uc1,uc2}; + byte[] center = new byte[]{(byte)0x10,(byte)0x10,addr1,addr2,0x00,0x01,0x02,uc1,uc2}; byte[] crc = new byte[2]; CRCUtil.crc16(crc,center,0,center.length); log.info("计算crc校验：{}---{}",crc[0],crc[1]); @@ -236,7 +237,7 @@ public class ParameterService implements IParameterService{ */ private void sendInMessage(byte[] all) throws Exception { Set userIdSet = new HashSet<>(); - userIdSet.add(String.valueOf(2)); + userIdSet.add(String.valueOf(1)); MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User); messageRule.setAckRule(MessageRule.AckRule.NONE); messageRule.setOfflineDiscard((byte) 1); diff --git a/beneficiation/src/main/resources/application.yml b/beneficiation/src/main/resources/application.yml index a47f2a7b..ac92adb9 100644 --- a/beneficiation/src/main/resources/application.yml +++ b/beneficiation/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test From 14e5ac03923dcbcaab25602910c8c8af35cdf671 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 18 Mar 2021 17:12:18 +0800 Subject: [PATCH 4/6] =?UTF-8?q?20210318=E4=BF=AE=E6=94=B9wbs=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/tall/service/ExcelService.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 43375b88..3ef37805 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -143,10 +143,10 @@ public class ExcelService implements IExcelService { if (projectInfoStart == 0) { throw new BaseException(CodeEnum.WSB_NOT_PROJECT_HEADER); } - if (projectInfoStart == 0) { + if (memberStart == 0) { throw new BaseException(CodeEnum.WSB_NOT_MEMBER_HEADER); } - if (projectInfoStart == 0) { + if (taskStart == 0) { throw new BaseException(CodeEnum.WSB_NOT_TASK_HEADER); } readProject(wbsSheet, projectInfoStart, projectInfoEnd, currentUserId, sysProject); @@ -391,7 +391,6 @@ public class ExcelService implements IExcelService { } }else if (StrUtil.isNotEmpty(roleRelevanceProjectId)) { - } } @@ -648,12 +647,17 @@ public class ExcelService implements IExcelService { String task1 = ExcelUtil.getCellValue(row.getCell(1)); //二级任务名称 String task2 = ExcelUtil.getCellValue(row.getCell(2)); - + //详情 String description = ExcelUtil.getCellValue(row.getCell(3)); + //开始时间 String beginTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(4))); + //结束时间 String endTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(5))); + //重复 String repeat = ExcelUtil.getCellValue(row.getCell(7)); + //关联子任务表 String subTaskCell = ExcelUtil.getCellValue(row.getCell(8)); + //关联子项目表 String subProject = ExcelUtil.getCellValue(row.getCell(9)); String deliver = ExcelUtil.getCellValue(row.getCell(10)); String executorRole = ExcelUtil.getCellValue(row.getCell(11)); From a508190247ecead5818b7d9faae7f24102d1ff66 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 18 Mar 2021 17:15:56 +0800 Subject: [PATCH 5/6] la --- .../src/main/java/com/ccsens/tall/service/ExcelService.java | 4 ++-- tall/src/main/java/com/ccsens/tall/web/LogController.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 43375b88..0ecb3078 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -143,10 +143,10 @@ public class ExcelService implements IExcelService { if (projectInfoStart == 0) { throw new BaseException(CodeEnum.WSB_NOT_PROJECT_HEADER); } - if (projectInfoStart == 0) { + if (memberStart == 0) { throw new BaseException(CodeEnum.WSB_NOT_MEMBER_HEADER); } - if (projectInfoStart == 0) { + if (taskStart == 0) { throw new BaseException(CodeEnum.WSB_NOT_TASK_HEADER); } readProject(wbsSheet, projectInfoStart, projectInfoEnd, currentUserId, sysProject); diff --git a/tall/src/main/java/com/ccsens/tall/web/LogController.java b/tall/src/main/java/com/ccsens/tall/web/LogController.java index 873bffd6..44bf40bc 100644 --- a/tall/src/main/java/com/ccsens/tall/web/LogController.java +++ b/tall/src/main/java/com/ccsens/tall/web/LogController.java @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + /** * @description: * @author: wuHuiJuan @@ -24,9 +26,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class LogController { - @Autowired + @Resource private SysLogMapper sysLogMapper; - @Autowired + @Resource private Snowflake snowflake; @RequestMapping("/log/operation") From 6cdefc7493ebd54ba429e1984de590ee3077c3e1 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 18 Mar 2021 18:34:01 +0800 Subject: [PATCH 6/6] tijiao --- .../com/ccsens/tall/service/ExcelService.java | 25 +++++++++++++++++++ tall/src/main/resources/application.yml | 4 +-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 3ef37805..c4827750 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -13,6 +13,8 @@ import com.ccsens.util.cron.CronConstant; import com.ccsens.util.cron.NatureToDate; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang.StringUtils; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -606,6 +608,19 @@ public class ExcelService implements IExcelService { private void readTask(XSSFWorkbook xssfWorkbook, XSSFSheet wbsSheet, int taskStart, int taskEnd, Long currentUserId, SysProject sysProject, List taskDetails, List proRoles, List proMembers, Map> hasGroupMap) throws Exception { + /** + * 读取到任务的表头，key为属性，value为在第几列 + */ + HashMap map =new HashMap(); + XSSFRow rowq = wbsSheet.getRow(taskStart); + for (int q=0;q<100;q++){ + String s= ExcelUtil.getCellValue(rowq.getCell(q)); + if(StringUtils.isBlank(s)){ + break; + } + map.put(s,q); + } + Long pmRoleId = null; //获取项目经理的id（一级角色） for (ProRole role : proRoles) { @@ -659,14 +674,24 @@ public class ExcelService implements IExcelService { String subTaskCell = ExcelUtil.getCellValue(row.getCell(8)); //关联子项目表 String subProject = ExcelUtil.getCellValue(row.getCell(9)); + //交付物 String deliver = ExcelUtil.getCellValue(row.getCell(10)); + //负责人 String executorRole = ExcelUtil.getCellValue(row.getCell(11)); + //检查人 String checkerRole = ExcelUtil.getCellValue(row.getCell(12)); + //即时奖惩（元） String money = ExcelUtil.getCellValue(row.getCell(13)); + //任务切换模式 String delay = ExcelUtil.getCellValue(row.getCell(14)); + //延迟时间 + //（自动延迟模式可用） String delayTime = ExcelUtil.getCellValue(row.getCell(15)); + //跳转任务 String loopTo = ExcelUtil.getCellValue(row.getCell(16)); + //跳转次数 String loopTimes = ExcelUtil.getCellValue(row.getCell(17)); + //输入文件 String input = ExcelUtil.getCellValue(row.getCell(18)); //二级任务名不能为空 // if(StrUtil.isEmpty(task2)){ diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index 9e02c3e8..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: greenvalley - include: util-greenvalley,common + active: dev + include: util-dev,common