小程序1

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

@@ -38,8 +38,8 @@ public class DuckImmunityInfoController {
     }
 
     @RequestMapping("/addDuck")
-    public Result addDuck(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
-        return infoService.addImmunity(httpServletRequest, paramsMap);
+    public Result addDuck(HttpServletRequest httpServletRequest, @RequestBody DuckImmunityInfo duckImmunityInfo) throws ParseException {
+        return infoService.addImmunity(httpServletRequest, duckImmunityInfo);
     }
 
     @RequestMapping("/editDuck")

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/Breed.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -46,9 +49,12 @@ public class Breed implements Serializable {
     /**
      * 配种日期
      */
-    private LocalDateTime date;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date date;
 
     private Integer farmId;
 
+    private String unitName;
+
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckImmunityInfo.java

@@ -50,7 +50,9 @@ public class DuckImmunityInfo implements Serializable {
 
     private String injection;//注射部位
 
-    private Integer dose;//剂量
+    private String dose;//剂量
+
+    private String unitName;
 
 
 }

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

@@ -19,7 +19,7 @@ import java.util.Map;
 public interface IDuckImmunityInfoService extends IService<DuckImmunityInfo> {
     Result listById(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result addImmunity(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
+    Result addImmunity(HttpServletRequest httpServletRequest, DuckImmunityInfo duckImmunityInfo) throws ParseException;
 
     Result listByH5(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 

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

@@ -40,7 +40,7 @@ public class BreedServiceImpl extends ServiceImpl<BreedMapper, Breed> implements
     @Override
     public Result listSelect(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        String unitId = paramsMap.get("unitId");
+        String unitName = paramsMap.get("unitName");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         if (pageNum == null || "".equals(pageNum)) {
@@ -50,7 +50,7 @@ public class BreedServiceImpl extends ServiceImpl<BreedMapper, Breed> implements
             pageSize = "10";
         }
         QueryWrapper<Breed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank("unit_id"),"unit_id", unitId)
+        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
                 .orderByDesc("date");
         Page<Breed> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, breedMapper.selectPage(page, queryWrapper));

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

@@ -65,29 +65,14 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
     }
 
     @Override
-    public Result addImmunity(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
-        String date = paramsMap.get("date");
-        date = date + " 00:00:00";
-        String farmId = paramsMap.get("farmId");
-        String duckId = paramsMap.get("duckId");
-        String injection = paramsMap.get("injection");
-        String dose = paramsMap.get("dose");
+    public Result addImmunity(HttpServletRequest httpServletRequest, DuckImmunityInfo duckImmunityInfo) throws ParseException {
+
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("id", duckId);
+        queryWrapper.eq("duck_num", duckImmunityInfo.getDuckNum());
         BaseDuckInfo baseDuckInfo = baseDuckInfoMapper.selectOne(queryWrapper);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Date date1 = sdf.parse(date);
-        String vaccination = paramsMap.get("vaccination");//接种疫苗
-        DuckImmunityInfo immunityInfo = new DuckImmunityInfo();
-        immunityInfo.setDuckId(baseDuckInfo.getUnitId());
-        immunityInfo.setDose(Integer.parseInt(dose));
-        immunityInfo.setInjection(injection);
-        immunityInfo.setDuckId(Integer.parseInt(duckId));
-        immunityInfo.setDuckNum(baseDuckInfo.getDuckNum());
-        immunityInfo.setFarmId(Integer.parseInt(farmId));
-        immunityInfo.setHealthDate(date1);
-        immunityInfo.setVaccination(vaccination);
-        infoMapper.insert(immunityInfo);
+        duckImmunityInfo.setDuckId(baseDuckInfo.getUnitId());
+        duckImmunityInfo.setDuckNum(baseDuckInfo.getDuckNum());
+        infoMapper.insert(duckImmunityInfo);
         return new Result(ResultCode.SUCCESS);
     }
     @Override
@@ -101,7 +86,7 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
     @Override
     public Result listSelect(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
-        String unitId = paramsMap.get("unitId");
+        String unitName = paramsMap.get("unitName");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         if (pageNum == null || "".equals(pageNum)) {
@@ -111,7 +96,7 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
             pageSize = "10";
         }
         QueryWrapper<DuckImmunityInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank("unit_id"),"unit_id", unitId)
+        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
         .orderByDesc("health_date");
         Page<DuckImmunityInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, infoMapper.selectPage(page, queryWrapper));