更新密码

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckHealthInfoController.java

@@ -4,6 +4,7 @@ package com.huimv.guowei.admin.controller;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.DuckHealthInfo;
+import com.huimv.guowei.admin.entity.vo.DuckHealthInfoVo;
 import com.huimv.guowei.admin.service.IDuckHealthInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -38,7 +39,7 @@ public class DuckHealthInfoController {
     }
 
     @RequestMapping("/addDuck")
-    public Result addDuck(HttpServletRequest httpServletRequest, @RequestBody DuckHealthInfo healthInfo) throws ParseException {
+    public Result addDuck(HttpServletRequest httpServletRequest, @RequestBody DuckHealthInfoVo healthInfo) throws ParseException {
         return healthInfoService.addHealth(httpServletRequest, healthInfo);
     }
 

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/DuckHealthInfoVo.java

@@ -0,0 +1,71 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Data
+public class DuckHealthInfoVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date healthDate;
+
+    /**
+     * 体检结果
+     */
+    private String healthResult;
+
+    /**
+     * 治疗措施
+     */
+    private String treatmentMeasure;
+
+    /**
+     * 鸭只编号
+     */
+    private Integer duckNum;
+
+    /**
+     * 疾病名称
+     */
+    private String diseaseName;
+
+    private Integer farmId;
+
+    private Integer duckId;
+
+    private Integer unitId;
+
+    private String symptom;//症状
+
+    private String cure;//治疗方法
+
+    private String medicine;//药品名称
+
+    private String measure;//药品用量
+
+    private String unitName;//笼位名称
+
+
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDuckHealthInfoService.java

@@ -3,6 +3,7 @@ package com.huimv.guowei.admin.service;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.DuckHealthInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.guowei.admin.entity.vo.DuckHealthInfoVo;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
@@ -20,7 +21,7 @@ public interface IDuckHealthInfoService extends IService<DuckHealthInfo> {
 
     Result listById(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
-    Result addHealth(HttpServletRequest httpServletRequest, DuckHealthInfo healthInfo) throws ParseException;
+    Result addHealth(HttpServletRequest httpServletRequest, DuckHealthInfoVo healthInfo) throws ParseException;
 
     Result listByH5(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckHealthInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,6 +8,7 @@ import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.DuckHealthInfo;
+import com.huimv.guowei.admin.entity.vo.DuckHealthInfoVo;
 import com.huimv.guowei.admin.mapper.BaseDuckInfoMapper;
 import com.huimv.guowei.admin.mapper.DuckHealthInfoMapper;
 import com.huimv.guowei.admin.service.IDuckHealthInfoService;
@@ -62,15 +64,18 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
             endDate = endDate + " 23:59:59";
             queryWrapper.eq("duck_id", duckNum).eq("farm_id", farmId).between("health_date", startDate, endDate).orderByAsc("health_date");
         }
+        queryWrapper.orderByDesc("id");
         Page<DuckHealthInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, healthInfoMapper.selectPage(page, queryWrapper));
     }
 
     @Override
-    public Result addHealth(HttpServletRequest httpServletRequest,DuckHealthInfo healthInfo) throws ParseException {
+    public Result addHealth(HttpServletRequest httpServletRequest, DuckHealthInfoVo healthInfo) throws ParseException {
 
+        DuckHealthInfo duckHealthInfo = new DuckHealthInfo();
+        BeanUtil.copyProperties(healthInfo,duckHealthInfo);
         Integer farmId = healthInfo.getFarmId();
-        String duckNum = healthInfo.getDuckNum();
+        Integer duckNum = healthInfo.getDuckNum();
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("duck_num", duckNum);
         BaseDuckInfo baseDuckInfo = infoMapper.selectOne(queryWrapper);
@@ -83,13 +88,13 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
         if (healthDate.getTime() > parse.getTime()) {
             return new Result(10001, "发病日期不能晚于今日！", false);
         } else {
-            healthInfo.setHealthDate(healthDate);
+            duckHealthInfo.setHealthDate(healthDate);
         }
-        healthInfo.setDuckNum(baseDuckInfo.getDuckNum());
-        healthInfo.setFarmId(farmId);
-        healthInfo.setUnitId(baseDuckInfo.getUnitId());
-        healthInfo.setUnitName(baseDuckInfo.getUnitName());
-        healthInfoMapper.insert(healthInfo);
+        duckHealthInfo.setDuckNum(baseDuckInfo.getDuckNum()+"");
+        duckHealthInfo.setFarmId(farmId);
+        duckHealthInfo.setUnitId(baseDuckInfo.getUnitId());
+        duckHealthInfo.setUnitName(baseDuckInfo.getUnitName());
+        healthInfoMapper.insert(duckHealthInfo);
         return new Result(ResultCode.SUCCESS);
     }