档案新增修改

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

@@ -0,0 +1,20 @@
+package com.huimv.guowei.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-27
+ */
+@RestController
+@RequestMapping("/base-duck-breed-img")
+public class BaseDuckBreedImgController {
+
+}

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

@@ -7,7 +7,9 @@ import com.huimv.guowei.admin.common.utils.PdfUtil;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.common.utils.UploadImage;
+import com.huimv.guowei.admin.entity.BaseDuckBreedImg;
 import com.huimv.guowei.admin.entity.BaseDuckInfo;
+import com.huimv.guowei.admin.service.IBaseDuckBreedImgService;
 import com.huimv.guowei.admin.service.IBaseDuckInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -47,7 +49,7 @@ public class BaseDuckInfoController {
     }
 
     @PostMapping("/addDuck")
-    public Result addDuck(HttpServletRequest httpServletRequest, @RequestParam(name = "imgUrl") MultipartFile imgUrl,
+    public Result addDuck(HttpServletRequest httpServletRequest, @RequestParam(name = "imgUrl",required = false) MultipartFile imgUrl,
                           @RequestParam(name = "farmId") String farmId,
                           @RequestParam(name = "unitList") String unitList,
                           @RequestParam(name = "duckCode") String duckCode,
@@ -86,6 +88,7 @@ public class BaseDuckInfoController {
         map.put("fatherGenotype", fatherGenotype);
         map.put("motherGenotype", motherGenotype);
         map.put("specialNeeds", specialNeeds);
+
         return duckInfoService.addDuck(httpServletRequest, map, imgUrl);
     }
 

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

@@ -0,0 +1,38 @@
+package com.huimv.guowei.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_duck_breed_img")
+public class BaseDuckBreedImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 1北京鸭、2连城白鸭、3山麻鸭、4攸县麻鸭、5白改鸭、6缙云麻鸭、7绍兴鸭(带圈白翼梢)、8绍兴鸭(红毛绿翼梢)、9绍兴鸭(白羽绍鸭)
+     */
+    private Integer duckBreed;
+
+    private String imgUrl;
+
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/BaseDuckBreedImgMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.guowei.admin.mapper;
+
+import com.huimv.guowei.admin.entity.BaseDuckBreedImg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-27
+ */
+public interface BaseDuckBreedImgMapper extends BaseMapper<BaseDuckBreedImg> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.guowei.admin.service;
+
+import com.huimv.guowei.admin.entity.BaseDuckBreedImg;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-27
+ */
+public interface IBaseDuckBreedImgService extends IService<BaseDuckBreedImg> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.guowei.admin.service.impl;
+
+import com.huimv.guowei.admin.entity.BaseDuckBreedImg;
+import com.huimv.guowei.admin.mapper.BaseDuckBreedImgMapper;
+import com.huimv.guowei.admin.service.IBaseDuckBreedImgService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-27
+ */
+@Service
+public class BaseDuckBreedImgServiceImpl extends ServiceImpl<BaseDuckBreedImgMapper, BaseDuckBreedImg> implements IBaseDuckBreedImgService {
+
+}

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

@@ -54,6 +54,8 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
     private DuckImmunityInfoMapper infoMapper;
     @Autowired
     private UploadImage uploadImage;
+    @Autowired
+    private BaseDuckBreedImgMapper imgMapper;
 
     @Override
     public Result listDuck(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -122,8 +124,19 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                     return new Result(10001, "鸭笼已被使用！", false);
                 }
             }
-            String content = uploadImage.getImageCom(imgUrl);
-            baseDuckInfo.setDuckImgUrl(content);
+            if (ObjectUtil.isEmpty(imgUrl)) {
+                String duckBreed = paramsMap.get("duckBreed");
+                if (Integer.parseInt(duckBreed) == 3 && Integer.parseInt(paramsMap.get("duckSex")) == 1) {
+                    duckBreed = "10";
+                }
+                QueryWrapper<BaseDuckBreedImg> imgQueryWrapper = new QueryWrapper<>();
+                imgQueryWrapper.eq("duck_breed", duckBreed);
+                BaseDuckBreedImg breedImg = imgMapper.selectOne(imgQueryWrapper);
+                baseDuckInfo.setDuckImgUrl(breedImg.getImgUrl());
+            } else {
+                String content = uploadImage.getImageCom(imgUrl);
+                baseDuckInfo.setDuckImgUrl(content);
+            }
             duckInfoMapper.insert(baseDuckInfo);
             return new Result(10000, "添加成功！", true);
         } else {
@@ -179,7 +192,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         queryWrapper.eq("duck_num", duckCode);
         BaseDuckInfo baseDuckInfo = duckInfoMapper.selectOne(queryWrapper);//鸭只档案
         QueryWrapper<EnvMoveCall> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("duck_code", duckCode);
+        queryWrapper1.eq("duck_num", duckCode);
         List<EnvMoveCall> envMoveCalls = moveCallMapper.selectList(queryWrapper1);//日龄体重
         QueryWrapper<DuckHealthInfo> healthInfoQueryWrapper = new QueryWrapper<>();
         List<DuckHealthInfo> duckHealthInfos = healthInfoMapper.selectList(healthInfoQueryWrapper);//健康状况

huimv-admin/src/main/resources/mapper/BaseDuckBreedImgMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.guowei.admin.mapper.BaseDuckBreedImgMapper">
+
+</mapper>

huimv-admin/src/main/resources/mapper/BaseDuckInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.guowei.admin.mapper.BaseDuckInfoMapper">
+
+</mapper>