Merge remote-tracking branch 'origin/master'

test-api/src/main/java/com/sooka/mapper/Guiji_Public_Resource_Mapper.java

@@ -0,0 +1,19 @@
+package com.sooka.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sooka.model.bo.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@DS("db1")
+public interface Guiji_Public_Resource_Mapper {
+
+    public void add_guiji_public_resource_call_for_bid(Guiji_City_Real_Estate1_housing_initial_Bean bean);
+    public void update_guiji_public_resource_call_for_bid(Guiji_City_Real_Estate1_housing_initial_Bean bean);
+    
+    public void add_guiji_public_resource_change_the_bid(Guiji_City_Real_Estate2_housing_stock_Bean bean);
+    public void update_guiji_public_resource_change_the_bid(Guiji_City_Real_Estate2_housing_stock_Bean bean);
+    
+    public void add_guiji_public_resource_win_the_bid(Guiji_City_Real_Estate3_housing_commercial_Bean bean);
+    public void update_guiji_public_resource_win_the_bid(Guiji_City_Real_Estate3_housing_commercial_Bean bean);
+}

test-api/src/main/java/com/sooka/mapper/Guiji_Public_Resource_Mapper2.java

@@ -0,0 +1,21 @@
+package com.sooka.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sooka.model.bo.Guiji_City_Real_Estate1_housing_initial_Bean;
+import com.sooka.model.bo.Guiji_City_Real_Estate2_housing_stock_Bean;
+import com.sooka.model.bo.Guiji_City_Real_Estate3_housing_commercial_Bean;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@DS("db1")
+public interface Guiji_Public_Resource_Mapper2 {
+
+    public void add_guiji_public_resource_call_for_bid(Guiji_City_Real_Estate1_housing_initial_Bean bean);
+    public void update_guiji_public_resource_call_for_bid(Guiji_City_Real_Estate1_housing_initial_Bean bean);
+    
+    public void add_guiji_public_resource_change_the_bid(Guiji_City_Real_Estate2_housing_stock_Bean bean);
+    public void update_guiji_public_resource_change_the_bid(Guiji_City_Real_Estate2_housing_stock_Bean bean);
+    
+    public void add_guiji_public_resource_win_the_bid(Guiji_City_Real_Estate3_housing_commercial_Bean bean);
+    public void update_guiji_public_resource_win_the_bid(Guiji_City_Real_Estate3_housing_commercial_Bean bean);
+}

test-api/src/main/java/com/sooka/service/Guiji_Public_Resource_Service.java

@@ -0,0 +1,10 @@
+package com.sooka.service;
+
+import com.sooka.model.ResultModel;
+
+public interface Guiji_Public_Resource_Service {
+
+    public ResultModel guiji_public_resource_call_for_bid(String str);
+    public ResultModel guiji_public_resource_change_the_bid(String str);
+    public ResultModel guiji_public_resource_win_the_bid(String str);
+}

test-api/src/main/java/com/sooka/service/impl/Guiji_City_Real_Estate_ServiceImpl.java

@@ -659,7 +659,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "0c6b93b3-b52d-4fc8-bd3b-0b310888a093");
+            log.put("interfaceinfoId", "2af1310c-e2c4-4e3c-92e7-c1dd04af77c7");
             log.put("interfaceinfoName", "归集-市房地产-现售变更信息");
 
             Guiji_City_Real_Estate17_on_sale_change_Bean bean = new Guiji_City_Real_Estate17_on_sale_change_Bean();
@@ -698,7 +698,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "af1310c-e2c4-4e3c-92e7-c1dd04af77c7");
+            log.put("interfaceinfoId", "e4a44bce-ff87-418a-903e-9dca90ec4f06");
             log.put("interfaceinfoName", "归集-市房地产-预转现信息");
 
             Guiji_City_Real_Estate18_pre_to_on_Bean bean = new Guiji_City_Real_Estate18_pre_to_on_Bean();
@@ -737,7 +737,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "e4a44bce-ff87-418a-903e-9dca90ec4f06");
+            log.put("interfaceinfoId", "965719d0-825c-49c1-89d0-c7e212e677b2");
             log.put("interfaceinfoName", "归集-市房地产-预售备案信息");
 
             Guiji_City_Real_Estate19_pre_sale_record_Bean bean = new Guiji_City_Real_Estate19_pre_sale_record_Bean();
