优化代码

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java

@@ -21,4 +21,6 @@ public interface CaWghDataConstant {
     String UNICOM_RENTAL = "ca_rental";
 
     String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page";
+
+    String UNICOM_CONDITION = "unicomCondition";
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java

@@ -12,6 +12,7 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.opendata.dao.CaLoudongDao;
 import com.epmet.opendata.dto.ca.CaLoudongDTO;
+import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.CaLoudongDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaLoudongFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
@@ -137,8 +138,8 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         baseDao.deleteAll();
         dto.setPageNo(NumConstant.ONE);
         dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(loudongEnum.LD.name);
+        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(loudongEnum.LD.code);
+        dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG);
 
         dto.setWhereCase("delete_flag = 'normal'");
         dto.setOrderBy("grid_id,update_date desc");
@@ -158,28 +159,12 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         } while (total > (pageNo * NumConstant.FIFTY));
     }
 
-    enum loudongEnum {
-
-        LD("unicom", "ca_loudong"),
-        AES("key", "hriajrutnbghajsd")
-        ;
-
-        private String name;
-        private String code;
-
-
-        loudongEnum(String name, String code) {
-            this.name = name;
-            this.code = code;
-        }
-
-    }
 
     private int listLouDong(PreserVationFormDTO dto) throws Exception {
-        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), loudongEnum.AES.code);
+        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
-        obj.put("unicomCondition", aes);
+        obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
-        String data = HttpClientManager.getInstance().sendPostByJSON("http://120.221.72.83:9090/bridge/unicom/page", obj.toJSONString()).getData();
+        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!result.success()) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java

@@ -13,6 +13,7 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.opendata.dao.CaPingfangDao;
 import com.epmet.opendata.dto.ca.CaPingfangDTO;
+import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.CaPingFangDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaPingfangFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
@@ -117,8 +118,8 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
 
         dto.setPageNo(NumConstant.ONE);
         dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(pingFangEnum.PF.name);
+        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(pingFangEnum.PF.code);
+        dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG);
 
         dto.setWhereCase("delete_flag = 'normal'");
         dto.setOrderBy("grid_id,update_date desc");
@@ -145,26 +146,11 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
         return result;
     }
 
-    enum pingFangEnum {
-
-        PF("unicom", "ca_pingfang"),
-        AES("key", "hriajrutnbghajsd")
-        ;
-
-        pingFangEnum(String name, String code) {
-            this.name = name;
-            this.code = code;
-        }
-
-        private String name;
-        private String code;
-    }
-
     private int listPingFang(PreserVationFormDTO dto) throws Exception {
-        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), pingFangEnum.AES.code);
+        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
-        obj.put("unicomCondition",aes);
+        obj.put(CaWghDataConstant.UNICOM_CONDITION,aes);
-        String data = HttpClientManager.getInstance().sendPostByJSON("http://120.221.72.83:9090/bridge/unicom/page", obj.toJSONString()).getData();
+        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!result.success()) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java

@@ -154,8 +154,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
     private int listRental(PreserVationFormDTO dto) throws Exception {
         String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
-        obj.put("unicomCondition", aes);
+        obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
-        String data = HttpClientManager.getInstance().sendPostByJSON("http://120.221.72.83:9090/bridge/unicom/page", obj.toJSONString()).getData();
+        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!result.success()) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java

@@ -14,6 +14,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.opendata.dao.CaResidentDao;
 import com.epmet.opendata.dto.ca.CaResidentDTO;
+import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaResidentFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
@@ -125,8 +126,8 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
 
         dto.setPageNo(NumConstant.ONE);
         dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(residentEnum.RK.name);
+        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(residentEnum.RK.code);
+        dto.setTableName(CaWghDataConstant.UNICOM_RESIDENT);
 
         dto.setWhereCase("delete_flag = 'normal'");
         dto.setOrderBy("grid_id,update_date desc");
@@ -152,27 +153,12 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
         return result;
     }
 
-    enum residentEnum {
-
-        RK("unicom", "ca_resident"),
-        AES("key", "hriajrutnbghajsd")
-        ;
-
-        private String name;
-        private String code;
-
-
-        residentEnum(String name, String code) {
-            this.name = name;
-            this.code = code;
-        }
-    }
 
     private int listResident(PreserVationFormDTO dto) throws Exception {
-        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), residentEnum.AES.code);
+        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
-        obj.put("unicomCondition",aes);
+        obj.put(CaWghDataConstant.UNICOM_CONDITION,aes);
-        String data = HttpClientManager.getInstance().sendPostByJSON("http://120.221.72.83:9090/bridge/unicom/page", obj.toJSONString()).getData();
+        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!result.success()) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java

@@ -14,6 +14,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.opendata.dao.CaRotatorsDao;
 import com.epmet.opendata.dto.ca.CaRotatorsDTO;
+import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.CaRotatorsDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
@@ -124,8 +125,8 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
         baseDao.deleteAll();
         dto.setPageNo(NumConstant.ONE);
         dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(rotatorsEnum.LDRK.name);
+        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(rotatorsEnum.LDRK.code);
+        dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS);
 
         dto.setWhereCase("delete_flag = 'normal'");
         dto.setOrderBy("grid_id,update_date desc");
@@ -154,8 +155,7 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
     enum rotatorsEnum {
 
         LDRK("unicom", "ca_rotators"),
-        AES("key", "hriajrutnbghajsd")
+        AES("key", "hriajrutnbghajsd");
-        ;
 
         private String name;
         private String code;
@@ -169,10 +169,10 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
     }
 
     private int listRotators(PreserVationFormDTO dto) throws Exception {
-        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), rotatorsEnum.AES.code);
+        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
-        obj.put("unicomCondition",aes);
+        obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
-        String data = HttpClientManager.getInstance().sendPostByJSON("http://120.221.72.83:9090/bridge/unicom/page", obj.toJSONString()).getData();
+        String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!result.success()) {