ToolEquipmentMapper.xml

src/main/java/com/ccsens/yanyuan/api/ZaritController.java

@@ -63,4 +63,14 @@ public class ZaritController {
         log.info("添加负担量表结束{}",zaritId);
         return JsonResponse.newInstance().ok(zaritId);
     }
+
+    @MustLogin
+    @ApiOperation(value = "计算Zarit分数", notes = "计算Zarit分数")
+    @RequestMapping(value = "/calculate", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ZaritVo.Point> calculate(@ApiParam @Validated @RequestBody QueryDto<ZaritDto.Id> params) throws Exception{
+        log.info("计算Zarit分数:{}",params);
+        ZaritVo.Point point = zaritService.calculate(params.getParam(),params.getUserId());
+        log.info("计算Zarit分数结束{}",point);
+        return JsonResponse.newInstance().ok(point);
+    }
 }

src/main/java/com/ccsens/yanyuan/bean/dto/ZaritDto.java

@@ -36,4 +36,11 @@ public class ZaritDto {
         @ApiModelProperty("关系")
         private String careRelation;
     }
+
+    @Data
+    @ApiModel("添加负担量表-入参")
+    public static class Id {
+        @ApiModelProperty("照顾者负担量表id")
+        private Long careId;
+    }
 }

src/main/java/com/ccsens/yanyuan/bean/po/ToolEquipment.java