@@ -776,7 +776,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "965719d0-825c-49c1-89d0-c7e212e677b2");
+            log.put("interfaceinfoId", "5043a50c-73de-47f5-8f98-ca7fee7d55e1");
             log.put("interfaceinfoName", "归集-市房地产-预售备案变更信息");
 
             Guiji_City_Real_Estate20_pre_sale_record_change_Bean bean = new Guiji_City_Real_Estate20_pre_sale_record_change_Bean();
@@ -815,7 +815,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "5043a50c-73de-47f5-8f98-ca7fee7d55e1");
+            log.put("interfaceinfoId", "217a4aa5-d938-4a4e-a4ec-929502bb64eb");
             log.put("interfaceinfoName", "归集-市房地产-现售备案信息");
 
             Guiji_City_Real_Estate21_on_sale_record_Bean bean = new Guiji_City_Real_Estate21_on_sale_record_Bean();
@@ -854,7 +854,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "217a4aa5-d938-4a4e-a4ec-929502bb64eb");
+            log.put("interfaceinfoId", "eac6031c-367f-4050-9271-90f95e0ab187");
             log.put("interfaceinfoName", "归集-市房地产-现售备案变更信息");
 
             Guiji_City_Real_Estate22_on_sale_record_change_Bean bean = new Guiji_City_Real_Estate22_on_sale_record_change_Bean();
@@ -893,7 +893,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "eac6031c-367f-4050-9271-90f95e0ab187");
+            log.put("interfaceinfoId", "7711dc00-78db-4f60-ab1d-225868512ad0");
             log.put("interfaceinfoName", "归集-市房地产-预售补录信息");
 
             Guiji_City_Real_Estate23_pre_sale_additional_Bean bean = new Guiji_City_Real_Estate23_pre_sale_additional_Bean();
@@ -932,7 +932,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "7711dc00-78db-4f60-ab1d-225868512ad0");
+            log.put("interfaceinfoId", "93f0e9a0-ee96-4609-954c-de60b11a2341");
             log.put("interfaceinfoName", "归集-市房地产-备案补录信息");
 
             Guiji_City_Real_Estate24_record_additional_Bean bean = new Guiji_City_Real_Estate24_record_additional_Bean();
