Merge remote-tracking branch 'origin/dev' into dev

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UploadCompanyInfoAndProductController.java

@@ -6,6 +6,7 @@ import com.hwrj.cloud.admin.dao.PmsProductExcelDao;
 import com.hwrj.cloud.admin.dto.param.ForestPath;
 import com.hwrj.cloud.admin.dto.param.PmsProductExcel;
 import com.hwrj.cloud.admin.dto.param.PmsProductParam;
+import com.hwrj.cloud.admin.dto.utilEntity.LagLatEntity;
 import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 import com.hwrj.cloud.admin.listener.ImportExcelEventListener;
@@ -16,10 +17,7 @@ import com.hwrj.cloud.admin.mapper.UmsMemberOriginMapper;
 import com.hwrj.cloud.admin.model.*;
 import com.hwrj.cloud.admin.service.UmsCompanyService;
 import com.hwrj.cloud.admin.service.UmsMemberOriginService;
-import com.hwrj.cloud.admin.util.ChineseCharToEn;
-import com.hwrj.cloud.admin.util.EasyExcelUtil;
-import com.hwrj.cloud.admin.util.OrderNo;
-import com.hwrj.cloud.admin.util.UploadFileUtil;
+import com.hwrj.cloud.admin.util.*;
 import com.hwrj.cloud.common.api.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -63,6 +61,8 @@ public class UploadCompanyInfoAndProductController {
 
     @Value("${qiniu.path}")
     private String url;
+    @Autowired
+    private CompanyLatLagGet companyLatLagGet;
 
     List<PmsProductParam> listAll = new ArrayList<>();
 
@@ -78,7 +78,7 @@ public class UploadCompanyInfoAndProductController {
     public CommonResult readFile(@RequestParam(value = "paths") String paths, @RequestParam(value = "type") String type, @RequestParam(value = "compName", required = false) String compName) {
 
         if ("1".equals(type)) {
-            String filepath = paths;//D盘下的file文件夹的目录
+            String filepath = paths;
             List<String> file = getDirectory(filepath);
             List<ForestPath> list = new ArrayList<>();
             file.stream().forEach(item -> {
@@ -157,7 +157,6 @@ public class UploadCompanyInfoAndProductController {
     @Autowired
     private UmsCompanyFileMapper umsCompanyFileMapper;
 
-    //供应商
     public void addCompanyImg(ForestPath forestPath, String companyName, Long companyId) {
         String path = forestPath.getPath();
         List<String> file = getFile(path);
@@ -178,7 +177,7 @@ public class UploadCompanyInfoAndProductController {
             } catch (Exception e) {
                 throw new RuntimeException("获取文件后缀出错!=======>" + split);
             }
-            imgName = imgName + "." + split[split.length-1];
+            imgName = imgName + "." + split[1];
             String filePath = path + "\\" + str;
             infoFile.setFileUrl(url + imgName);
             if (str.contains("公众号二维码")) {
@@ -285,7 +284,7 @@ public class UploadCompanyInfoAndProductController {
             } catch (Exception e) {
                 throw new RuntimeException("获取文件后缀出错!=======>" + split);
             }
-            String fileName = br + s + "." + split[split.length-1];
+            String fileName = br + s + "." + split[1];
             uploadFileUtil.uploadLocalFile(path + "\\" + oldFileName, fileName);
             if (i > 0) {
                 bu.append("," + url + fileName);
@@ -344,20 +343,12 @@ public class UploadCompanyInfoAndProductController {
                 updateFile(forestPath.getPath(), pms.getId(), pms.getProductNo());
             }
         }
-//        List<PmsProduct> products = selectProduct(companyName);
-//        if (products != null&&directory != null&& products.size()>0&&directory.size()>0&&products.size()==directory.size()){
-//            for (int i = 0;i<directory.size();i++){
-//                updateFile(forestPath.getPath(),products.get(i).getId(),directory.get(i));
-//            }
-//        }
 
 
     }
 
     @Test
     public void productImg() {
-//        List<String> directory = getDirectory(forestPath.getPath());
-//        Long aLong = companyId(companyName);
         List<String> directory = getDirectory("D:\\developerUtil\\code\\hwrj\\forest\\到数据\\上传\\石阡县猫寨农林专业合作社\\产品");
         List<PmsProduct> products = selectProduct("石阡县猫寨农林专业合作");
         if (products != null && directory != null && products.size() > 0 && directory.size() > 0 && products.size() == directory.size()) {
@@ -369,7 +360,7 @@ public class UploadCompanyInfoAndProductController {
 
     }
 
-    //首图
+
     public void updateFile(String path, Long along, String str) {
         String upPath = path + "\\" + str;
         String br = "0/2/" + along + "/";
@@ -386,7 +377,7 @@ public class UploadCompanyInfoAndProductController {
                 } catch (Exception e) {
                     throw new RuntimeException("获取文件后缀出错!=======>" + split);
                 }
-                fs = fs + "." + split[split.length-1];
+                fs = fs + "." + split[1];
                 uploadFileUtil.uploadLocalFile(upPath + "\\" + s, fs);
                 if (s.contains("首图")) {
                     p.setPic(url + fs);
@@ -486,6 +477,11 @@ public class UploadCompanyInfoAndProductController {
                 UmsCompanyInfoExcel umsCompanyInfoExcel = (UmsCompanyInfoExcel) o;
                 umsCompanyInfoExcel.setCreateId(0l);
                 companyId = umsCompanyInfoExcel.getCompName();
+                LagLatEntity lagLat = companyLatLagGet.getLagLat(umsCompanyInfoExcel.getCityId(), umsCompanyInfoExcel.getCountyId(), umsCompanyInfoExcel.getDetailAddress());
+                if (lagLat != null ){
+                    umsCompanyInfoExcel.setLatitude(new BigDecimal(lagLat.getLat()));
+                    umsCompanyInfoExcel.setLongitude(new BigDecimal(lagLat.getLag()));
+                }
                 listAll.add(umsCompanyInfoExcel);
             }
         }
@@ -522,6 +518,11 @@ public class UploadCompanyInfoAndProductController {
                     UmsMemberOriginExcel excel = (UmsMemberOriginExcel) obj;
                     excel.setCreateId(1);
                     excel.setState(0);
+                    LagLatEntity lagLat = companyLatLagGet.getLagLat(excel.getCityName(), excel.getCountyName(), excel.getDetailAddress());
+                    if (lagLat != null ){
+                        excel.setLatitude(lagLat.getLat());
+                        excel.setLongitude(lagLat.getLag());
+                    }
                     excel.setCompName(companyName);
                     listAll.add(excel);
                 }
@@ -552,22 +553,6 @@ public class UploadCompanyInfoAndProductController {
 
     public void importBasic(MultipartFile file) throws IOException {
 
-//        PmsProductExcelListener basicExcelListener = new PmsProductExcelListener(productExcelDao,null);
-//        ExcelReader excelReader = null;
-//        try {
-//            excelReader = EasyExcel.read(file.getInputStream()).build();
-//            ReadSheet readSheet3 =
-//                    EasyExcel.readSheet(2).head(PmsProductExcel.class).registerReadListener(basicExcelListener).headRowNumber(2).build();
-//            // 这里注意 一定要把sheet1 sheet2 一起传进去，不然有个问题就是03版的excel 会读取多次，浪费性能
-//            excelReader.read(readSheet3);
-//        } finally {
-//            if (excelReader != null) {
-//                // 这里千万别忘记关闭，读的时候会创建临时文件，到时磁盘会崩的
-//                excelReader.finish();
-//            }
-//        }
-
-//        List<PmsProductParam> listAll = new ArrayList<>();
 
 
         listAll = new ArrayList<>();

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/utilEntity/AmapEntity.java

@@ -0,0 +1,150 @@
+package com.hwrj.cloud.admin.dto.utilEntity;
+
+import java.io.Serializable;
+
+public class AmapEntity implements Serializable {
+    private String formattedAddress;
+    private String country;
+    private String province;
+    private String citycode;
+    private String city;
+    private String district;
+    private String township;
+    private String neighborhood;
+    private String building;
+    private String name;
+    private String type;
+    private String adcode;
+    private String street;
+    private String number;
+    private String location;
+    private String level;
+
+    public String getFormattedAddress() {
+        return formattedAddress;
+    }
+
+    public void setFormattedAddress(String formattedAddress) {
+        this.formattedAddress = formattedAddress;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCitycode() {
+        return citycode;
+    }
+
+    public void setCitycode(String citycode) {
+        this.citycode = citycode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getTownship() {
+        return township;
+    }
+
+    public void setTownship(String township) {
+        this.township = township;
+    }
+
+    public String getNeighborhood() {
+        return neighborhood;
+    }
+
+    public void setNeighborhood(String neighborhood) {
+        this.neighborhood = neighborhood;
+    }
+
+    public String getBuilding() {
+        return building;
+    }
+
+    public void setBuilding(String building) {
+        this.building = building;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getAdcode() {
+        return adcode;
+    }
+
+    public void setAdcode(String adcode) {
+        this.adcode = adcode;
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/utilEntity/LagLatEntity.java

@@ -0,0 +1,22 @@
+package com.hwrj.cloud.admin.dto.utilEntity;
+
+public class LagLatEntity {
+    private String lag;
+    private String lat;
+
+    public String getLag() {
+        return lag;
+    }
+
+    public void setLag(String lag) {
+        this.lag = lag;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/util/CompanyLatLagGet.java

@@ -0,0 +1,122 @@
+package com.hwrj.cloud.admin.util;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hwrj.cloud.admin.dto.utilEntity.AmapEntity;
+import com.hwrj.cloud.admin.dto.utilEntity.LagLatEntity;
+import com.hwrj.cloud.common.util.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+
+@Component
+public class CompanyLatLagGet {
+
+
+    public LagLatEntity getLagLat(String cityName,String countyName,String detail){
+        LagLatEntity la = new LagLatEntity();
+        if (StringUtils.isEmpty(countyName)||StringUtils.isEmpty(countyName)){
+            return null;
+        }
+
+        if (StringUtils.isEmpty(detail)){
+
+            AmapEntity county = getAddressDetail(cityName, countyName);
+            if (county != null){
+                String[] split = county.getLocation().split(",");
+                la.setLag(split[0]);
+                la.setLat(split[1]);
+            }else {
+                AmapEntity city = getAddressDetail(cityName, cityName);
+                if (city != null){
+                    String[] split = city.getLocation().split(",");
+                    la.setLag(split[0]);
+                    la.setLat(split[1]);
+                }else {
+                    return null;
+                }
+            }
+
+        }else {
+            AmapEntity addressDetail = getAddressDetail(cityName, detail);
+            if (addressDetail != null){
+                String[] split = addressDetail.getLocation().split(",");
+                la.setLag(split[0]);
+                la.setLat(split[1]);
+            }else {
+                AmapEntity county = getAddressDetail(cityName, countyName);
+                if (county != null){
+                    String[] split = county.getLocation().split(",");
+                    la.setLag(split[0]);
+                    la.setLat(split[1]);
+                }else {
+                    AmapEntity city = getAddressDetail(cityName, cityName);
+                    if (city != null){
+                        String[] split = city.getLocation().split(",");
+                        la.setLag(split[0]);
+                        la.setLat(split[1]);
+                    }else {
+                        return null;
+                    }
+                }
+            }
+        }
+        return la;
+    }
+
+
+    public AmapEntity getAddressDetail(String cityName, String key) {
+        if (StringUtils.isEmpty(cityName)){
+            return null;
+        }
+        if (StringUtils.isEmpty(key)){
+            return null;
+        }
+        String s = sendAddress(cityName, key);
+        log.info("返回地址信息"+s);
+        JSONObject object = JSON.parseObject(s);
+
+        String status = object.getString("status");
+        if ("1".equals(status)){
+            String count = object.getString("count");
+            if (Integer.valueOf(count)<1){
+                return null;
+            }
+            JSONArray weatherArray = JSON.parseArray(object.getString("geocodes"));
+            for (Object json :weatherArray) {
+                AmapEntity amapEntity = JSONObject.parseObject(JSONObject.toJSONString(json), AmapEntity.class);
+                return amapEntity;
+            }
+        }
+
+
+
+        return null;
+    }
+
+    public String sendAddress(String city, String key) {
+        String lbsDevKey = "52277a894c1855d8917634177809169a";
+        String addUrl ="https://restapi.amap.com/v3/geocode/geo";
+        Map<String, String> queryParas = new HashMap<String, String>();
+        queryParas.put("address", key);
+        queryParas.put("key", lbsDevKey);
+        queryParas.put("city", city);
+        String weatherInfo = null;
+        try {
+            weatherInfo = HttpUtils.get(addUrl, queryParas);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return weatherInfo;
+    }
+
+
+
+
+}

forest-admin/admin-server/src/main/resources/bootstrap.yml

@@ -13,8 +13,8 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.16.90.8:8898
+        server-addr: 172.16.90.3:8898
       config:
-        server-addr: 172.16.90.8:8898
+        server-addr: 172.16.90.3:8898
         prefix: forest-admin
         file-extension: yaml

forest-monitor/src/main/resources/application.yml

@@ -9,5 +9,9 @@ spring:
     admin:
       discovery:
         ignored-services: ${spring.application.name}
+  cloud:
+    nacos:
+      discovery:
+        server-addr: http://localhost:8898
 server:
   port: 9091

nacos/data/config-data/DEFAULT_GROUP/forest-portal

@@ -19,6 +19,11 @@ spring:
         url: http://localhost:9091
 
 
+  data:
+    mongodb:
+      host: 172.16.90.64
+      port: 27017
+      database: mall-port-test
   redis:
     # Redis服务器地址
     host: 172.16.90.64 

nacos/data/naming/meta.properties

@@ -1,2 +1,2 @@
-#Sun Sep 27 02:16:42 CST 2020
-term=12142
+#Thu Oct 22 10:29:40 CST 2020
+term=153