Merge remote-tracking branch 'origin/master'

# Conflicts:
#	huimv-cattle/src/main/java/com/huimv/cattle/HuimvCattleApplication.java
#	huimv-cattle/src/main/resources/application-dev.yml

huimv-cattle/pom.xml

@@ -21,7 +21,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.6-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -147,15 +151,25 @@
                 <version>2.6</version>
             </plugin>
         </plugins>
+        <!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
         <resources>
             <resource>
                 <directory>src/main/java</directory>
                 <includes>
+                    <include>**/*.yml</include>
+                    <include>**/*.properties</include>
                     <include>**/*.xml</include>
                 </includes>
+                <filtering>false</filtering>
             </resource>
             <resource>
                 <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.yml</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
             </resource>
         </resources>
     </build>

huimv-cattle/src/main/java/com/huimv/cattle/HuimvCattleApplication.java

@@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-@MapperScan("com.huimv.cattle.mapper")
+@MapperScan(basePackages ="com.huimv.cattle.mapper")
 public class HuimvCattleApplication {
 
     public static void main(String[] args) {

huimv-cattle/src/main/java/com/huimv/cattle/controller/PreventDetectionController.java

@@ -1,6 +1,11 @@
 package com.huimv.cattle.controller;
 
 
+import com.huimv.cattle.pojo.PreventDetection;
+import com.huimv.cattle.service.PreventDetectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -14,8 +19,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-12-14
  */
 @RestController
-@RequestMapping("/prevent-detection")
+@RequestMapping("/preventDetection")
 public class PreventDetectionController {
+    @Autowired
+    private PreventDetectionService preventDetectionService;
+
+    @PostMapping("/add")
+    public void  add(@RequestBody PreventDetection preventDetection){
+//        Validator.notNull(clientId, ErrorCode.INPUT_PARAMETERS_NULL);
+        preventDetectionService.save(preventDetection);
+    }
 
 }
 

huimv-cattle/src/main/java/com/huimv/cattle/controller/StockController.java

@@ -1,10 +1,18 @@
 package com.huimv.cattle.controller;
 
 
+import com.huimv.cattle.service.StockService;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +22,18 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-12-14
  */
 @RestController
-@RequestMapping("/stock")
+@RequestMapping("/v1.0.0/all")
 public class StockController {
+    @Autowired
+    private StockService stockService;
+    @PostMapping("/getStock")
+    public Result list(@RequestBody Map<String,String> paramsMap) {
+        return stockService.getStock(paramsMap);
+    }
 
+    @PostMapping("/saveStock")
+    public Result saveStock(@RequestBody Map<String,String> paramsMap) {
+        return stockService.add(paramsMap);
+    }
 }
 

huimv-cattle/src/main/java/com/huimv/cattle/controller/StockStatusController.java

@@ -1,10 +1,18 @@
 package com.huimv.cattle.controller;
 
 
+import com.huimv.cattle.pojo.StockStatus;
+import com.huimv.cattle.service.StockStatusService;
+import com.huimv.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+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.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -16,6 +24,18 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/stock-status")
 public class StockStatusController {
+    @Autowired
+    private StockStatusService stockStatusService;
+
+    @PostMapping("/getStockStatus")
+    public Result getStockStatus(){
+        return stockStatusService.getStockStatus();
+    }
 
+    @PostMapping("/saveStockStatus")
+    public Result saveStockStatus(@RequestBody StockStatus stockStatus){
+        return stockStatusService.saveStockStatus(stockStatus);
+    }
+    
 }
 

huimv-cattle/src/main/java/com/huimv/cattle/mapper/StockMapper.java

@@ -2,6 +2,10 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.Stock;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import javax.xml.transform.Result;
+import java.util.Map;
 
 /**
  * <p>
@@ -11,6 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zn
  * @since 2022-12-14
  */
+@Repository
 public interface StockMapper extends BaseMapper<Stock> {
 
+    Stock getList();
 }

huimv-cattle/src/main/java/com/huimv/cattle/mapper/StockStatusMapper.java

@@ -2,6 +2,7 @@ package com.huimv.cattle.mapper;
 
 import com.huimv.cattle.pojo.StockStatus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author zn
  * @since 2022-12-14
  */
+@Repository
 public interface StockStatusMapper extends BaseMapper<StockStatus> {
 
 }

huimv-cattle/src/main/java/com/huimv/cattle/mapper/xml/StockMapper.xml

@@ -14,5 +14,8 @@
     <sql id="Base_Column_List">
         id, fat_stock, cow_stock, bull_stock
     </sql>
+    <select id="getList" resultType="com.huimv.cattle.pojo.Stock">
+        select * from  stock
+    </select>
 
 </mapper>

huimv-cattle/src/main/java/com/huimv/cattle/pojo/StockStatus.java

@@ -21,13 +21,16 @@ public class StockStatus implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    //种牛存栏
     private Integer breedStock;
 
+    //犊牛存栏
     private Integer calfStock;
 
+    //育成牛存栏
     private Integer raiseStock;
 
 

huimv-cattle/src/main/java/com/huimv/cattle/service/StockService.java