@@ -971,7 +971,7 @@ public class Guiji_City_Real_Estate_ServiceImpl extends BaseService implements G
         try {
             log.put("operationStatus", "1");
             log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
-            log.put("interfaceinfoId", "93f0e9a0-ee96-4609-954c-de60b11a2341");
+            log.put("interfaceinfoId", "9af497c8-c53f-4632-b126-c36f32872296");
             log.put("interfaceinfoName", "归集-市房地产-合同退房信息");
 
             Guiji_City_Real_Estate25_contract_check_out_Bean bean = new Guiji_City_Real_Estate25_contract_check_out_Bean();

test-api/src/main/java/com/sooka/service/impl/Guiji_Public_Resource_ServiceImpl.java

@@ -0,0 +1,145 @@
+package com.sooka.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.sooka.base.BaseApi;
+import com.sooka.base.BaseService;
+import com.sooka.mapper.Guiji_City_Real_Estate_Mapper;
+import com.sooka.mapper.Guiji_City_Real_Estate_Mapper2;
+import com.sooka.mapper.Guiji_Public_Resource_Mapper;
+import com.sooka.mapper.Guiji_Public_Resource_Mapper2;
+import com.sooka.model.ResultModel;
+import com.sooka.model.bo.*;
+import com.sooka.service.Guiji_Public_Resource_Service;
+import com.sooka.utils.HttpUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class Guiji_Public_Resource_ServiceImpl extends BaseService implements Guiji_Public_Resource_Service {
+
+    @Resource
+    Guiji_Public_Resource_Mapper guiji_public_resource_mapper;
+    @Resource
+    Guiji_Public_Resource_Mapper2 guiji_public_resource_mapper2;
+
+    @Override
+    public ResultModel guiji_public_resource_call_for_bid(String str) {
+        ResultModel r = new ResultModel();
+        Map log = new HashMap();
+        try {
+            log.put("operationStatus", "1");
+            log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
+            log.put("interfaceinfoId", "0671dc14-994e-418b-9c61-7122b0928005");
+            log.put("interfaceinfoName", "归集-市公共资源-招标公告");
+
+            Guiji_City_Real_Estate1_housing_initial_Bean bean = new Guiji_City_Real_Estate1_housing_initial_Bean();
+            initBaseGuijiBean(str, bean);
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
+            JSONObject Data = bean.getData();
+            bean.setStr(str);
+            if (bean.getCd_operation().equals("I")) {
+                guiji_public_resource_mapper.add_guiji_public_resource_call_for_bid(bean);
+                guiji_public_resource_mapper2.add_guiji_public_resource_call_for_bid(bean);
+            } else {
+                guiji_public_resource_mapper.update_guiji_public_resource_call_for_bid(bean);
+                guiji_public_resource_mapper2.update_guiji_public_resource_call_for_bid(bean);
+            }
+            r.setCode(0);
+            r.setMessage("成功");
+        } catch (Exception e) {
+            log.put("operationStatus", "0");
+            log.put("exceptionLog", e);
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        } finally {
+            log.put("param", str);
+            log.put("results", r);
+            HttpUtil.doPost(BaseApi.manager_url + "/system/interfaceLog/addLog", JSONObject.toJSONString(log), null);
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel guiji_public_resource_change_the_bid(String str) {
+        ResultModel r = new ResultModel();
+        Map log = new HashMap();
+        try {
+            log.put("operationStatus", "1");
+            log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
+            log.put("interfaceinfoId", "5074b30a-4000-4e5e-88af-ef639aac057c");
+            log.put("interfaceinfoName", "归集-市公共资源-变更公告");
+
+            Guiji_City_Real_Estate2_housing_stock_Bean bean = new Guiji_City_Real_Estate2_housing_stock_Bean();
+            initBaseGuijiBean(str, bean);
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
+            JSONObject Data = bean.getData();
+            bean.setStr(str);
+            if (bean.getCd_operation().equals("I")) {
+                guiji_public_resource_mapper.add_guiji_public_resource_change_the_bid(bean);
+                guiji_public_resource_mapper2.add_guiji_public_resource_change_the_bid(bean);
+            } else {
+                guiji_public_resource_mapper.update_guiji_public_resource_change_the_bid(bean);
+                guiji_public_resource_mapper2.update_guiji_public_resource_change_the_bid(bean);
+            }
+            r.setCode(0);
+            r.setMessage("成功");
+        } catch (Exception e) {
+            log.put("operationStatus", "0");
+            log.put("exceptionLog", e);
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        } finally {
+            log.put("param", str);
+            log.put("results", r);
+            HttpUtil.doPost(BaseApi.manager_url + "/system/interfaceLog/addLog", JSONObject.toJSONString(log), null);
+        }
+        return r;
+    }
+
+    @Override
+    public ResultModel guiji_public_resource_win_the_bid(String str) {
+        ResultModel r = new ResultModel();
+        Map log = new HashMap();
+        try {
+            log.put("operationStatus", "1");
+            log.put("platformInterfacetype", "platform_interfacetype_2");//1 共享 2归集
+            log.put("interfaceinfoId", "cf3ce04f-628f-4d93-b4e4-f27429d3fc18");
+            log.put("interfaceinfoName", "归集-市公共资源-中标公告");
+
+            Guiji_City_Real_Estate3_housing_commercial_Bean bean = new Guiji_City_Real_Estate3_housing_commercial_Bean();
+            initBaseGuijiBean(str, bean);
+            JSONObject jsonObject = JSON.parseObject(str);
+            bean.setId(jsonObject.getString("id"));
+            JSONObject Data = bean.getData();
+            bean.setStr(str);
+            if (bean.getCd_operation().equals("I")) {
+                guiji_public_resource_mapper.add_guiji_public_resource_win_the_bid(bean);
+                guiji_public_resource_mapper2.add_guiji_public_resource_win_the_bid(bean);
+            } else {
+                guiji_public_resource_mapper.update_guiji_public_resource_win_the_bid(bean);
+                guiji_public_resource_mapper2.update_guiji_public_resource_win_the_bid(bean);
+            }
+            r.setCode(0);
+            r.setMessage("成功");
+        } catch (Exception e) {
+            log.put("operationStatus", "0");
+            log.put("exceptionLog", e);
+            e.printStackTrace();
+            r.setCode(99999);
+            r.setMessage("失败");
+        } finally {
+            log.put("param", str);
+            log.put("results", r);
+            HttpUtil.doPost(BaseApi.manager_url + "/system/interfaceLog/addLog", JSONObject.toJSONString(log), null);
+        }
+        return r;
+    }
+}