调整代码

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/CaLoudongDTO.java → epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaLoudongDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.opendata.dto;
+package com.epmet.opendata.dto.ca;
 
 import java.io.Serializable;
 import java.util.Date;

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/CaPingfangDTO.java → epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaPingfangDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.opendata.dto;
+package com.epmet.opendata.dto.ca;
 
 import java.io.Serializable;
 import java.util.Date;

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/CaRentalDTO.java → epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaRentalDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.opendata.dto;
+package com.epmet.opendata.dto.ca;
 
 import java.io.Serializable;
 import java.util.Date;

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/CaResidentDTO.java → epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaResidentDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.opendata.dto;
+package com.epmet.opendata.dto.ca;
 
 import java.io.Serializable;
 import java.util.Date;

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/CaRotatorsDTO.java → epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaRotatorsDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.opendata.dto;
+package com.epmet.opendata.dto.ca;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -0,0 +1,24 @@
+package com.epmet.opendata.dto.constant;
+
+/***
+ * 综治及网格化常量
+ * @author work@yujt.net.cn
+ * @date 2022/6/8/0008 10:00
+ */
+public interface CaWghDataConstant {
+
+
+    String AESKEY = "hriajrutnbghajsd";
+
+    String TABLESCHEMA_UNICOM = "unicom";
+
+    String UNICOM_PINGFANG = "ca_pingfang";
+
+
+    String UNICOM_LOUDONG = "ca_loudong";
+    String UNICOM_RESIDENT = "ca_resident";
+    String UNICOM_ROTATORS = "ca_rotators";
+    String UNICOM_RENTAL = "ca_rental";
+
+    String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page";
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java

@@ -11,7 +11,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.opendata.dto.CaLoudongDTO;
+import com.epmet.opendata.dto.ca.CaLoudongDTO;
 import com.epmet.opendata.dto.form.CaLoudongDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaLoudongFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java

@@ -11,7 +11,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.opendata.dto.CaPingfangDTO;
+import com.epmet.opendata.dto.ca.CaPingfangDTO;
 import com.epmet.opendata.dto.form.CaPingFangDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaPingfangFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRentalController.java

@@ -11,12 +11,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.opendata.dto.CaRentalDTO;
+import com.epmet.opendata.dto.ca.CaRentalDTO;
-import com.epmet.opendata.dto.form.CaLoudongFormDTO;
 import com.epmet.opendata.dto.form.CaRentalDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRentalFormtDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
-import com.epmet.opendata.dto.result.CaLoudongResultDTO;
 import com.epmet.opendata.dto.result.CaRentalDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaRentalResultDTO;
 import com.epmet.opendata.excel.CaRentalExcel;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java

@@ -11,12 +11,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.opendata.dto.CaResidentDTO;
+import com.epmet.opendata.dto.ca.CaResidentDTO;
-import com.epmet.opendata.dto.form.CaLoudongFormDTO;
 import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaResidentFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
-import com.epmet.opendata.dto.result.CaLoudongResultDTO;
 import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaResidentResultDTO;
 import com.epmet.opendata.excel.CaResidentExcel;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRotatorsController.java

@@ -11,12 +11,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.dto.ca.CaRotatorsDTO;
-import com.epmet.opendata.dto.form.CaLoudongFormDTO;
 import com.epmet.opendata.dto.form.CaRotatorsDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
-import com.epmet.opendata.dto.result.CaLoudongResultDTO;
 import com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.excel.CaRotatorsExcel;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java

@@ -2,8 +2,7 @@ package com.epmet.opendata.dao;
 
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.VolunteerPolyListResultDTO;
+import com.epmet.opendata.dto.ca.CaLoudongDTO;
-import com.epmet.opendata.dto.CaLoudongDTO;
 import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaLoudongResultDTO;
 import com.epmet.opendata.entity.CaLoudongEntity;

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

@@ -3,7 +3,7 @@ package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.opendata.dto.CaLoudongDTO;
+import com.epmet.opendata.dto.ca.CaLoudongDTO;
 import com.epmet.opendata.dto.form.CaLoudongDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaLoudongFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;

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

@@ -3,7 +3,7 @@ package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.opendata.dto.CaPingfangDTO;
+import com.epmet.opendata.dto.ca.CaPingfangDTO;
 import com.epmet.opendata.dto.form.CaPingFangDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaPingfangFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;

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

@@ -2,7 +2,7 @@ package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.opendata.dto.CaRentalDTO;
+import com.epmet.opendata.dto.ca.CaRentalDTO;
 import com.epmet.opendata.dto.form.CaRentalDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRentalFormtDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;

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

@@ -2,7 +2,7 @@ package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.opendata.dto.CaResidentDTO;
+import com.epmet.opendata.dto.ca.CaResidentDTO;
 import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaResidentFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;

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

@@ -2,7 +2,7 @@ package com.epmet.opendata.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.dto.ca.CaRotatorsDTO;
 import com.epmet.opendata.dto.form.CaRotatorsDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;

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

@@ -1,7 +1,6 @@
 package com.epmet.opendata.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -12,7 +11,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 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.CaLoudongDTO;
+import com.epmet.opendata.dto.ca.CaLoudongDTO;
 import com.epmet.opendata.dto.form.CaLoudongDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaLoudongFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
@@ -24,13 +23,11 @@ import com.epmet.opendata.service.CaLoudongService;
 import com.epmet.opendata.util.AesUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.google.gson.JsonObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**

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

@@ -12,14 +12,12 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 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.CaPingfangDTO;
+import com.epmet.opendata.dto.ca.CaPingfangDTO;
 import com.epmet.opendata.dto.form.CaPingFangDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaPingfangFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
-import com.epmet.opendata.dto.result.CaLoudongResultDTO;
 import com.epmet.opendata.dto.result.CaPingFangDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaPingfangResultDTO;
-import com.epmet.opendata.entity.CaLoudongEntity;
 import com.epmet.opendata.entity.CaPingfangEntity;
 import com.epmet.opendata.redis.CaPingfangRedis;
 import com.epmet.opendata.service.CaPingfangService;

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

@@ -13,14 +13,13 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.opendata.dao.CaRentalDao;
-import com.epmet.opendata.dto.CaRentalDTO;
+import com.epmet.opendata.dto.ca.CaRentalDTO;
+import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.CaRentalDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRentalFormtDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
-import com.epmet.opendata.dto.result.CaLoudongResultDTO;
 import com.epmet.opendata.dto.result.CaRentalDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaRentalResultDTO;
-import com.epmet.opendata.entity.CaLoudongEntity;
 import com.epmet.opendata.entity.CaRentalEntity;
 import com.epmet.opendata.redis.CaRentalRedis;
 import com.epmet.opendata.service.CaRentalService;
@@ -124,8 +123,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
 
         dto.setPageNo(NumConstant.ONE);
         dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(rentalEnum.CZF.name);
+        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(rentalEnum.CZF.code);
+        dto.setTableName(CaWghDataConstant.UNICOM_RENTAL);
 
         dto.setWhereCase("delete_flag = 'normal'");
         dto.setOrderBy("grid_id,update_date desc");
@@ -152,25 +151,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
         return result;
     }
 
