zhuoning 2 лет назад
Родитель
Сommit
49129fc4b1
32 измененных файлов с 220 добавлено и 253 удалено
  1. 0 34
      huimv-env-platform/application.properties
  2. 0 0
      huimv-env-platform/doc/对青山项目.txt
  3. 2 2
      huimv-env-platform/huimv-env-device/src/main/resources/application-prod.yml
  4. 2 2
      huimv-env-platform/huimv-env-input/src/main/resources/application-prod.yml
  5. 2 2
      huimv-env-platform/huimv-env-lamp/src/main/resources/application-prod.yml
  6. 2 2
      huimv-env-platform/huimv-env-manage/src/main/resources/application-prod.yml
  7. 83 106
      huimv-env-platform/application-dev.yml
  8. 2 1
      huimv-env-platform/huimv-env-manage/src/main/resources/application.properties
  9. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/BirthController.java
  10. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/BoardController.java
  11. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/CostController.java
  12. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/DataSourceController.java
  13. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/EliminateDetailController.java
  14. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/FeedDayController.java
  15. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/FeedMonthController.java
  16. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/GeneralImmunityPlanController.java
  17. 8 3
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/IndicatorController.java
  18. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/ReminderController.java
  19. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/SalesDetailController.java
  20. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/SpecialImmunityPlanController.java
  21. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/StockDetailController.java
  22. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/TransferController.java
  23. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/TuppingController.java
  24. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/WarningInfoController.java
  25. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/WeanController.java
  26. 0 1
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/WorkplanController.java
  27. 2 0
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/IndicatorService.java
  28. 32 0
      huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/IndicatorServiceImpl.java
  29. 1 1
      huimv-env-platform/huimv-env-produce/src/main/resources/application-dev.yml
  30. 3 3
      huimv-env-platform/huimv-env-produce/src/main/resources/application-prod.yml
  31. 79 79
      huimv-env-platform/application-prod.yml
  32. 2 1
      huimv-env-platform/huimv-env-produce/src/main/resources/application.properties

+ 0 - 34
huimv-env-platform/application.properties

@@ -1,34 +0,0 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
-
-# mysql:/cache:
-device.online.access_mode=mysql
-
-# \uFFFD\uFFFD\u04FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u8C78\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD
-cache.chipIdExpire=48
-
-###################################################\uFFFD\uFFFD\uFFFD\uFFFDundertow\u0221\uFFFD\uFFFDtomcat
-# \uFFFD\u01F7\uFFFD\uFFFD undertow \uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA false
-server.undertow.accesslog.enabled=false
-# \uFFFD\uFFFD\uFFFD\u00F7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\u013F\u00BC
-server.undertow.accesslog.dir=logs
-# \u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0335\uFFFD I/0 \uFFFD\u07F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA 2 \uFFFD\uFFFD\uFFFD\uFFFD CPU \uFFFD\u0138\uFFFD\uFFFD\uFFFD
-server.undertow.io-threads=
-# \u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0338\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA I/O \uFFFD\u07F3\u0338\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD 8 \uFFFD\uFFFD
-server.undertow.worker-threads=
-# \uFFFD\uFFFD\uFFFD\uFFFD HTTP POST \uFFFD\uFFFD\uFFFD\u0775\uFFFD\uFFFD\uFFFD\uDB8E\uDD36\u0223\uFFFD\u012C\uFFFD\u03F2\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-server.undertow.max-http-post-size=0
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 0
huimv-env-platform/doc/对青山项目.txt


+ 2 - 2
huimv-env-platform/huimv-env-device/src/main/resources/application-prod.yml

@@ -7,8 +7,8 @@ spring:
 
   datasource:
     url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
+    username: qingshan
+    password: qingshan@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     show-sql: true

+ 2 - 2
huimv-env-platform/huimv-env-input/src/main/resources/application-prod.yml

@@ -7,8 +7,8 @@ spring:
 
   datasource:
     url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
+    username: qingshan
+    password: qingshan@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     show-sql: true

+ 2 - 2
huimv-env-platform/huimv-env-lamp/src/main/resources/application-prod.yml

@@ -7,8 +7,8 @@ spring:
 
   datasource:
     url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
+    username: qingshan
+    password: qingshan@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     show-sql: true

+ 2 - 2
huimv-env-platform/huimv-env-manage/src/main/resources/application-prod.yml

@@ -10,8 +10,8 @@ spring:
 
   datasource:
     url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
+    username: qingshan
+    password: qingshan@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     show-sql: true

+ 83 - 106
huimv-env-platform/application-dev.yml

@@ -1,106 +1,83 @@
-server:
-  port: 8098
-spring:
-  application:
-    name: huimv-env-produce
-
-  datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-produce-platform?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:
-    show-sql: true
-    database: mysql
-    hibernate:
-      ddl-auto: none
-
-    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: /
-#    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://192.168.1.7: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/env/manage/mapper/xml/*.xml  # 不加这一行出错:“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+server:
+  port: 10063
+#  ssl:
+#    key-store: classpath:8717089_qingshan.ifarmcloud.com.jks
+#    key-store-type: jks
+#    key-store-password: QYCEc3uL
+spring:
+  application:
+    name: huimv-env-manage
+
+  datasource:
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: qingshan
+    password: qingshan@2022
+    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: /
+#  rabbitmq:
+#    host: 192.168.1.82
+#    port: 5672
+#    username: admin
+#    password: admin
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /env
+
+    #确认消息已发送到交换机(Exchange)
+#    publisher-confirms: true #(过时、弃用)
+#    publisher-confirm-type: correlated
+#    #确认消息已发送到队列(Queue)
+#    publisher-returns: true
+
+  #redis
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #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://192.168.1.7: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
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"   # * 在yaml 文件属于关键字,所以需要加引号
+

+ 2 - 1
huimv-env-platform/huimv-env-manage/src/main/resources/application.properties

@@ -1,5 +1,6 @@
 #spring.profiles.active=dev