@@ -16,6 +16,14 @@ public class ToolEquipment implements Serializable {
 
     private String description;
 
+    private String wifiName;
+
+    private Byte wifiStatus;
+
+    private Integer electricQuantity;
+
+    private Byte equipmentStatus;
+
     private Long operator;
 
     private Date createdAt;
@@ -24,12 +32,6 @@ public class ToolEquipment implements Serializable {
 
     private Byte recStatus;
 
-    private String wifiName;
-
-    private Integer electricQuantity;
-
-    private Byte equipmentStatus;
-
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -80,6 +82,38 @@ public class ToolEquipment implements Serializable {
         this.description = description == null ? null : description.trim();
     }
 
+    public String getWifiName() {
+        return wifiName;
+    }
+
+    public void setWifiName(String wifiName) {
+        this.wifiName = wifiName == null ? null : wifiName.trim();
+    }
+
+    public Byte getWifiStatus() {
+        return wifiStatus;
+    }
+
+    public void setWifiStatus(Byte wifiStatus) {
+        this.wifiStatus = wifiStatus;
+    }
+
+    public Integer getElectricQuantity() {
+        return electricQuantity;
+    }
+
+    public void setElectricQuantity(Integer electricQuantity) {
+        this.electricQuantity = electricQuantity;
+    }
+
+    public Byte getEquipmentStatus() {
+        return equipmentStatus;
+    }
+
+    public void setEquipmentStatus(Byte equipmentStatus) {
+        this.equipmentStatus = equipmentStatus;
+    }
+
     public Long getOperator() {
         return operator;
     }
@@ -112,30 +146,6 @@ public class ToolEquipment implements Serializable {
         this.recStatus = recStatus;
     }
 
-    public String getWifiName() {
-        return wifiName;
-    }
-
-    public void setWifiName(String wifiName) {
-        this.wifiName = wifiName == null ? null : wifiName.trim();
-    }
-
-    public Integer getElectricQuantity() {
-        return electricQuantity;
-    }
-
-    public void setElectricQuantity(Integer electricQuantity) {
-        this.electricQuantity = electricQuantity;
-    }
-
-    public Byte getEquipmentStatus() {
-        return equipmentStatus;
-    }
-
-    public void setEquipmentStatus(Byte equipmentStatus) {
-        this.equipmentStatus = equipmentStatus;
-    }
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -148,13 +158,14 @@ public class ToolEquipment implements Serializable {
         sb.append(", name=").append(name);
         sb.append(", type=").append(type);
         sb.append(", description=").append(description);
+        sb.append(", wifiName=").append(wifiName);
+        sb.append(", wifiStatus=").append(wifiStatus);
+        sb.append(", electricQuantity=").append(electricQuantity);
+        sb.append(", equipmentStatus=").append(equipmentStatus);
         sb.append(", operator=").append(operator);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
-        sb.append(", wifiName=").append(wifiName);
-        sb.append(", electricQuantity=").append(electricQuantity);
-        sb.append(", equipmentStatus=").append(equipmentStatus);
         sb.append("]");
         return sb.toString();
     }

src/main/java/com/ccsens/yanyuan/bean/po/ToolEquipmentExample.java

@@ -485,433 +485,493 @@ public class ToolEquipmentExample {
             return (Criteria) this;
         }
 
-        public Criteria andOperatorIsNull() {
-            addCriterion("operator is null");
+        public Criteria andWifiNameIsNull() {
+            addCriterion("wifi_name is null");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorIsNotNull() {
-            addCriterion("operator is not null");
+        public Criteria andWifiNameIsNotNull() {
+            addCriterion("wifi_name is not null");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorEqualTo(Long value) {
-            addCriterion("operator =", value, "operator");
+        public Criteria andWifiNameEqualTo(String value) {
+            addCriterion("wifi_name =", value, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorNotEqualTo(Long value) {
-            addCriterion("operator <>", value, "operator");
+        public Criteria andWifiNameNotEqualTo(String value) {
+            addCriterion("wifi_name <>", value, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorGreaterThan(Long value) {
-            addCriterion("operator >", value, "operator");
+        public Criteria andWifiNameGreaterThan(String value) {
+            addCriterion("wifi_name >", value, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
-            addCriterion("operator >=", value, "operator");
+        public Criteria andWifiNameGreaterThanOrEqualTo(String value) {
+            addCriterion("wifi_name >=", value, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorLessThan(Long value) {
-            addCriterion("operator <", value, "operator");
+        public Criteria andWifiNameLessThan(String value) {
+            addCriterion("wifi_name <", value, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorLessThanOrEqualTo(Long value) {
-            addCriterion("operator <=", value, "operator");
+        public Criteria andWifiNameLessThanOrEqualTo(String value) {
+            addCriterion("wifi_name <=", value, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorIn(List<Long> values) {
-            addCriterion("operator in", values, "operator");
+        public Criteria andWifiNameLike(String value) {
+            addCriterion("wifi_name like", value, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorNotIn(List<Long> values) {
-            addCriterion("operator not in", values, "operator");
+        public Criteria andWifiNameNotLike(String value) {
+            addCriterion("wifi_name not like", value, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorBetween(Long value1, Long value2) {
-            addCriterion("operator between", value1, value2, "operator");
+        public Criteria andWifiNameIn(List<String> values) {
+            addCriterion("wifi_name in", values, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andOperatorNotBetween(Long value1, Long value2) {
-            addCriterion("operator not between", value1, value2, "operator");
+        public Criteria andWifiNameNotIn(List<String> values) {
+            addCriterion("wifi_name not in", values, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtIsNull() {
-            addCriterion("created_at is null");
+        public Criteria andWifiNameBetween(String value1, String value2) {
+            addCriterion("wifi_name between", value1, value2, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtIsNotNull() {
-            addCriterion("created_at is not null");
+        public Criteria andWifiNameNotBetween(String value1, String value2) {
+            addCriterion("wifi_name not between", value1, value2, "wifiName");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtEqualTo(Date value) {
-            addCriterion("created_at =", value, "createdAt");
+        public Criteria andWifiStatusIsNull() {
+            addCriterion("wifi_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtNotEqualTo(Date value) {
-            addCriterion("created_at <>", value, "createdAt");
+        public Criteria andWifiStatusIsNotNull() {
+            addCriterion("wifi_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtGreaterThan(Date value) {
-            addCriterion("created_at >", value, "createdAt");
+        public Criteria andWifiStatusEqualTo(Byte value) {
+            addCriterion("wifi_status =", value, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
-            addCriterion("created_at >=", value, "createdAt");
+        public Criteria andWifiStatusNotEqualTo(Byte value) {
+            addCriterion("wifi_status <>", value, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtLessThan(Date value) {
-            addCriterion("created_at <", value, "createdAt");
+        public Criteria andWifiStatusGreaterThan(Byte value) {
+            addCriterion("wifi_status >", value, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
-            addCriterion("created_at <=", value, "createdAt");
+        public Criteria andWifiStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("wifi_status >=", value, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtIn(List<Date> values) {
-            addCriterion("created_at in", values, "createdAt");
+        public Criteria andWifiStatusLessThan(Byte value) {
+            addCriterion("wifi_status <", value, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtNotIn(List<Date> values) {
-            addCriterion("created_at not in", values, "createdAt");
+        public Criteria andWifiStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("wifi_status <=", value, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtBetween(Date value1, Date value2) {
-            addCriterion("created_at between", value1, value2, "createdAt");
+        public Criteria andWifiStatusIn(List<Byte> values) {
+            addCriterion("wifi_status in", values, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
-            addCriterion("created_at not between", value1, value2, "createdAt");
+        public Criteria andWifiStatusNotIn(List<Byte> values) {
+            addCriterion("wifi_status not in", values, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtIsNull() {
-            addCriterion("updated_at is null");
+        public Criteria andWifiStatusBetween(Byte value1, Byte value2) {
+            addCriterion("wifi_status between", value1, value2, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtIsNotNull() {
-            addCriterion("updated_at is not null");
+        public Criteria andWifiStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("wifi_status not between", value1, value2, "wifiStatus");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtEqualTo(Date value) {
-            addCriterion("updated_at =", value, "updatedAt");
+        public Criteria andElectricQuantityIsNull() {
+            addCriterion("electric_quantity is null");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtNotEqualTo(Date value) {
-            addCriterion("updated_at <>", value, "updatedAt");
+        public Criteria andElectricQuantityIsNotNull() {
+            addCriterion("electric_quantity is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtGreaterThan(Date value) {
-            addCriterion("updated_at >", value, "updatedAt");
+        public Criteria andElectricQuantityEqualTo(Integer value) {
+            addCriterion("electric_quantity =", value, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
-            addCriterion("updated_at >=", value, "updatedAt");
+        public Criteria andElectricQuantityNotEqualTo(Integer value) {
+            addCriterion("electric_quantity <>", value, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtLessThan(Date value) {
-            addCriterion("updated_at <", value, "updatedAt");
+        public Criteria andElectricQuantityGreaterThan(Integer value) {
+            addCriterion("electric_quantity >", value, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
-            addCriterion("updated_at <=", value, "updatedAt");
+        public Criteria andElectricQuantityGreaterThanOrEqualTo(Integer value) {
+            addCriterion("electric_quantity >=", value, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtIn(List<Date> values) {
-            addCriterion("updated_at in", values, "updatedAt");
+        public Criteria andElectricQuantityLessThan(Integer value) {
+            addCriterion("electric_quantity <", value, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtNotIn(List<Date> values) {
-            addCriterion("updated_at not in", values, "updatedAt");
+        public Criteria andElectricQuantityLessThanOrEqualTo(Integer value) {
+            addCriterion("electric_quantity <=", value, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
-            addCriterion("updated_at between", value1, value2, "updatedAt");
+        public Criteria andElectricQuantityIn(List<Integer> values) {
+            addCriterion("electric_quantity in", values, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
-            addCriterion("updated_at not between", value1, value2, "updatedAt");
+        public Criteria andElectricQuantityNotIn(List<Integer> values) {
+            addCriterion("electric_quantity not in", values, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusIsNull() {
-            addCriterion("rec_status is null");
+        public Criteria andElectricQuantityBetween(Integer value1, Integer value2) {
+            addCriterion("electric_quantity between", value1, value2, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusIsNotNull() {
-            addCriterion("rec_status is not null");
+        public Criteria andElectricQuantityNotBetween(Integer value1, Integer value2) {
+            addCriterion("electric_quantity not between", value1, value2, "electricQuantity");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusEqualTo(Byte value) {
-            addCriterion("rec_status =", value, "recStatus");
+        public Criteria andEquipmentStatusIsNull() {
+            addCriterion("equipment_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusNotEqualTo(Byte value) {
-            addCriterion("rec_status <>", value, "recStatus");
+        public Criteria andEquipmentStatusIsNotNull() {
+            addCriterion("equipment_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusGreaterThan(Byte value) {
-            addCriterion("rec_status >", value, "recStatus");
+        public Criteria andEquipmentStatusEqualTo(Byte value) {
+            addCriterion("equipment_status =", value, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
-            addCriterion("rec_status >=", value, "recStatus");
+        public Criteria andEquipmentStatusNotEqualTo(Byte value) {
+            addCriterion("equipment_status <>", value, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusLessThan(Byte value) {
-            addCriterion("rec_status <", value, "recStatus");
+        public Criteria andEquipmentStatusGreaterThan(Byte value) {
+            addCriterion("equipment_status >", value, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
-            addCriterion("rec_status <=", value, "recStatus");
+        public Criteria andEquipmentStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("equipment_status >=", value, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusIn(List<Byte> values) {
-            addCriterion("rec_status in", values, "recStatus");
+        public Criteria andEquipmentStatusLessThan(Byte value) {
+            addCriterion("equipment_status <", value, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusNotIn(List<Byte> values) {
-            addCriterion("rec_status not in", values, "recStatus");
+        public Criteria andEquipmentStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("equipment_status <=", value, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
-            addCriterion("rec_status between", value1, value2, "recStatus");
+        public Criteria andEquipmentStatusIn(List<Byte> values) {
+            addCriterion("equipment_status in", values, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
-            addCriterion("rec_status not between", value1, value2, "recStatus");
+        public Criteria andEquipmentStatusNotIn(List<Byte> values) {
+            addCriterion("equipment_status not in", values, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameIsNull() {
-            addCriterion("wifi_name is null");
+        public Criteria andEquipmentStatusBetween(Byte value1, Byte value2) {
+            addCriterion("equipment_status between", value1, value2, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameIsNotNull() {
-            addCriterion("wifi_name is not null");
+        public Criteria andEquipmentStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("equipment_status not between", value1, value2, "equipmentStatus");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameEqualTo(String value) {
-            addCriterion("wifi_name =", value, "wifiName");
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameNotEqualTo(String value) {
-            addCriterion("wifi_name <>", value, "wifiName");
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameGreaterThan(String value) {
-            addCriterion("wifi_name >", value, "wifiName");
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameGreaterThanOrEqualTo(String value) {
-            addCriterion("wifi_name >=", value, "wifiName");
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameLessThan(String value) {
-            addCriterion("wifi_name <", value, "wifiName");
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameLessThanOrEqualTo(String value) {
-            addCriterion("wifi_name <=", value, "wifiName");
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameLike(String value) {
-            addCriterion("wifi_name like", value, "wifiName");
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameNotLike(String value) {
-            addCriterion("wifi_name not like", value, "wifiName");
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameIn(List<String> values) {
-            addCriterion("wifi_name in", values, "wifiName");
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameNotIn(List<String> values) {
-            addCriterion("wifi_name not in", values, "wifiName");
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameBetween(String value1, String value2) {
-            addCriterion("wifi_name between", value1, value2, "wifiName");
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andWifiNameNotBetween(String value1, String value2) {
-            addCriterion("wifi_name not between", value1, value2, "wifiName");
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityIsNull() {
-            addCriterion("electric_quantity is null");
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityIsNotNull() {
-            addCriterion("electric_quantity is not null");
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityEqualTo(Integer value) {
-            addCriterion("electric_quantity =", value, "electricQuantity");
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityNotEqualTo(Integer value) {
-            addCriterion("electric_quantity <>", value, "electricQuantity");
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityGreaterThan(Integer value) {
-            addCriterion("electric_quantity >", value, "electricQuantity");
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityGreaterThanOrEqualTo(Integer value) {
-            addCriterion("electric_quantity >=", value, "electricQuantity");
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityLessThan(Integer value) {
-            addCriterion("electric_quantity <", value, "electricQuantity");
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityLessThanOrEqualTo(Integer value) {
-            addCriterion("electric_quantity <=", value, "electricQuantity");
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityIn(List<Integer> values) {
-            addCriterion("electric_quantity in", values, "electricQuantity");
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityNotIn(List<Integer> values) {
-            addCriterion("electric_quantity not in", values, "electricQuantity");
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityBetween(Integer value1, Integer value2) {
-            addCriterion("electric_quantity between", value1, value2, "electricQuantity");
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andElectricQuantityNotBetween(Integer value1, Integer value2) {
-            addCriterion("electric_quantity not between", value1, value2, "electricQuantity");
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusIsNull() {
-            addCriterion("equipment_status is null");
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusIsNotNull() {
-            addCriterion("equipment_status is not null");
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusEqualTo(Byte value) {
-            addCriterion("equipment_status =", value, "equipmentStatus");
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusNotEqualTo(Byte value) {
-            addCriterion("equipment_status <>", value, "equipmentStatus");
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusGreaterThan(Byte value) {
-            addCriterion("equipment_status >", value, "equipmentStatus");
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusGreaterThanOrEqualTo(Byte value) {
-            addCriterion("equipment_status >=", value, "equipmentStatus");
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusLessThan(Byte value) {
-            addCriterion("equipment_status <", value, "equipmentStatus");
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusLessThanOrEqualTo(Byte value) {
-            addCriterion("equipment_status <=", value, "equipmentStatus");
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusIn(List<Byte> values) {
-            addCriterion("equipment_status in", values, "equipmentStatus");
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusNotIn(List<Byte> values) {
-            addCriterion("equipment_status not in", values, "equipmentStatus");
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusBetween(Byte value1, Byte value2) {
-            addCriterion("equipment_status between", value1, value2, "equipmentStatus");
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
             return (Criteria) this;
         }
 
-        public Criteria andEquipmentStatusNotBetween(Byte value1, Byte value2) {
-            addCriterion("equipment_status not between", value1, value2, "equipmentStatus");
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
             return (Criteria) this;
         }
     }

src/main/java/com/ccsens/yanyuan/bean/vo/ZaritVo.java

@@ -35,4 +35,10 @@ public class ZaritVo {
         @ApiModelProperty("照顾得分")
         private String zaritState;
     }
+    @Data
+    @ApiModel("zarit分数计算-返参")
+    public static class Point {
+        @ApiModelProperty("分数")
+        private int score;
+    }
 }

src/main/java/com/ccsens/yanyuan/persist/dao/CareDao.java

@@ -27,4 +27,11 @@ public interface CareDao extends CareMapper {
      * @return 当前用户负担量表历史记录
      */
     ZaritVo.ZaritInfo queryHistory(@Param("projectId")Long projectId,@Param("userId") Long userId);
+
+    /**
+     * 计算照顾者负担量表得分
+     * @param careId zaritId
+     * @return 得分
+     */
+    Integer calculate(@Param("careId") Long careId);
 }

src/main/java/com/ccsens/yanyuan/service/IZaritService.java

@@ -33,4 +33,12 @@ public interface IZaritService {
      * @return 负担量表Id
      */
     Long addZarit(ZaritDto.AddZarit param, Long userId);
+
+    /**
+     * 计算照顾者负担量表（ZARIT）得分
+     * @param param 记录ID
+     * @param userId 操作者ID
+     * @return 分数
+     */
+    ZaritVo.Point calculate(ZaritDto.Id param, Long userId);
 }

src/main/java/com/ccsens/yanyuan/service/ZaritService.java

@@ -1,15 +1,20 @@
 package com.ccsens.yanyuan.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.util.exception.BaseException;
 import com.ccsens.yanyuan.bean.dto.MedicineDto;
 import com.ccsens.yanyuan.bean.dto.ZaritDto;
 import com.ccsens.yanyuan.bean.po.Care;
+import com.ccsens.yanyuan.bean.po.CareExample;
 import com.ccsens.yanyuan.bean.po.UserFamily;
 import com.ccsens.yanyuan.bean.vo.ZaritVo;
 import com.ccsens.yanyuan.persist.dao.CareDao;
 import com.ccsens.yanyuan.persist.dao.FamilyDao;
+import com.ccsens.yanyuan.util.YanYuanCodeError;
+import com.ccsens.yanyuan.util.YanYuanConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -59,9 +64,38 @@ public class ZaritService implements IZaritService{
         care.setKeyId(snowflake.nextId());
         care.setKeyUserId(param.getProjectId());
         care.setRecordUserId(userId);
+        care.setZaritState(YanYuanConstant.Zarit.STATE_CREATE);
         careDao.insertSelective(care);
         return care.getKeyId();
     }
 
+    @Override
+    public ZaritVo.Point calculate(ZaritDto.Id param, Long userId) {
+        // 参数校验
+        CareExample careExample = new CareExample();
+        careExample.createCriteria().andKeyIdEqualTo(param.getCareId());
+        List<Care> cares = careDao.selectByExample(careExample);
+        if (CollectionUtil.isEmpty(cares)) {
+            log.info("未找到照顾者负担量表信息：{}", param.getCareId());
+            throw new BaseException(YanYuanCodeError.PARAM_ERROR);
+        }
+        Care care = cares.get(0);
+        // 计算分数
+        Integer score = careDao.calculate(param.getCareId());
+        if (score == null) {
+            log.info("未找到zarit的做题记录：{}", param.getCareId());
+            throw new BaseException(YanYuanCodeError.ZARIT_UNFINISHED);
+        }
+        // 更新分数
+        Care updateCare = new Care();
+        updateCare.setId(care.getId());
+        updateCare.setZaritPoint(String.valueOf(score));
+        updateCare.setZaritState(YanYuanConstant.Zarit.STATE_FINISH);
+        careDao.updateByPrimaryKeySelective(updateCare);
+        ZaritVo.Point point = new ZaritVo.Point();
+        point.setScore(score);
+        return point;
+    }
+
 }
 

src/main/java/com/ccsens/yanyuan/util/YanYuanCodeError.java

@@ -33,7 +33,7 @@ public class YanYuanCodeError extends CodeError {
     public static final Code QUESTION_IMPORT_WHICH_SORT_LACK = new Code(523,"第几套未填写", true);
     public static final Code QUESTION_IMPORT_NUM_LACK = new Code(524,"题目未填写", true);
     public static final Code QUESTION_IMPORT_SORT_LACK = new Code(525,"排序未填写", true);
-
+    public static final Code ZARIT_UNFINISHED = new Code(526,"您还没有填写照顾者负担量表，请先回答问卷内容。", true);
 
 
 

src/main/java/com/ccsens/yanyuan/util/YanYuanConstant.java

@@ -25,7 +25,10 @@ public class YanYuanConstant {
     /**一天的毫秒数*/
     public static final long DAY_TIME = 24 * 3600 * 1000;
 
-
+    public static class Zarit{
+        public final static String STATE_CREATE = "create";
+        public final static String STATE_FINISH = "finish";
+    }
 
     public static class Mq{
         public final static String MENTAL_TEST_ALL = "mentalTestAll";

src/main/resources/mapper_dao/CareDao.xml

@@ -47,5 +47,17 @@
         ORDER BY create_at DESC
         LIMIT 1
     </select>
+    <select id="calculate" resultType="java.lang.Integer">
+        SELECT
+            sum(o.score)
+        FROM
+            u_mental_record r,
+            t_evaluation_option o
+        WHERE
+            r.test_id = #{careId}
+            AND r.option_id = o.id
+            AND r.rec_status = 0
+            AND o.rec_status = 0
+    </select>
 
 </mapper>

src/main/resources/mapper_raw/ToolEquipmentMapper.xml

@@ -8,13 +8,14 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="type" jdbcType="TINYINT" property="type" />
     <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="wifi_name" jdbcType="VARCHAR" property="wifiName" />
+    <result column="wifi_status" jdbcType="TINYINT" property="wifiStatus" />
+    <result column="electric_quantity" jdbcType="INTEGER" property="electricQuantity" />
+    <result column="equipment_status" jdbcType="TINYINT" property="equipmentStatus" />
     <result column="operator" jdbcType="BIGINT" property="operator" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
-    <result column="wifi_name" jdbcType="VARCHAR" property="wifiName" />
-    <result column="electric_quantity" jdbcType="INTEGER" property="electricQuantity" />
-    <result column="equipment_status" jdbcType="TINYINT" property="equipmentStatus" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,8 +76,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, tool_id, serial, name, type, description, operator, created_at, updated_at, rec_status, 
-    wifi_name, electric_quantity, equipment_status
+    id, tool_id, serial, name, type, description, wifi_name, wifi_status, electric_quantity, 
+    equipment_status, operator, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.yanyuan.bean.po.ToolEquipmentExample" resultMap="BaseResultMap">
     select
@@ -111,14 +112,14 @@
   <insert id="insert" parameterType="com.ccsens.yanyuan.bean.po.ToolEquipment">
     insert into t_tool_equipment (id, tool_id, serial, 
       name, type, description, 
-      operator, created_at, updated_at, 
-      rec_status, wifi_name, electric_quantity, 
-      equipment_status)
+      wifi_name, wifi_status, electric_quantity, 
+      equipment_status, operator, created_at, 
+      updated_at, rec_status)
     values (#{id,jdbcType=BIGINT}, #{toolId,jdbcType=BIGINT}, #{serial,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, 
-      #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT}, #{wifiName,jdbcType=VARCHAR}, #{electricQuantity,jdbcType=INTEGER}, 
-      #{equipmentStatus,jdbcType=TINYINT})
+      #{wifiName,jdbcType=VARCHAR}, #{wifiStatus,jdbcType=TINYINT}, #{electricQuantity,jdbcType=INTEGER}, 
+      #{equipmentStatus,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.yanyuan.bean.po.ToolEquipment">
     insert into t_tool_equipment
@@ -141,6 +142,18 @@
       <if test="description != null">
         description,
       </if>
+      <if test="wifiName != null">
+        wifi_name,
+      </if>
+      <if test="wifiStatus != null">
+        wifi_status,
+      </if>
+      <if test="electricQuantity != null">
+        electric_quantity,
+      </if>
+      <if test="equipmentStatus != null">
+        equipment_status,
+      </if>
       <if test="operator != null">
         operator,
       </if>
@@ -153,15 +166,6 @@
       <if test="recStatus != null">
         rec_status,
       </if>
-      <if test="wifiName != null">
-        wifi_name,
-      </if>
-      <if test="electricQuantity != null">
-        electric_quantity,
-      </if>
-      <if test="equipmentStatus != null">
-        equipment_status,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -182,6 +186,18 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
+      <if test="wifiName != null">
+        #{wifiName,jdbcType=VARCHAR},
+      </if>
+      <if test="wifiStatus != null">
+        #{wifiStatus,jdbcType=TINYINT},
+      </if>
+      <if test="electricQuantity != null">
+        #{electricQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentStatus != null">
+        #{equipmentStatus,jdbcType=TINYINT},
+      </if>
       <if test="operator != null">
         #{operator,jdbcType=BIGINT},
       </if>
@@ -194,15 +210,6 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
-      <if test="wifiName != null">
-        #{wifiName,jdbcType=VARCHAR},
-      </if>
-      <if test="electricQuantity != null">
-        #{electricQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="equipmentStatus != null">
-        #{equipmentStatus,jdbcType=TINYINT},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.yanyuan.bean.po.ToolEquipmentExample" resultType="java.lang.Long">
@@ -232,6 +239,18 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
+      <if test="record.wifiName != null">
+        wifi_name = #{record.wifiName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wifiStatus != null">
+        wifi_status = #{record.wifiStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.electricQuantity != null">
+        electric_quantity = #{record.electricQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.equipmentStatus != null">
+        equipment_status = #{record.equipmentStatus,jdbcType=TINYINT},
+      </if>
       <if test="record.operator != null">
         operator = #{record.operator,jdbcType=BIGINT},
       </if>
@@ -244,15 +263,6 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
-      <if test="record.wifiName != null">
-        wifi_name = #{record.wifiName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.electricQuantity != null">
-        electric_quantity = #{record.electricQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="record.equipmentStatus != null">
-        equipment_status = #{record.equipmentStatus,jdbcType=TINYINT},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -266,13 +276,14 @@
       name = #{record.name,jdbcType=VARCHAR},
       type = #{record.type,jdbcType=TINYINT},
       description = #{record.description,jdbcType=VARCHAR},
+      wifi_name = #{record.wifiName,jdbcType=VARCHAR},
+      wifi_status = #{record.wifiStatus,jdbcType=TINYINT},
+      electric_quantity = #{record.electricQuantity,jdbcType=INTEGER},
+      equipment_status = #{record.equipmentStatus,jdbcType=TINYINT},
       operator = #{record.operator,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{record.recStatus,jdbcType=TINYINT},
-      wifi_name = #{record.wifiName,jdbcType=VARCHAR},
-      electric_quantity = #{record.electricQuantity,jdbcType=INTEGER},
-      equipment_status = #{record.equipmentStatus,jdbcType=TINYINT}
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -295,6 +306,18 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
+      <if test="wifiName != null">
+        wifi_name = #{wifiName,jdbcType=VARCHAR},
+      </if>
+      <if test="wifiStatus != null">
+        wifi_status = #{wifiStatus,jdbcType=TINYINT},
+      </if>
+      <if test="electricQuantity != null">
+        electric_quantity = #{electricQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentStatus != null">
+        equipment_status = #{equipmentStatus,jdbcType=TINYINT},
+      </if>
       <if test="operator != null">
         operator = #{operator,jdbcType=BIGINT},
       </if>
@@ -307,15 +330,6 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
-      <if test="wifiName != null">
-        wifi_name = #{wifiName,jdbcType=VARCHAR},
-      </if>
-      <if test="electricQuantity != null">
-        electric_quantity = #{electricQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="equipmentStatus != null">
-        equipment_status = #{equipmentStatus,jdbcType=TINYINT},
-      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -326,13 +340,14 @@
       name = #{name,jdbcType=VARCHAR},
       type = #{type,jdbcType=TINYINT},
       description = #{description,jdbcType=VARCHAR},
+      wifi_name = #{wifiName,jdbcType=VARCHAR},
+      wifi_status = #{wifiStatus,jdbcType=TINYINT},
+      electric_quantity = #{electricQuantity,jdbcType=INTEGER},
+      equipment_status = #{equipmentStatus,jdbcType=TINYINT},
       operator = #{operator,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{recStatus,jdbcType=TINYINT},
-      wifi_name = #{wifiName,jdbcType=VARCHAR},
-      electric_quantity = #{electricQuantity,jdbcType=INTEGER},
-      equipment_status = #{equipmentStatus,jdbcType=TINYINT}
+      rec_status = #{recStatus,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mbg.xml

@@ -55,7 +55,7 @@
             <!-- enableSubPackages:是否让schema作为包的后缀 -->
             <property name="enableSubPackages" value="false" />
         </javaClientGenerator>
-        <table tableName="u_train_record" domainObjectName="TrainRecord"></table>
+        <table tableName="t_tool_equipment" domainObjectName="ToolEquipment"></table>
 <!--        <table tableName="u_mental_test" domainObjectName="MentalTest"></table>-->
 <!--        <table tableName="u_mental_test" domainObjectName="MentalTest"></table>-->
         <!--<table tableName="s_config" domainObjectName="Config"></table>