体温记录-正常、异常

common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonDeviceFilterLogDAO.java

@@ -36,4 +36,6 @@ public interface PersonDeviceFilterLogDAO {
     List<PersonDeviceFilterLog> list();
 
     List<Map<String, Object>> unusualStatistics(@Param("temperature")BigDecimal temperature,@Param("startDate")String startDate,@Param("endDate")String endDate);
+
+    PersonDeviceFilterLog get(Long id);
 }

common/src/main/java/com/jpsoft/smart/modules/base/dto/PersonDeviceFilterLogDTO.java

@@ -0,0 +1,61 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-3-15 13:30
+ */
+@Data
+@ApiModel(value = "base_person_device_filter_log的实体类")
+public class PersonDeviceFilterLogDTO {
+    @ApiModelProperty(value = "ID")
+    private Long id;
+    @ApiModelProperty(value = "设备序列号")
+    private String deviceNo;
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+    @ApiModelProperty(value = "人员id")
+    private Integer personId;
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+    @ApiModelProperty(value = "记录温度")
+    private BigDecimal temperature;
+    @ApiModelProperty(value = "匹配状态")
+    private Integer matchStatus;
+    @ApiModelProperty(value = "匹配信息")
+    private String  matchMsg;
+    @ApiModelProperty(value = "匹配人脸 ID")
+    private Integer  matchFaceId;
+    @ApiModelProperty(value = "图片地址")
+    private String faceImage;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    @ApiModelProperty(value = "记录时间")
+    private Date recordTime;
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "更新人")
+    private String  updateBy;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "时间段")
+    private String timeZones;
+    @ApiModelProperty(value = "温度是否正常")
+    private Boolean fever;
+}

common/src/main/java/com/jpsoft/smart/modules/base/service/PersonDeviceFilterLogService.java

@@ -38,4 +38,5 @@ public interface PersonDeviceFilterLogService {
 
     List<Map<String, Object>> unusualStatistics(BigDecimal temperature,String startDate,String endDate);
 
+    PersonDeviceFilterLog get(Long id);
 }

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/PersonDeviceFilterLogServiceImpl.java

@@ -41,6 +41,11 @@ public class PersonDeviceFilterLogServiceImpl implements PersonDeviceFilterLogSe
     @Resource(name="personDeviceFilterLogDAO")
     private PersonDeviceFilterLogDAO personDeviceFilterLogDAO;
 
+    @Override
+    public PersonDeviceFilterLog get(Long id) {
+        // TODO Auto-generated method stub
+        return personDeviceFilterLogDAO.get(id);
+    }
 
     @Override
     public void deviceInsertFilterLog(String deviceNo, BigDecimal temperature, JSONObject faceImageJson, JSONObject libMatInfoListJson, JSONObject matchPersonInfo, Date date) {

common/src/main/resources/mapper/base/PersonDeviceFilterLog.xml

@@ -36,6 +36,10 @@
         <result property="timeZones" column="time_zones" />
     </resultMap>
 
+    <select id="get" parameterType="Long" resultMap="PersonDeviceFilterLogMap">
+        select * from base_person_device_filter_log where id_=#{0}
+    </select>
+
     <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.PersonDeviceFilterLog">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">

web/src/main/java/com/jpsoft/smart/modules/mobile/controller/PersonDeviceFilterLogController.java

@@ -1,12 +1,81 @@
 package com.jpsoft.smart.modules.mobile.controller;
 
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.base.dto.PersonDeviceFilterLogDTO;
+import com.jpsoft.smart.modules.base.entity.CompanyPosition;
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
+import com.jpsoft.smart.modules.base.entity.PersonDeviceFilterLog;
+import com.jpsoft.smart.modules.base.entity.PersonInfo;
+import com.jpsoft.smart.modules.base.service.DeviceInfoService;
+import com.jpsoft.smart.modules.base.service.PersonDeviceFilterLogService;
+import com.jpsoft.smart.modules.base.service.PersonInfoService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @RestController
 @RequestMapping("/mobile/PersonDeviceFilterLog")
 public class PersonDeviceFilterLogController {
     private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PersonDeviceFilterLogService personDeviceFilterLogService;
+    @Autowired
+    private DeviceInfoService deviceInfoService;
+    @Autowired
+    private PersonInfoService personInfoService;
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<PersonDeviceFilterLogDTO> edit(@PathVariable("id") Long id){
+        MessageResult<PersonDeviceFilterLogDTO> msgResult = new MessageResult<>();
+
+        try {
+            PersonDeviceFilterLog personDeviceFilterLog = personDeviceFilterLogService.get(id);
+            PersonDeviceFilterLogDTO personDeviceFilterLogDTO = new PersonDeviceFilterLogDTO();
+
+            if (personDeviceFilterLog != null) {
+                PojoUtils.map(personDeviceFilterLog, personDeviceFilterLogDTO);
+
+                DeviceInfo deviceInfo = deviceInfoService.get(personDeviceFilterLog.getDeviceNo());
+                PersonInfo personInfo = personInfoService.get(Long.valueOf(personDeviceFilterLog.getPersonId()));
+
+                personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
+                personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                if(personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 1 || personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 0){
+                    personDeviceFilterLogDTO.setFever(true);
+                }else {
+                    personDeviceFilterLogDTO.setFever(false);
+                }
+
+                msgResult.setResult(true);
+                msgResult.setData(personDeviceFilterLogDTO);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }