新增手工填报存栏功能

huimv-farm-produce/pom.xml

@@ -64,28 +64,33 @@
 <!--            <artifactId>hutool-all</artifactId>-->
 <!--            <version>5.7.11</version>-->
 <!--        </dependency>-->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.31</version>
+        </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.freemarker</groupId>-->
-<!--            <artifactId>freemarker</artifactId>-->
-<!--            <version>2.3.28</version>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
-<!--            <version>3.4.2</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>mybatis-plus-extension</artifactId>-->
-<!--            <version>3.4.2</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>mybatis-plus-generator</artifactId>-->
-<!--            <version>3.2.0</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <!-- velocity -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.0</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.projectlombok</groupId>-->
 <!--            <artifactId>lombok</artifactId>-->

huimv-farm-produce/src/main/java/com/huimv/produce/produce/controller/ProdWorkPlanController.java

@@ -58,7 +58,7 @@ public class ProdWorkPlanController {
             }
         }
         ProdWorkPlan prodWorkPlan = new ProdWorkPlan();
-        prodWorkPlan.setPlanTimes(warningMsgService.count(new QueryWrapper<ProdWarningMsg>().eq("farm_id", farmId).eq("add_time", DataUill.getTimesmorning())));
+        prodWorkPlan.setPlanTimes((int)warningMsgService.count(new QueryWrapper<ProdWarningMsg>().eq("farm_id", farmId).eq("add_time", DataUill.getTimesmorning())));
         prodWorkPlan.setPlanName("报警计划");
 
         endMap.put("warning",prodWorkPlan);

huimv-farm-produce/src/main/java/com/huimv/produce/produce/controller/ProdWriteStockController.java

@@ -0,0 +1,39 @@
+package com.huimv.produce.produce.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.produce.produce.service.ProdWriteStockService;
+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>
+ * 前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-11-08
+ */
+@RestController
+@RequestMapping("/prodWriteStock")
+public class ProdWriteStockController {
+    @Autowired
+    private ProdWriteStockService prodWriteStockService;
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map map) {
+        return prodWriteStockService.list(map);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody Map map) {
+        return prodWriteStockService.add(map);
+    }
+}
+

huimv-farm-produce/src/main/java/com/huimv/produce/produce/entity/ProdWriteStock.java

@@ -0,0 +1,42 @@
+package com.huimv.produce.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-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ProdWriteStock implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer farmId;
+
+    private Integer allStock;
+
+    private Integer pigletStock;
+
+    private Integer sowStock;
+
+    private Integer fatStock;
+
+    private Integer boarStock;
+
+    private Integer outStock;
+
+
+}

huimv-farm-produce/src/main/java/com/huimv/produce/produce/mapper/ProdWriteStockMapper.java

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

huimv-farm-produce/src/main/java/com/huimv/produce/produce/mapper/xml/ProdWriteStockMapper.xml

@@ -0,0 +1,22 @@
+<?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.produce.produce.mapper.ProdWriteStockMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.produce.produce.entity.ProdWriteStock">
+        <id column="id" property="id" />
+        <result column="farm_id" property="farmId" />
+        <result column="all_stock" property="allStock" />
+        <result column="piglet_stock" property="pigletStock" />
+        <result column="sow_stock" property="sowStock" />
+        <result column="fat_stock" property="fatStock" />
+        <result column="boar_stock" property="boarStock" />
+        <result column="out_stock" property="outStock" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_id, all_stock, piglet_stock, sow_stock, fat_stock, boar_stock, out_stock
+    </sql>
+
+</mapper>

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/ProdWriteStockService.java

@@ -0,0 +1,22 @@
+package com.huimv.produce.produce.service;
+
+import com.huimv.common.utils.Result;
+import com.huimv.produce.produce.entity.ProdWriteStock;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-11-08
+ */
+public interface ProdWriteStockService extends IService<ProdWriteStock> {
+
+    Result list(Map map);
+
+    Result add(Map map);
+}

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/ProdWriteStockServiceImpl.java

@@ -0,0 +1,32 @@
+package com.huimv.produce.produce.service.impl;
+
+import com.huimv.common.utils.Result;
+import com.huimv.produce.produce.entity.ProdWriteStock;
+import com.huimv.produce.produce.mapper.ProdWriteStockMapper;
+import com.huimv.produce.produce.service.ProdWriteStockService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-11-08
+ */
+@Service
+public class ProdWriteStockServiceImpl extends ServiceImpl<ProdWriteStockMapper, ProdWriteStock> implements ProdWriteStockService {
+
+    @Override
+    public Result list(Map map) {
+        return null;
+    }
+
+    @Override
+    public Result add(Map map) {
+        return null;
+    }
+}

huimv-farm-produce/src/main/java/com/huimv/produce/warning/controller/SysThresholdController.java

@@ -36,7 +36,6 @@ public class SysThresholdController {
             thresholdService.updateById(threshold);
         }
 