-    enum rentalEnum {
-
-        CZF("unicom", "ca_rental"),
-        AES("key", "hriajrutnbghajsd")
-        ;
-
-        private String name;
-        private String code;
-
-
-        rentalEnum(String name, String code) {
-            this.name = name;
-            this.code = code;
-        }
-
-    }
-
     private int listRental(PreserVationFormDTO dto) throws Exception {
-        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), rentalEnum.AES.code);
+        String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
         obj.put("unicomCondition", aes);
         String data = HttpClientManager.getInstance().sendPostByJSON("http://120.221.72.83:9090/bridge/unicom/page", obj.toJSONString()).getData();

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

@@ -11,17 +11,14 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.IcResiUserDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.opendata.dao.CaResidentDao;
-import com.epmet.opendata.dto.CaResidentDTO;
+import com.epmet.opendata.dto.ca.CaResidentDTO;
 import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaResidentFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
-import com.epmet.opendata.dto.result.CaLoudongResultDTO;
 import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaResidentResultDTO;
-import com.epmet.opendata.entity.CaLoudongEntity;
 import com.epmet.opendata.entity.CaResidentEntity;
 import com.epmet.opendata.redis.CaResidentRedis;
 import com.epmet.opendata.service.CaResidentService;

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

@@ -11,17 +11,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.IcResiUserDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.opendata.dao.CaRotatorsDao;
-import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.dto.ca.CaRotatorsDTO;
 import com.epmet.opendata.dto.form.CaRotatorsDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
-import com.epmet.opendata.dto.result.CaLoudongResultDTO;
 import com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
-import com.epmet.opendata.entity.CaLoudongEntity;
 import com.epmet.opendata.entity.CaRotatorsEntity;
 import com.epmet.opendata.redis.CaRotatorsRedis;
 import com.epmet.opendata.service.CaRotatorsService;

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

@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.service.*;
 import org.apache.commons.lang3.StringUtils;
@@ -33,59 +34,23 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService {
             residentService.preserResidentVation(dto);
             rotatorsService.preserRotatorsVation(dto);
         }
-        TableName name = TableName.getTableByOutSide(dto.getTableName());
-        if (null == name) {
-            throw new Error();
-        }
 
-        switch (name) {
+        switch (dto.getTableName()) {
-            case LD:
+            case CaWghDataConstant.UNICOM_LOUDONG:
                 caLoudongService.preserLouDongVation(dto);
                 break;
-            case PF:
+            case CaWghDataConstant.UNICOM_PINGFANG:
                 pingfangService.preserPingFangVation(dto);
                 break;
-            case RK:
+            case CaWghDataConstant.UNICOM_RESIDENT:
                 residentService.preserResidentVation(dto);
                 break;
-            case CZF:
+            case CaWghDataConstant.UNICOM_RENTAL:
                 rentalService.preserRentalVation(dto);
                 break;
-            case LDRK:
+            case CaWghDataConstant.UNICOM_ROTATORS:
                 rotatorsService.preserRotatorsVation(dto);
                 break;
         }
     }
-
-    enum TableName {
-        LD("ca_loudong"),
-        PF("ca_pingfang"),
-        RK("ca_resident"),
-        LDRK("ca_rotators"),
-        CZF("ca_rental");
-
-        private String tableName;
-
-        TableName(String tableOs) {
-
-            this.tableName = tableOs;
-        }
-
-
-        public String getTableName() {
-            return tableName;
-        }
-
-        static TableName getTableByOutSide(String outSideName) {
-            if (StringUtils.isNotBlank(outSideName)) {
-                TableName[] values = TableName.values();
-                for (TableName value : values) {
-                    if (value.getTableName().equals(outSideName)) {
-                        return value;
-                    }
-                }
-            }
-            return null;
-        }
-    }
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml

@@ -51,7 +51,7 @@
     <delete id="deleteAll">
         delete from ca_loudong
     </delete>
-    <select id="getList" resultType="com.epmet.opendata.dto.CaLoudongDTO">
+    <select id="getList" resultType="com.epmet.opendata.dto.ca.CaLoudongDTO">
         select * from ca_loudong where delete_flag = 'normal'
     </select>
     <select id="getPage" resultType="com.epmet.opendata.dto.result.CaLoudongResultDTO">