wwh 1 год назад
Родитель
Сommit
4ed3300858

+ 5 - 1
huimv-admin/src/main/java/com/huimv/admin/service/impl/AuthorizeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.admin.common.utils.ConstUtil;
@@ -216,7 +217,10 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
     @Override
     public List<String> getMyButton(Integer userId, Integer farmId) {
         Farm farm = farmMapper.selectById(farmId);
-        String farmMenu = farm.getFarmMenu();
+        String farmMenu = "";
+        if (ObjectUtil.isNotEmpty(farm)) {
+            farmMenu = farm.getFarmMenu();
+        }
         if (userId == 1){
             List<Menu> menus = menuMapper.selectList(null);
             List<String> list = new ArrayList<>();

+ 7 - 1
huimv-admin/src/main/java/com/huimv/admin/service/impl/FeedAreaServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -313,7 +314,12 @@ public class FeedAreaServiceImpl extends ServiceImpl<FeedAreaMapper, FeedArea> i
             format = "0.00";
         }
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("pigNum", pig.getNumber());
+        if (ObjectUtil.isNotEmpty(pig)) {
+            jsonObject.put("pigNum", pig.getNumber());
+        } else {
+            jsonObject.put("pigNum", 0);
+        }
+
         jsonObject.put("feedEnv", envs.size());
         jsonObject.put("online", online);
         jsonObject.put("rank", format);

+ 75 - 0
huimv-admin/src/main/resources/application-prod2.yml

@@ -0,0 +1,75 @@
+server:
+  port: 8011
+
+
+spring:
+  application:
+    name: huimv-admin
+
+
+  servlet:
+    multipart:
+      max-request-size: 100MB
+      max-file-size: 10MB
+
+  datasource:
+    druid:
+      url: jdbc:mysql://122.112.224.199:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: hm123456
+      driver-class-name: com.mysql.cj.jdbc.Driver
+#      filters: config
+#      connect-properties:
+#        config.decrypt: true
+#        config.decrypt.key: ${spring.datasource.druid.publickey}
+#      remove-abandoned-timeout: 120
+#    type: com.alibaba.druid.pool.DruidDataSource
+
+
+  #配置rabbitMq 服务器
+#  rabbitmq:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+
+  #redis
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+  reactor:
+    debug-agent:
+      enabled: true
+#  Nacos 配置
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 192.168.1.68:8848 #配置nacos地址
+
+
+
+
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+
+#img:
+#  url: https://img.ifarmcloud.com/images/
+#  basePath: /home/huimv/img/
+#  ip: 139.9.172.209
+#  user:  huimv
+#  password: "!hm123@1"
+#  port: 22
+img:
+  url: https://img.ifarmcloud.com/images/
+  basePath: /home/huimv/img/
+  ip: 119.3.44.183
+  user:  huimv
+  password: "!hm123@1"
+  port: 22