-
         return new Result(10000,"设置成功",true);
     }
 

huimv-farm-produce/src/main/resources/application-lishui.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8094
+spring:
+  application:
+    name: huimv-farm-produce
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://192.168.1.7:3306/huimv-lishui?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

huimv-farm-produce/src/main/resources/application.properties

@@ -1,7 +1,8 @@
 #spring.profiles.active=dev
 #spring.profiles.active=demo
-spring.profiles.active=prod
+#spring.profiles.active=prod
 #spring.profiles.active=prod2
+spring.profiles.active=lishui
 
 weight.http=http://39.171.45.196:9200
 weight.path=/egg/getWeightDetails

huimv-farm-produce/src/test/java/com.huimv.produce/service/CodeGenerator.java

@@ -0,0 +1,125 @@
+package com.huimv.produce.service;
+
+/**
+ * @Project :
+ * @Package :
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create :
+ **/
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
+import com.baomidou.mybatisplus.generator.config.GlobalConfig;
+import com.baomidou.mybatisplus.generator.config.PackageConfig;
+import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import org.junit.platform.commons.util.StringUtils;
+
+import java.util.Scanner;
+
+public class CodeGenerator {
+    // user defined
+    private static String childProjectPath = "/huimv-farm-produce";
+    private static String rootPackage = "com.huimv.produce.produce";
+    private static String dbIp = "192.168.1.7";
+    private static String dbPort = "3306";
+    private static String dbName = "huimv-lishui";
+    private static String driverName = "com.mysql.cj.jdbc.Driver";
+    private static String username = "root";
+    private static String password = "hm123456";
+
+    public static String scanner(String tip) {
+        Scanner scanner = new Scanner(System.in);
+        StringBuilder help = new StringBuilder();
+        help.append("请输入" + tip + "：");
+        System.out.println(help.toString());
+        if (scanner.hasNext()) {
+            String ipt = scanner.next();
+            if (StringUtils.isNotBlank(ipt)) {
+                return ipt;
+            }
+        }
+        throw new MybatisPlusException("请输入正确的" + tip + "！");
+    }
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        String rootPath = System.getProperty("user.dir");
+        System.out.println("rootPath + childProjectPath="+rootPath + childProjectPath);
+        gc.setOutputDir(rootPath + childProjectPath + "/src/main/java");//设置代码生成路径
+        gc.setFileOverride(true);//是否覆盖以前文件
+        gc.setOpen(false);//是否打开生成目录
+        gc.setAuthor("zn");//设置项目作者名称
+        gc.setIdType(IdType.AUTO);//设置主键策略
+        gc.setBaseResultMap(true);//生成基本ResultMap
+        gc.setBaseColumnList(true);//生成基本ColumnList
+        gc.setServiceName("%sService");//去掉服务默认前缀
+        gc.setDateType(DateType.ONLY_DATE);//设置时间类型
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        String url = "jdbc:mysql://"+dbIp+":"+dbPort+"/"+dbName+"?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai";
+        System.out.println("url="+url);
+        System.out.println("driverName="+driverName);
+        System.out.println("username="+username);
+        System.out.println("password="+password);
+        dsc.setUrl(url);
+        dsc.setDriverName(driverName);
+        dsc.setUsername(username);
+        dsc.setPassword(password);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setParent(rootPackage);
+        pc.setMapper("mapper");
+        pc.setXml("mapper.xml");
+//        pc.setEntity("pojo");
+        pc.setEntity("entity");
+        pc.setService("service");
+        pc.setServiceImpl("service.impl");
+        pc.setController("controller");
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig sc = new StrategyConfig();
+        sc.setNaming(NamingStrategy.underline_to_camel);
+        sc.setColumnNaming(NamingStrategy.underline_to_camel);
+        sc.setEntityLombokModel(true);//自动lombok
+        sc.setRestControllerStyle(true);
+        sc.setControllerMappingHyphenStyle(true);
+
+        sc.setLogicDeleteFieldName("deleted");//设置逻辑删除
+
+        //设置自动填充配置
+//        TableFill gmt_create = new TableFill("create_time", FieldFill.INSERT);
+//        TableFill gmt_modified = new TableFill("update_time", FieldFill.INSERT_UPDATE);
+//        ArrayList<TableFill> tableFills=new ArrayList<>();
+//        tableFills.add(gmt_create);
+//        tableFills.add(gmt_modified);
+//        sc.setTableFillList(tableFills);
+
+        //乐观锁
+        sc.setVersionFieldName("version");
+        sc.setRestControllerStyle(true);//驼峰命名
+
+
+
+        //  sc.setTablePrefix("tbl_"); 设置表名前缀
+        sc.setInclude(scanner("表名，多个英文逗号分割").split(","));
+        mpg.setStrategy(sc);
+
+        // 生成代码
+        mpg.execute();
+    }
+
+}