@@ -2,6 +2,11 @@ package com.huimv.cattle.service;
 
 import com.huimv.cattle.pojo.Stock;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+
+import javax.servlet.http.HttpServletRequest;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-12-14
  */
 public interface StockService extends IService<Stock> {
+    Result getStock(Map<String,String> paramsMap);
 
+    Result add(Map<String,String> paramsMap);
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/StockStatusService.java

@@ -2,6 +2,9 @@ package com.huimv.cattle.service;
 
 import com.huimv.cattle.pojo.StockStatus;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface StockStatusService extends IService<StockStatus> {
 
+    Result getStockStatus();
+
+    Result saveStockStatus(StockStatus stockStatus);
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/StockServiceImpl.java

@@ -1,11 +1,20 @@
 package com.huimv.cattle.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.huimv.cattle.pojo.Stock;
 import com.huimv.cattle.mapper.StockMapper;
 import com.huimv.cattle.service.StockService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+
+import java.text.NumberFormat;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,60 @@ import org.springframework.stereotype.Service;
 @Service
 public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements StockService {
 
+    @Autowired
+    StockMapper stockMapper;
+    @Override
+    public Result getStock(Map<String, String> paramsMap) {
+        Stock stock = stockMapper.getList();
+        JSONObject jsonObject = new JSONObject();
+        if (ObjectUtil.isEmpty(stock)) {
+            jsonObject.put("fatStock", 0);
+            jsonObject.put("cowStock", 0);
+            jsonObject.put("bullStock", 0);
+            jsonObject.put("count", 0);
+            jsonObject.put("fat", 0);
+            jsonObject.put("cow", 0);
+            jsonObject.put("bull", 0);
+        } else {
+            Integer count=stock.getFatStock()+stock.getBullStock()+stock.getCowStock();
+            //创建一个数值格式化对象
+            NumberFormat numberFormat = NumberFormat.getInstance();
+            //设置精确到小数点后2位
+            numberFormat.setMaximumFractionDigits(2);
+            String fat=numberFormat.format((float)stock.getFatStock() / (float)count * 100) + "%";
+            String cow=numberFormat.format((float)stock.getCowStock() / (float)count * 100) + "%";
+            String bull=numberFormat.format((float)stock.getBullStock() /(float) count * 100) + "%";
+            jsonObject.put("fatStock", stock.getFatStock());
+            jsonObject.put("cowStock", stock.getCowStock());
+            jsonObject.put("bullStock", stock.getBullStock());
+            jsonObject.put("count", count);
+            jsonObject.put("fat", fat);
+            jsonObject.put("cow", cow);
+            jsonObject.put("bull", bull);
+        }
+        return new Result(ResultCode.SUCCESS,jsonObject);
+    }
+
+    @Override
+    public Result add(Map<String, String> paramsMap) {
+        Integer fatStock = Integer.parseInt(paramsMap.get("fatStock"));
+        Integer cowStock = Integer.parseInt(paramsMap.get("cowStock"));
+        Integer bullStock = Integer.parseInt(paramsMap.get("bullStock"));
+        String id = paramsMap.get("id");
+        if (ObjectUtil.isEmpty(stockMapper.selectById(id))) {
+            Stock stock = new Stock();
+            stock.setFatStock(fatStock);
+            stock.setCowStock(cowStock);
+            stock.setBullStock(bullStock);
+            stockMapper.insert(stock);
+            return new Result(ResultCode.SUCCESS);
+        } else {
+            Stock stock = stockMapper.selectById(id);
+            stock.setFatStock(fatStock);
+            stock.setCowStock(cowStock);
+            stock.setBullStock(bullStock);
+            stockMapper.updateById(stock);
+            return new Result(ResultCode.SUCCESS);
+        }
+    }
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/StockStatusServiceImpl.java

@@ -1,11 +1,19 @@
 package com.huimv.cattle.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.cattle.mapper.StockMapper;
 import com.huimv.cattle.pojo.StockStatus;
 import com.huimv.cattle.mapper.StockStatusMapper;
 import com.huimv.cattle.service.StockStatusService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +25,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class StockStatusServiceImpl extends ServiceImpl<StockStatusMapper, StockStatus> implements StockStatusService {
 
+    @Autowired
+    private StockStatusMapper stockStatusMapper;
+
+    @Override
+    public Result getStockStatus() {
+        QueryWrapper<StockStatus> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id").last("limit 1");
+        StockStatus stockStatus = stockStatusMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isEmpty(stockStatus)){
+            stockStatus = new StockStatus();
+            stockStatus.setBreedStock(0);
+            stockStatus.setCalfStock(0);
+            stockStatus.setRaiseStock(0);
+            stockStatusMapper.insert(stockStatus);
+        }
+        return new Result(ResultCode.SUCCESS,stockStatus);
+    }
+
+    @Override
+    public Result saveStockStatus(StockStatus stockStatus) {
+        stockStatusMapper.insert(stockStatus);
+        return new Result(ResultCode.SUCCESS);
+    }
 }

huimv-cattle/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-farm-cattle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-farm-cattle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver