农合

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

@@ -158,7 +158,7 @@ public class FarmStockRankController {
         map.put("farmCodes", farmCodes);
         HttpEntity<Map<String, String>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
         //读取真实数据
-        String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/cattle/getStockRankByDivision";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/breed/api/v1.0.0/cattle/getStockRankByDivision";
         ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
         if(entity.getStatusCode().toString().contains("200")){
             String body = entity.getBody();
@@ -173,7 +173,7 @@ public class FarmStockRankController {
     }
 
     private String getFarmCodeByAdcode(String farmCode) {
-        String adcode  = "620826";
+        String adcode  = "640424";
         if (!"0".equals(farmCode)){
             SysFarm list = farmService.getOne(new QueryWrapper<SysFarm>().eq("farm_code", farmCode));
             if (ObjectUtil.isNotEmpty(list)){
@@ -181,7 +181,7 @@ public class FarmStockRankController {
                 adcode =  split[split.length-1];
             }
         }
-        String remoteUrl = "http://123.60.134.84:10001/admin/v1.0.0/account/getFarmByAdcode";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/admin/v1.0.0/account/getFarmByAdcode";
         Map map = new HashMap();
         map.put("adcode",adcode);
         ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(remoteUrl, map, String.class);

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

@@ -107,7 +107,7 @@ public class OutStockController {
     }
 
     private String getFarmCodeByAdcode(String farmCode) {
-        String adcode  = "620826";
+        String adcode  = "640424";
         if (!"0".equals(farmCode)){
             SysFarm list = farmService.getOne(new QueryWrapper<SysFarm>().eq("farm_code", farmCode));
             if (ObjectUtil.isNotEmpty(list)){
@@ -115,7 +115,7 @@ public class OutStockController {
                 adcode =  split[split.length-1];
             }
         }
-        String remoteUrl = "http://123.60.134.84:10001/admin/v1.0.0/account/getFarmCodeByAdcode";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/admin/v1.0.0/account/getFarmCodeByAdcode";
         Map map = new HashMap();
         map.put("adcode",adcode);
         ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(remoteUrl, map, String.class);
@@ -134,7 +134,7 @@ public class OutStockController {
         map.put("farmCode", farmCodes);
         HttpEntity<Map<String, Object>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
         //读取真实数据
-        String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/cattle/getOutStockByDivision";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/breed/api/v1.0.0/cattle/getOutStockByDivision";
         ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
         if(entity.getStatusCode().toString().contains("200")){
             String body = entity.getBody();

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

@@ -67,9 +67,17 @@ public class OverviewController {
                 //status=2,显示镇汇总（养殖云）数据
                 System.out.println("status=2,显示镇汇总（养殖云）数据");
                 String farmCodes =   getFarmCodeByAdcode(farmCode);
+                System.out.println("大屏总览farmCodes:"+farmCodes);
                 System.out.println(farmCodes);
                 if (StringUtils.isBlank(farmCodes)){
-                    return new Result(ResultCode.SUCCESS,new ArrayList<>());
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("stockCount", 0);
+                    jsonObject.put("outCount", 0);
+                    jsonObject.put("breedCount", 0);
+                    jsonObject.put("farmCount", 0);
+                    jsonObject.put("outputValue", 0);
+                    jsonObject.put("variety", 0);
+                    return new Result(ResultCode.SUCCESS,jsonObject);
                 }
                 return getStockFromBreedCloud(farmCodes);
                 //++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -95,10 +103,17 @@ public class OverviewController {
             } else {
                 //status=2,显示村汇总（养殖云）数据
                 System.out.println("status=2,显示村汇总（养殖云）数据");
-                String farmCodes =   getFarmCodeByAdcode(farmCode);
-                System.out.println(farmCodes);
-                if (StringUtils.isBlank(farmCodes)){
-                    return new Result(ResultCode.SUCCESS,new ArrayList<>());
+                String farmCodes =  getFarmCodeByAdcode(farmCode);
+                System.out.println("大屏总览farmCodes:"+farmCodes);
+                if (StringUtils.isEmpty(farmCodes)){
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("stockCount", 0);
+                    jsonObject.put("outCount", 0);
+                    jsonObject.put("breedCount", 0);
+                    jsonObject.put("farmCount", 0);
+                    jsonObject.put("outputValue", 0);
+                    jsonObject.put("variety", 0);
+                    return new Result(ResultCode.SUCCESS,jsonObject);
                 }
                 return getStockFromBreedCloud(farmCodes);
             }
@@ -106,7 +121,7 @@ public class OverviewController {
     }
 
     private String getFarmCodeByAdcode(String farmCode) {
-        String adcode  = "620826";
+        String adcode  = "640424";
         if (!"0".equals(farmCode)){
             SysFarm list = farmService.getOne(new QueryWrapper<SysFarm>().eq("farm_code", farmCode));
             if (ObjectUtil.isNotEmpty(list)){
@@ -114,7 +129,7 @@ public class OverviewController {
                 adcode =  split[split.length-1];
             }
         }
-        String remoteUrl = "http://123.60.134.84:10001/admin/v1.0.0/account/getFarmCodeByAdcode";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/admin/v1.0.0/account/getFarmCodeByAdcode";
         Map map = new HashMap();
         map.put("adcode",adcode);
         ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(remoteUrl, map, String.class);
@@ -132,13 +147,16 @@ public class OverviewController {
         map.put("farmCode", farmCodes);
         HttpEntity<Map<String, Object>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
         //读取真实数据
-        String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/cattle/getFarmCountByDivision";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/breed/api/v1.0.0/cattle/getFarmCountByDivision";
         ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
         if(entity.getStatusCode().toString().contains("200")){
             String body = entity.getBody();
             System.out.println(body);
             JSONObject dataJo = JSON.parseObject(body).getJSONObject("data");
             System.out.println("dataJo="+dataJo);
+            if (ObjectUtil.isEmpty(dataJo)){
+
+            }
             dataJo.put("variety",0);
             //, )
             return new Result(ResultCode.SUCCESS,dataJo);

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

@@ -149,7 +149,7 @@ public class SalesCattleController {
     }
 
     private String getFarmCodeByAdcode(String farmCode) {
-        String adcode  = "620826";
+        String adcode  = "640424";
         if (!"0".equals(farmCode)){
             SysFarm list = farmService.getOne(new QueryWrapper<SysFarm>().eq("farm_code", farmCode));
             if (ObjectUtil.isNotEmpty(list)){
@@ -157,7 +157,7 @@ public class SalesCattleController {
                 adcode =  split[split.length-1];
             }
         }
-        String remoteUrl = "http://123.60.134.84:10001/admin/v1.0.0/account/getFarmCodeByAdcode";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/admin/v1.0.0/account/getFarmCodeByAdcode";
         Map map = new HashMap();
         map.put("adcode",adcode);
         ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(remoteUrl, map, String.class);
@@ -175,7 +175,7 @@ public class SalesCattleController {
         map.put("farmCodes", farmCodes);
         HttpEntity<Map<String, Object>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
         //读取真实数据
-        String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/cattle/getSalesByDivision";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/breed/api/v1.0.0/cattle/getSalesByDivision";
         ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
         if(entity.getStatusCode().toString().contains("200")){
             String body = entity.getBody();

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

@@ -109,7 +109,7 @@ public class StockController {
     }
 
     private String getFarmCodeByAdcode(String farmCode) {
-        String adcode  = "620826";
+        String adcode  = "640424";
         if (!"0".equals(farmCode)){
             SysFarm list = farmService.getOne(new QueryWrapper<SysFarm>().eq("farm_code", farmCode));
             if (ObjectUtil.isNotEmpty(list)){
@@ -117,7 +117,7 @@ public class StockController {
                 adcode =  split[split.length-1];
             }
         }
-        String remoteUrl = "http://123.60.134.84:10001/admin/v1.0.0/account/getFarmCodeByAdcode";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/admin/v1.0.0/account/getFarmCodeByAdcode";
         Map map = new HashMap();
         map.put("adcode",adcode);
         ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(remoteUrl, map, String.class);
@@ -135,7 +135,7 @@ public class StockController {
         map.put("farmCode", farmCodes);
         HttpEntity<Map<String, Object>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
         //读取真实数据
-        String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/cattle/getStockByDivision";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/breed/api/v1.0.0/cattle/getStockByDivision";
         ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
         if(entity.getStatusCode().toString().contains("200")){
             String body = entity.getBody();

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

@@ -50,6 +50,9 @@ public class SysFarmController {
     @PostMapping("/list")
     public Result listFarm(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
         DataSource dataSource = dataSourceService.getDataSourceStatus();
+        if (dataSource.getDsStatus() == 2){
+            return sysFarmService.listVillageFarm(request,paramsMap);
+        }
         if (dataSource.getDsStatus() == 1 && dataSource.getViewType() == 2){
             return sysFarmService.listTownFarm(request,paramsMap);
         }else if (dataSource.getDsStatus() == 1 && dataSource.getViewType() == 3){

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

@@ -270,7 +270,7 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         //读取模式切换
         DataSource dataSource = dataSourceService.getDataSourceStatus();
         if (dataSource.getDsStatus() == 2){
-            return getStockFromBreedCloud(allTownsJa);
+            return getStockFromBreedCloud(allVillageJa);
         }else if (dataSource.getViewType() == 3){
             return stockService.getAllVillageStock(request,allVillageJa);
         }else {
@@ -434,11 +434,11 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         String farms = paramsMap.get("farms");
         String[] farmCodes = farms.split(",");
         List<String> farmCodeList = new ArrayList<>();
-        for (int i = 3; i <= farmCodes.length+2; i++) {
+        for (int i = 1; i <= farmCodes.length; i++) {
             if (i < 10){
-                farmCodeList.add("6208"+"00"+i);
+                farmCodeList.add("640424"+"00"+i);
             }else {
-                farmCodeList.add("6208"+"0"+i);
+                farmCodeList.add("640424"+"0"+i);
             }
         }
         int i = 0;
@@ -523,14 +523,15 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
     //显示镇汇总（养殖云）数据
     private Result getStockFromBreedCloud(JSONArray allTownsJa) {
         HttpHeaders httpHeaders = new HttpHeaders();
-        MediaType type = MediaType.parseMediaType("application/json;charset=UTF-8");
-        httpHeaders.setContentType(type);
+//        MediaType type = MediaType.parseMediaType("application/json;charset=UTF-8");
+//        httpHeaders.setContentType(type);
+        httpHeaders.set("Content-Type", "application/json; charset=UTF-8");
         HashMap<String, Object> map = new HashMap<>();
         //这里提交的是区县编码或乡镇编码
         map.put("allTown", allTownsJa.toJSONString());
         HttpEntity<Map<String, Object>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
         //读取真实数据
-        String remoteUrl = "http://123.60.134.84:10001/breed/api/v1.0.0/cattle/getStockByDivision2";
+        String remoteUrl = "http://earcon-cattle.xuyunbao.com/smartRanchApi/breed/api/v1.0.0/cattle/getStockByDivision2";
         ResponseEntity<String> entity = restTemplate.postForEntity(remoteUrl, objectHttpEntity, String.class);
         if (entity.getStatusCode().toString().contains("200")) {
             String body = entity.getBody();

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

@@ -496,7 +496,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             //牧场状态不能为注销状态(2)
             return new Result(ConstUtil.ERR_FARM_CANCEL_CODE, ConstUtil.ERR_FARM_CANCEL_INFO, false);
         }
-        if (!"jingning".equals(accountName)){
+        if (!"jingyuan".equals(accountName)){
             return Result.ERROR();
         }
 

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

@@ -0,0 +1,114 @@
+server:
+  port: 10010
+spring:
+  application:
+    name: huimv-eartag2-manage2
+
+  datasource:
+    url: jdbc:mysql://rm-bp1lz0c6l2tcmrp21xo.mysql.rds.aliyuncs.com/nhxm_niu_earcon
+    username: root
+    password: NHxm213213
+    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)”

huimv-cattle/src/main/resources/application.properties

@@ -1,8 +1,9 @@
 #spring.profiles.active=dev
 #spring.profiles.active=prod
 #spring.profiles.active=prod2
-spring.profiles.active=prod3
+#spring.profiles.active=prod3
 #spring.profiles.active=demo
+spring.profiles.active=nh
 
 manager.defaultPassword=123456
 user.defaultPassword=123456