地理所同步接口修改

src/main/java/platform/modules/api/service/SkyImageApiService.java

@@ -53,8 +53,10 @@ public class SkyImageApiService {
     private static final String appKey = "a000";
     private static final String secretKey = "1fb8971fcb64979b3a345779b26a179";
     private static final String aes_key = "27495600-4f25-43f7-955c-ab9f4f592c04";
-    private static final String url = "https://xsg.tq.geostsapp.cn/apis/user/getAccessToken";
-    private static final String user_url = "https://xsg.tq.geostsapp.cn/apis/infoCollect/userInfoToImagesky?token=";
+    /*private static final String url = "https://xsg.tq.geostsapp.cn/apis/user/getAccessToken";
+    private static final String user_url = "https://xsg.tq.geostsapp.cn/apis/infoCollect/userInfoToImagesky?token=";*/
+    private static final String url = "http://36.154.62.102:8081/apis/user/getAccessToken";
+    private static final String user_url = "http://36.154.62.102:8081/apis/infoCollect/userInfoToImagesky?token=";
 
     public String accessToken() {
         //请求头
@@ -65,7 +67,7 @@ public class SkyImageApiService {
         param.put("secretKey", secretKey);
         try {
             String result = HttpsUtils.get(url, header, param);
-            if (!"".equals(result)){
+            if (!"".equals(result)) {
                 return JSON.parseObject(result).getString("token");
             }
             return result;
@@ -104,6 +106,7 @@ public class SkyImageApiService {
 
     /**
      * 天启向我们同步数据
+     *
      * @param syncs
      */
     @Transactional
@@ -120,7 +123,7 @@ public class SkyImageApiService {
                 }
                 String organization_code = sync.getOrganizationCode();
                 //组织机构代码后6位
-                String password = organization_code.substring(organization_code.length()-6, organization_code.length());
+                String password = organization_code.substring(organization_code.length() - 6, organization_code.length());
                 Company company = companyService.findByCompanyName(sync.getCompanyName());
                 if (company != null) {
                     if (hasUser(company.getId())) {
@@ -129,8 +132,7 @@ public class SkyImageApiService {
                         continue;
                     }
                     insertCompanyUser(sync, password, company.getId());
-                }
-                else {
+                } else {
                     insertCompanyUser(sync, password, insertCompany(sync));
                 }
             }
@@ -144,44 +146,42 @@ public class SkyImageApiService {
     private boolean checkImportData(List<Map<String, Object>> errorList, Sync sync) {
         HashMap<String, Object> map = new HashMap<>();
         map.put("companyName", sync.getCompanyName());
-        if (StringUtils.isEmpty(sync.getCompanyName())){
+        if (StringUtils.isEmpty(sync.getCompanyName())) {
             map.put("message", "公司名不能为空");
             errorList.add(map);
             return false;
         }
-        if (StringUtils.isEmpty(sync.getStreetName())){
+        if (StringUtils.isEmpty(sync.getStreetName())) {
             map.put("message", "街道名不能为空");
             errorList.add(map);
             return false;
-        }
-        else {
-            if (getStreetIdByName(sync.getStreetName()) == null){
+        } else {
+            if (getStreetIdByName(sync.getStreetName()) == null) {
                 map.put("message", "街道不存在");
                 errorList.add(map);
                 return false;
             }
         }
-        if (StringUtils.isEmpty(sync.getOrganizationCode())){
+        if (StringUtils.isEmpty(sync.getOrganizationCode())) {
             map.put("message", "组织机构代码不能为空");
             errorList.add(map);
             return false;
-        }
-        else {
-            if (sync.getOrganizationCode().length() != 9){
+        } else {
+            if (sync.getOrganizationCode().length() != 9) {
                 map.put("message", "组织机构代码不正确");
                 errorList.add(map);
                 return false;
             }
             User exuser = userService.findByNickName(sync.getOrganizationCode());
-            if (exuser != null){
+            if (exuser != null) {
                 map.put("message", "用户名已存在");
                 errorList.add(map);
                 return false;
             }
         }
-        if (StringUtils.isNotEmpty(sync.getUscc())){
+        if (StringUtils.isNotEmpty(sync.getUscc())) {
             List<Company> listByUscc = companyService.findListByUscc(sync.getUscc());
-            if (listByUscc != null && listByUscc.size() > 0){
+            if (listByUscc != null && listByUscc.size() > 0) {
                 map.put("message", "社会统一信用代码重复");
                 errorList.add(map);
                 return false;
@@ -197,11 +197,10 @@ public class SkyImageApiService {
 
     private void insertCompanyUser(Sync sync, String password, Integer id) {
         User user = new User();
-        if (sync.getOrganizationCode() != null){
+        if (sync.getOrganizationCode() != null) {
             user.setNick_name(sync.getOrganizationCode());
             user.setUser_name(sync.getOrganizationCode());
-        }
-        else {
+        } else {
             user.setNick_name(sync.getCompanyName());
             user.setUser_name(sync.getCompanyName());
         }
@@ -233,7 +232,7 @@ public class SkyImageApiService {
     private Integer getStreetIdByName(String streetName) {
         try {
             Street street = streetService.getStreet(streetName);
-            if (street != null){
+            if (street != null) {
                 return street.getId();
             }
         } catch (Exception e) {
@@ -251,29 +250,29 @@ public class SkyImageApiService {
      * 5.内容加密
      * 6.返回字符串
      */
-    public String AESEncode(String encodeRules, String content){
+    public String AESEncode(String encodeRules, String content) {
         try {
             //1.构造密钥生成器，指定为AES算法,不区分大小写
-            KeyGenerator keygen=KeyGenerator.getInstance("AES");
+            KeyGenerator keygen = KeyGenerator.getInstance("AES");
             //2.根据ecnodeRules规则初始化密钥生成器
             //生成一个128位的随机源,根据传入的字节数组
-            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG") ;
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
             secureRandom.setSeed(encodeRules.getBytes());
             keygen.init(128, secureRandom);
             //3.产生原始对称密钥
-            SecretKey original_key=keygen.generateKey();
+            SecretKey original_key = keygen.generateKey();
             //4.获得原始对称密钥的字节数组
-            byte [] raw=original_key.getEncoded();
+            byte[] raw = original_key.getEncoded();
             //5.根据字节数组生成AES密钥
-            SecretKey key=new SecretKeySpec(raw, "AES");
+            SecretKey key = new SecretKeySpec(raw, "AES");
             //6.根据指定算法AES自成密码器
-            Cipher cipher=Cipher.getInstance("AES");
+            Cipher cipher = Cipher.getInstance("AES");
             //7.初始化密码器，第一个参数为加密(Encrypt_mode)或者解密解密(Decrypt_mode)操作，第二个参数为使用的KEY
             cipher.init(Cipher.ENCRYPT_MODE, key);
             //8.获取加密内容的字节数组(这里要设置为utf-8)不然内容中如果有中文和英文混合中文就会解密为乱码
-            byte [] byte_encode=content.getBytes("utf-8");
+            byte[] byte_encode = content.getBytes("utf-8");
             //9.根据密码器的初始化方式--加密：将数据加密
-            byte [] byte_AES=cipher.doFinal(byte_encode);
+            byte[] byte_AES = cipher.doFinal(byte_encode);
             //10.将加密后的数据转换为字符串
             //这里用Base64Encoder中会找不到包
             //解决办法：
@@ -287,6 +286,7 @@ public class SkyImageApiService {
         //如果有错就返加nulll
         return null;
     }
+
     /*
      * 解密
      * 解密过程：
@@ -294,7 +294,7 @@ public class SkyImageApiService {
      * 2.将加密后的字符串反纺成byte[]数组
      * 3.将加密内容解密
      */
-    public static String AESDecode(String encodeRules, String content){
+    public static String AESDecode(String encodeRules, String content) {
         try {
             //1.构造密钥生成器，指定为AES算法,不区分大小写
             KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -306,7 +306,7 @@ public class SkyImageApiService {
             //3.产生原始对称密钥
             SecretKey secretKey = keygen.generateKey();
             //4.获得原始对称密钥的字节数组
-            byte [] raw = secretKey.getEncoded();
+            byte[] raw = secretKey.getEncoded();
             //5.根据字节数组生成AES密钥
             SecretKey key = new SecretKeySpec(raw, "AES");
             //6.根据指定算法AES自成密码器
@@ -314,13 +314,13 @@ public class SkyImageApiService {
             //7.初始化密码器，第一个参数为加密(Encrypt_mode)或者解密(Decrypt_mode)操作，第二个参数为使用的KEY
             cipher.init(Cipher.DECRYPT_MODE, key);
             //8.将加密并编码后的内容解码成字节数组
-            byte [] byte_content = new BASE64Decoder().decodeBuffer(content);
+            byte[] byte_content = new BASE64Decoder().decodeBuffer(content);
 
             /*
              * 解密
              */
-            byte [] byte_decode=cipher.doFinal(byte_content);
-            return new String(byte_decode,"utf-8");
+            byte[] byte_decode = cipher.doFinal(byte_content);
+            return new String(byte_decode, "utf-8");
         } catch (Exception e) {
             e.printStackTrace();
         }