-spring.profiles.active=prod
+#spring.profiles.active=prod
+spring.profiles.active=qingshan
 
 # mysql:/cache:
 device.online.access_mode=mysql

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/BirthController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/birth")
 public class BirthController {

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

@@ -21,7 +21,6 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/v1.0.0/board")
-@CrossOrigin
 public class BoardController {
     @Autowired
     private WarningInfoService warningInfoService;

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/CostController.java

@@ -17,7 +17,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/cost")
 public class CostController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/DataSourceController.java

@@ -17,7 +17,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-11-01
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/datasource")
 public class DataSourceController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/EliminateDetailController.java

@@ -19,7 +19,6 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/v1.0.0/eliminate")
-@CrossOrigin
 public class EliminateDetailController {
     @Autowired
     private EliminateDetailService eliminateDetailService;

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/FeedDayController.java

@@ -20,7 +20,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-11-03
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/feed")
 public class FeedDayController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/FeedMonthController.java

@@ -18,7 +18,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-11-03
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/feedMonth")
 public class FeedMonthController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/GeneralImmunityPlanController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/general-immunity-plan")
 public class GeneralImmunityPlanController {

+ 8 - 3
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/IndicatorController.java

@@ -18,7 +18,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/indicator")
 public class IndicatorController {
@@ -61,10 +60,16 @@ public class IndicatorController {
         return indicatorService.findIndicator(paramsMap);
     }
 
+//    @PostMapping("/preserve")
+//    public Result preserve(@RequestBody Indicator indicator) throws ParseException {
+//        //
+//        return indicatorService.preserve(indicator);
+//    }
+
     @PostMapping("/preserve")
-    public Result preserve(@RequestBody Indicator indicator) throws ParseException {
+    public Result preserve(@RequestBody Map<String, String> paramsMap) throws ParseException {
         //
-        return indicatorService.preserve(indicator);
+        return indicatorService.preserve(paramsMap);
     }
 }
 

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/ReminderController.java

@@ -28,7 +28,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-11-02
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/reminder")
 public class ReminderController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/SalesDetailController.java

@@ -28,7 +28,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-11-01
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/sales")
 public class SalesDetailController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/SpecialImmunityPlanController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/special-immunity-plan")
 public class SpecialImmunityPlanController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/StockDetailController.java

@@ -27,7 +27,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-11-01
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/stock")
 public class StockDetailController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/TransferController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/transfer")
 public class TransferController {

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

@@ -17,7 +17,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/tupping")
 public class TuppingController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/WarningInfoController.java

@@ -17,7 +17,6 @@ import java.util.Map;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/v1.0.0/warningInfo")
 public class WarningInfoController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/WeanController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/wean")
 public class WeanController {

+ 0 - 1
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/WorkplanController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @author zn
  * @since 2022-10-30
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/workplan")
 public class WorkplanController {

+ 2 - 0
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/IndicatorService.java

@@ -29,4 +29,6 @@ public interface IndicatorService extends IService<Indicator> {
     Result findIndicator(Map<String,String> paramsMap);
 
     Result preserve(Indicator indicator);
+
+    Result preserve(Map<String, String> paramsMap);
 }

+ 32 - 0
huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/IndicatorServiceImpl.java

@@ -218,6 +218,38 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
         }
         return new Result(ResultCode.SUCCESS);
     }
+
+    @Override
+    public Result preserve(Map<String, String> paramsMap) {
+        System.out.println("paramsMap >> "+paramsMap.toString());
+        String farmCode = paramsMap.get("farmId");
+        if (farmCode==null) {
+            farmCode = globalFarmCode;
+        }
+        QueryWrapper<Indicator> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+        Indicator indicator1 = indicatorMapper.selectOne(queryWrapper);
+        if (indicator1 != null) {
+            indicator1.setRoomSurvRate(new BigDecimal(paramsMap.get("roomSurvRate")+""));
+            indicator1.setConservSurvRate(new BigDecimal(paramsMap.get("conservSurvRate")+""));
+            indicator1.setFatSurvRate(new BigDecimal(paramsMap.get("fatSurvRate")+""));
+            indicator1.setDismatchRate(new BigDecimal(paramsMap.get("dismatchRate")+""));
+            indicator1.setMatingRate(new BigDecimal(paramsMap.get("matingRate")+""));
+            indicator1.setPsy(new BigDecimal(paramsMap.get("psy")+""));
+            baseMapper.updateById(indicator1);
+        } else {
+            indicator1 = new Indicator();
+            indicator1.setRoomSurvRate(new BigDecimal(paramsMap.get("roomSurvRate")+""));
+            indicator1.setConservSurvRate(new BigDecimal(paramsMap.get("conservSurvRate")+""));
+            indicator1.setFatSurvRate(new BigDecimal(paramsMap.get("fatSurvRate")+""));
+            indicator1.setDismatchRate(new BigDecimal(paramsMap.get("dismatchRate")+""));
+            indicator1.setMatingRate(new BigDecimal(paramsMap.get("matingRate")+""));
+            indicator1.setPsy(new BigDecimal(paramsMap.get("psy")+""));
+            indicator1.setFarmCode(farmCode);
+            baseMapper.insert(indicator1);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
 /*
     @Override
     public Result save(Map<String, String> paramMap) {

+ 1 - 1
huimv-env-platform/huimv-env-produce/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8098
+  port: 8097
 spring:
   application:
     name: huimv-env-produce

+ 3 - 3
huimv-env-platform/huimv-env-produce/src/main/resources/application-prod.yml

@@ -5,9 +5,9 @@ spring:
     name: huimv-env-produce
 
   datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-produce-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
+    url: jdbc:mysql://122.112.224.199:3306/huimv-produce-platform-qingshan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: qingshan
+    password: qingshan@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     show-sql: true

+ 79 - 79
huimv-env-platform/application-prod.yml

@@ -1,79 +1,79 @@
-server:
-  port: 8098
-spring:
-  application:
-    name: huimv-env-produce
-
-  datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-produce-platform?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:
-    show-sql: true
-    database: mysql
-    hibernate:
-      ddl-auto: none
-    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: /
-#  rabbitmq:
-#    host: 192.168.1.82
-#    port: 5672
-#    username: admin
-#    password: admin
-#    #虚拟host 可以不设置,使用server默认host
-#    virtual-host: /env
-
-    #确认消息已发送到交换机(Exchange)
-#    publisher-confirms: true #(过时、弃用)
-#    publisher-confirm-type: correlated
-#    #确认消息已发送到队列(Queue)
-#    publisher-returns: true
-
-  #redis
-  redis:
-    host: 122.112.224.199
-    port: 6379
-    password: hm123456
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    #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://192.168.1.7: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
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"   # * 在yaml 文件属于关键字,所以需要加引号
-
+server:
+  port: 10064
+spring:
+  application:
+    name: huimv-env-produce
+
+  datasource:
+    url: jdbc:mysql://122.112.224.199:3306/huimv-produce-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: qingshan
+    password: qingshan@2022
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: none
+    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: /
+#  rabbitmq:
+#    host: 192.168.1.82
+#    port: 5672
+#    username: admin
+#    password: admin
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /env
+
+    #确认消息已发送到交换机(Exchange)
+#    publisher-confirms: true #(过时、弃用)
+#    publisher-confirm-type: correlated
+#    #确认消息已发送到队列(Queue)
+#    publisher-returns: true
+
+  #redis
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #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://192.168.1.7: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
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"   # * 在yaml 文件属于关键字,所以需要加引号
+

+ 2 - 1
huimv-env-platform/huimv-env-produce/src/main/resources/application.properties

@@ -1,5 +1,6 @@
 #spring.profiles.active=dev
-spring.profiles.active=prod
+#spring.profiles.active=prod
+spring.profiles.active=qingshan
 
 # mysql:/cache:
 device.online.access_mode=mysql