Newspaper vor 1 Jahr
Ursprung
Commit
5fd8a31889

+ 9 - 0
huimv-cattle/src/main/java/com/huimv/cattle/service/impl/OverviewServiceImpl.java

@@ -172,6 +172,15 @@ public class OverviewServiceImpl extends ServiceImpl<OverviewMapper, Overview> i
             queryWrapper.eq("farm_code", farmCode);
             overview = overviewMapper.selectOne(queryWrapper);
             stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("farm_code",farmCode));
+            if (ObjectUtil.isEmpty(stock)){
+                stock = new Stock();
+                stock.setBullStock(0);
+                stock.setCowStock(0);
+                stock.setFatStock(0);
+                stock.setFarmCode(farmCode);
+                stockMapper.insert(stock);
+            }
+
             List<IndustryOutput> industryOutputs = industryOutputMapper.selectList(new QueryWrapper<IndustryOutput>().eq("farm_code", farmCode));
             for (IndustryOutput industryOutput : industryOutputs) {
                 allMoney += industryOutput.getSalesMoney().intValue();

+ 1 - 0
huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SysFarmServiceImpl.java

@@ -488,6 +488,7 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
     //获取所有乡镇信息
     private JSONArray getAllTowns() {
         QueryWrapper<SysFarm> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type",1);
         queryWrapper.orderByAsc("id");
         List<SysFarm> sysFarmList = sysFarmMapper.selectList(queryWrapper);
         JSONArray townsJa = new JSONArray();

+ 114 - 0
huimv-cattle/src/main/resources/application-demo.yml

@@ -0,0 +1,114 @@
+server:
+  port: 10011
+spring:
+  application:
+    name: huimv-eartag2-manage2
+
+  datasource:
+    url: jdbc:mysql://36.133.104.13:3306/huimv-farm-cattle-test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: Admin2023!
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+
+
+  #配置rabbitMq 服务器
+#  rabbitmq:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+  #redis
+#  redis:
+#    database: 0
+#    host: 192.168.1.68
+#    port: 6379
+#    password: hm123456
+#    timeout: 5000ms
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+#    lettuce:
+#      pool:
+#        max-active: 3
+#        min-idle: 2
+#        max-idle: 3
+#        max-wait: 1
+#      shutdown-timeout: 100
+
+#  data:
+#    redis:
+#      repositories:
+#        enabled: false
+
+  #是否缓存空值
+#  cache:
+#    redis:
+#      cache-null-values: false
+    #server:
+#  port: 9110
+#spring:
+#  application:
+#    name: huimv-hy-autoGetData
+#
+#  datasource:
+##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?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:
+#    properties:
+#      hibernate:
+#        enable_lazy_load_no_trans: true
+#    show-sql: true
+#    database: mysql
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    open-in-view: true
+
+#  rabbitmq:
+#    host: 121.36.134.218
+#    port: 5672
+#    username: admin
+#    password: admin
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /registration_center
+#    listener:
+#      simple:
+#        acknowledge-mode: none
+#
+#  #redis
+#  redis:
+#    database: 0
+#    host: 122.112.224.199
+#    port: 6379
+#    password: hm123456
+#    timeout: 5000ms
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  # mapper.xml文件所存放的位置
+  mapper-locations: classpath*:com/huimv/cattle/mapper/xml/*.xml  # 不加这一行出错:“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”

+ 1 - 0
huimv-cattle/src/main/resources/application-prod3.yml

@@ -9,6 +9,7 @@ spring:
     username: root
     password: Admin2023!
     driver-class-name: com.mysql.cj.jdbc.Driver
+
   jpa:
     show-sql: true
     database: mysql

+ 1 - 0
huimv-cattle/src/main/resources/application.properties

@@ -2,6 +2,7 @@
 #spring.profiles.active=prod
 #spring.profiles.active=prod2
 spring.profiles.active=prod3
+#spring.profiles.active=demo
 
 manager.defaultPassword=123456
 user.defaultPassword=123456