Merge remote-tracking branch 'origin/master'

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/BoardController.java

@@ -1,24 +1,28 @@
 package com.huimv.env.produce.controller;
 
+
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.produce.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
 import java.util.Map;
 
 /**
- * @Project : huimv-env-platform
- * @Package : ${}
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create : 2022/10/30
- **/
-@CrossOrigin
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-11-01
+ */
 @RestController
 @RequestMapping("/v1.0.0/board")
 public class BoardController {
@@ -38,9 +42,11 @@ public class BoardController {
     private GeneralImmunityPlanService generalImmunityPlanService;
     @Autowired
     private SpecialImmunityPlanService specialImmunityPlanService;
+    @Autowired
+    private BoardService boardService;
 
-    @PostMapping("/getBoardCount")
-    public Result getCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+    @PostMapping("/getBoardCount_old1")
+    public Result getCount_old(@RequestBody Map<String, String> paramsMap) throws ParseException {
         JSONObject resultJo = new JSONObject();
         resultJo.put("warningCount",warningInfoService.getWarningCount(paramsMap));
         resultJo.put("tuppingCount",tuppingService.getTuppingCount(paramsMap));
@@ -52,4 +58,15 @@ public class BoardController {
         resultJo.put("specialImmunityCount",specialImmunityPlanService.getSpecialImmunityCount(paramsMap));
         return new Result(ResultCode.SUCCESS,resultJo);
     }
+
+    @PostMapping("/getBoardCount")
+    public Result getCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return boardService.getBoardCount(paramsMap);
+    }
+
+    @PostMapping("/save")
+    public Result save(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return boardService.save(paramsMap);
+    }
 }
+

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/TuppingController.java

@@ -1,10 +1,13 @@
 package com.huimv.env.produce.controller;
 
 
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.common.utils.Result;
+import com.huimv.env.produce.service.TuppingService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,8 +19,34 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @CrossOrigin
 @RestController
-@RequestMapping("/tupping")
+@RequestMapping("/v1.0.0/tupping")
 public class TuppingController {
+    @Resource
+    private TuppingService tuppingService;
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return tuppingService.list(paramsMap);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return tuppingService.add(paramsMap);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return tuppingService.edit(paramsMap);
+    }
+
+    @PostMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return tuppingService.remove(paramsMap);
+    }
 
 }
 

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/entity/Board.java

@@ -0,0 +1,46 @@
+package com.huimv.env.produce.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-11-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Board implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer warningCount;
+
+    private Integer tuppingCount;
+
+    private Integer birthCount;
+
+    private Integer weanCount;
+
+    private Integer workplanCount;
+
+    private Integer transferCount;
+
+    private Integer generalImmunityCount;
+
+    private Integer specialImmunityCount;
+
+    private String farmCode;
+
+
+}

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/mapper/BoardMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.env.produce.mapper;
+
+import com.huimv.env.produce.entity.Board;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-11-01
+ */
+public interface BoardMapper extends BaseMapper<Board> {
+
+}

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/mapper/xml/BoardMapper.xml

@@ -0,0 +1,24 @@
+<?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.env.produce.mapper.BoardMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.produce.entity.Board">
+        <id column="id" property="id" />
+        <result column="warning_count" property="warningCount" />
+        <result column="tupping_count" property="tuppingCount" />
+        <result column="birth_count" property="birthCount" />
+        <result column="wean_count" property="weanCount" />
+        <result column="workplan_count" property="workplanCount" />
+        <result column="transfer_count" property="transferCount" />
+        <result column="general_immunity_count" property="generalImmunityCount" />
+        <result column="special_immunity_count" property="specialImmunityCount" />
+        <result column="farm_code" property="farmCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, warning_count, tupping_count, birth_count, wean_count, workplan_count, transfer_count, general_immunity_count, special_immunity_count, farm_code
+    </sql>
+
+</mapper>

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/BoardService.java

@@ -0,0 +1,22 @@
+package com.huimv.env.produce.service;
+
+import com.huimv.common.utils.Result;
+import com.huimv.env.produce.entity.Board;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-11-01
+ */
+public interface BoardService extends IService<Board> {
+
+    Result getBoardCount(Map<String, String> paramsMap);
+
+    Result save(Map<String, String> paramsMap);
+}

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/TuppingService.java

@@ -1,5 +1,6 @@
 package com.huimv.env.produce.service;
 
+import com.huimv.common.utils.Result;
 import com.huimv.env.produce.entity.Tupping;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -17,4 +18,12 @@ import java.util.Map;
 public interface TuppingService extends IService<Tupping> {
 
     Object getTuppingCount(Map<String, String> paramsMap) throws ParseException;
+
+    Result list(Map<String, String> paramsMap);
+
+    Result add(Map<String, String> paramsMap);
+
+    Result edit(Map<String, String> paramsMap);
+
+    Result remove(Map<String, String> paramsMap);
 }

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/BoardServiceImpl.java

@@ -0,0 +1,138 @@
+package com.huimv.env.produce.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.env.produce.entity.Board;
+import com.huimv.env.produce.mapper.BoardMapper;
+import com.huimv.env.produce.service.BoardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-11-01
+ */
+@Service
+public class BoardServiceImpl extends ServiceImpl<BoardMapper, Board> implements BoardService {
+    @Autowired
+    private BoardMapper boardMapper;
+    private static final String globalFarmCode = "14";
+
+    @Override
+    public Result getBoardCount(Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        if(farmCode == null){
+            farmCode = globalFarmCode;
+        }
+        QueryWrapper<Board> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+        Board board = boardMapper.selectOne(queryWrapper);
+        JSONObject resultJo = new JSONObject();
+        if(board == null){
+            resultJo.put("warningCount",0);
+            resultJo.put("tuppingCount",0);
+            resultJo.put("birthCount",0);
+            resultJo.put("weanCount",0);
+            resultJo.put("workplanCount",0);
+            resultJo.put("transferCount",0);
+            resultJo.put("generalImmunityCount",0);
+            resultJo.put("specialImmunityCount",0);
+        }else{
+            resultJo.put("warningCount",board.getWarningCount());
+            resultJo.put("tuppingCount",board.getTuppingCount());
+            resultJo.put("birthCount",board.getBirthCount());
+            resultJo.put("weanCount",board.getWeanCount());
+            resultJo.put("workplanCount",board.getWorkplanCount());
+            resultJo.put("transferCount",board.getTransferCount());
+            resultJo.put("generalImmunityCount",board.getGeneralImmunityCount());
+            resultJo.put("specialImmunityCount",board.getSpecialImmunityCount());
+        }
+        return new Result(ResultCode.SUCCESS,resultJo);
+    }
+
+    @Override
+    public Result save(Map<String, String> paramsMap) {
+        // specialImmunityCount
+        String specialImmunityCount = paramsMap.get("specialImmunityCount");
+        if(specialImmunityCount == null){
+            specialImmunityCount = "0";
+        }
+        // generalImmunityCount
+        String generalImmunityCount = paramsMap.get("generalImmunityCount");
+        if(generalImmunityCount == null){
+            generalImmunityCount = "0";
+        }
+        // birthCount
+        String birthCount = paramsMap.get("birthCount");
+        if(birthCount == null){
+            birthCount = "0";
+        }
+        // weanCount
+        String weanCount = paramsMap.get("weanCount");
+        if(weanCount == null){
+            weanCount = "0";
+        }
+        // tuppingCount
+        String tuppingCount = paramsMap.get("tuppingCount");
+        if(tuppingCount == null){
+            tuppingCount = "0";
+        }
+        // warningCount
+        String warningCount = paramsMap.get("warningCount");
+        if(warningCount == null){
+            warningCount = "0";
+        }
+        // workplanCount
+        String workplanCount = paramsMap.get("workplanCount");
+        if(workplanCount == null){
+            workplanCount = "0";
+        }
+        // transferCount
+        String transferCount = paramsMap.get("transferCount");
+        if(transferCount == null){
+            transferCount = "0";
+        }
+        String farmCode = paramsMap.get("farmCode");
+        if(farmCode == null){
+            farmCode = globalFarmCode;
+        }
+        QueryWrapper<Board> queryWrapper = new QueryWrapper();
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+        Board board = boardMapper.selectOne(queryWrapper);
+        if(board == null){
+            board = new Board();
+            board.setWarningCount(Integer.parseInt(warningCount));
+            board.setTuppingCount(Integer.parseInt(tuppingCount));
+            board.setBirthCount(Integer.parseInt(birthCount));
+            board.setWeanCount(Integer.parseInt(weanCount));
+            board.setWorkplanCount(Integer.parseInt(workplanCount));
+            board.setTransferCount(Integer.parseInt(transferCount));
+            board.setGeneralImmunityCount(Integer.parseInt(generalImmunityCount));
+            board.setSpecialImmunityCount(Integer.parseInt(specialImmunityCount));
+            board.setFarmCode(farmCode);
+            boardMapper.insert(board);
+        }else{
+            board.setWarningCount(Integer.parseInt(warningCount));
+            board.setTuppingCount(Integer.parseInt(tuppingCount));
+            board.setBirthCount(Integer.parseInt(birthCount));
+            board.setWeanCount(Integer.parseInt(weanCount));
+            board.setWorkplanCount(Integer.parseInt(workplanCount));
+            board.setTransferCount(Integer.parseInt(transferCount));
+            board.setGeneralImmunityCount(Integer.parseInt(generalImmunityCount));
+            board.setSpecialImmunityCount(Integer.parseInt(specialImmunityCount));
+            boardMapper.updateById(board);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+}

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/TuppingServiceImpl.java

@@ -1,12 +1,16 @@
 package com.huimv.env.produce.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.utils.DateUtil;
 import com.huimv.env.produce.entity.Tupping;
 import com.huimv.env.produce.entity.WarningInfo;
 import com.huimv.env.produce.mapper.TuppingMapper;
 import com.huimv.env.produce.service.TuppingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,4 +39,43 @@ public class TuppingServiceImpl extends ServiceImpl<TuppingMapper, Tupping> impl
         queryWrapper.orderByDesc("add_date");
         return tuppingMapper.selectCount(queryWrapper);
     }
+
+    @Override
+    public Result list(Map<String, String> paramsMap) {
+        //pageNo
+        String pageNo = "1";
+        if (StringUtils.isBlank(paramsMap.get("pageNo") + "")){
+            pageNo = paramsMap.get("pageNo") + "";
+        }
+        //pageSize
+        String pageSize = "10";
+        if (StringUtils.isBlank(paramsMap.get("pageSize") + "")) {
+            pageSize = paramsMap.get("pageSize") + "";
+        }
+        //
+        String farmCode = paramsMap.get("farmCode");
+        QueryWrapper<Tupping> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code",farmCode);
+        queryWrapper.orderByDesc("add_date").orderByDesc("id");
+        queryWrapper.last("LIMIT 1");
+        Page<Tupping> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, tuppingMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public Result add(Map<String, String> paramsMap) {
+        Tupping tupping = new Tupping();
+        tuppingMapper.insert(tupping);
+        return null;
+    }
+
+    @Override
+    public Result edit(Map<String, String> paramsMap) {
+        return null;
+    }
+
+    @Override
+    public Result remove(Map<String, String> paramsMap) {
+        return null;
+    }
 }