合并0128分支

suishenbang-api/src/main/resources/application-prod.yml

@@ -99,6 +99,18 @@ spring:
           socketFactory:
             #SSL连接配置
             class: javax.net.ssl.SSLSocketFactory
+
+#hana数据库数据同步配置
+hana:
+  hana-driver: com.sap.db.jdbc.Driver
+  hana-url: jdbc:sap://hanaentsltp.nipponpaint.com.cn:30015?reconnect=true
+  hana-user: SSB_HANA
+  hana-pwd: Erty567*
+  mysql-driver: com.mysql.jdbc.Driver
+  mysql-url: jdbc:mysql://pc-nipponpaintproddb01.rwlb.rds.aliyuncs.com:3306/ssbprd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+  mysql-user: ssbprd
+  mysql-pwd: Ssbprd#0828
+
   # redis配置
 #  redis:
 #      # Redis数据库索引（默认为0）

suishenbang-api/src/main/resources/application-uat.yml

@@ -42,6 +42,21 @@ server:
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
+#hana数据库数据同步配置
+hana:
+  #  hana-driver: com.sap.db.jdbc.Driver
+  #  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+  #  hana-user: SSB_HANA
+  #  hana-pwd: s$EW12445T
+  #  hana-driver: com.sap.db.jdbc.Driver
+  #  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+  #  hana-user: SSB_HANA
+  #  hana-pwd: s$EW12445T
+  hana-driver: com.sap.db.jdbc.Driver
+  hana-url: jdbc:sap://hanaentsltp.nipponpaint.com.cn:30015?reconnect=true
+  hana-user: SSB_HANA
+  hana-pwd: Erty567*
+  mysql-driver: com.mysql.jdbc.Driver
 
 # 日志配置
 logging:

suishenbang-order/src/main/java/com/dgtly/order/controller/CustomersStartController.java

@@ -100,13 +100,15 @@ public class CustomersStartController extends BaseController
      * 经销商解冻查询接口
      */
     @PostMapping("/addFreeCustomer")
-    public String addFreeCustomer(String customer) {
+    @ResponseBody
+    public AjaxResult addFreeCustomer(String customer) {
+        String str ="";
         try {
-            hanaOrderComponent.hanaFreezeCustomer(customer);
+            str = hanaOrderComponent.getFreezeCustomer(customer);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        return "执行成功";
+        return AjaxResult.success(str);
     }
     @Autowired
     private ISysUserOrderAuthorService sysUserOrderAuthorService;

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -126,7 +126,7 @@ public class RyTask
 
     /**HANA已冻结经销商**/
     public void hanaFreezeCustomer()throws Exception{
-        hanaOrderComponent.hanaFreezeCustomer("");
+        hanaOrderComponent.hanaFreezeCustomer();
     }
 
 

suishenbang-system/src/main/java/com/dgtly/system/mapper/DeliverQuantityConfirmMapper.java

@@ -41,7 +41,9 @@ public interface DeliverQuantityConfirmMapper
    void  saveDeliverNumber(@Param("list") List<DeliverQuantityConfirm> list);
 
 
+    Integer insertCus(String customer);
 
+    Integer selectCus(String customer);
 
 
 

suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserOrderAuthorService.java

@@ -118,4 +118,8 @@ public interface ISysUserOrderAuthorService
      */
     void customersStart();
 
+    int insertCus(String customer);
+
+    int selectCus(String  customer);
+
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -909,6 +909,16 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         }
     }
 
+    @Override
+    public int insertCus(String customer) {
+        return deliverQuantityConfirmMapper.insertCus( customer);
+    }
+
+    @Override
+    public int selectCus(String customer) {
+        return deliverQuantityConfirmMapper.selectCus( customer);
+    }
+
     public Set<String> getConfigValueSet(String dictType){
             Set<String> res = new HashSet<>();
             List<SysDictData> dictDatas = sysDictDataService.selectSimpleDictDataByType(dictType);

suishenbang-system/src/main/resources/mapper/system/CustomerMapper.xml

@@ -180,5 +180,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  (#{item.customersCode},#{item.customersName},#{item.onlineTime},#{item.customerType})
              </foreach>
     </insert>
-    
+
 </mapper>

suishenbang-system/src/main/resources/mapper/system/DeliverQuantityConfirmMapper.xml

@@ -114,5 +114,11 @@
         </foreach>
     </insert>
 
+    <select id="insertCus" parameterType="java.lang.String" resultType="java.lang.Integer">
+        insert into meta_hana_not_freeze_customer(customer_code,create_time) values(#{customer}, NOW())
+    </select>
 
+    <select id="selectCus"  parameterType="java.lang.String" resultType="java.lang.Integer">
+            select count(*) from meta_hana_not_freeze_customer where customer_code = #{customer}
+    </select>
 </mapper>

suishenbang-wxportal/suishenbang-wxportal-api/pom.xml

@@ -26,5 +26,10 @@
             <artifactId>suishenbang-wxportal-common</artifactId>
             <version>4.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>suishenbang-sync-common</artifactId>
+            <version>4.0.0</version>
+        </dependency>
     </dependencies>
 </project>

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/FreeCustomerController.java

@@ -0,0 +1,42 @@
+package com.dgtly.wxportal.controller;
+
+import com.dgtly.common.annotation.ApiPassToken;
+import com.dgtly.common.core.domain.AjaxResult;
+import com.dgtly.sync.service.HanaOrderComponent;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api(tags = "經銷商相关接口")
+@RestController
+@RequestMapping("/free")
+@ApiPassToken
+@Slf4j
+public class FreeCustomerController {
+
+
+
+
+    @Autowired
+    private HanaOrderComponent hanaOrderComponent;
+    /**
+     * 经销商解冻查询接口
+     */
+    @PostMapping("/addFreeCustomer")
+    @ResponseBody
+    public AjaxResult addFreeCustomer(String customer) {
+        String str = "";
+        try {
+            str = hanaOrderComponent.getFreezeCustomer(customer);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return AjaxResult.self(str);
+    }
+
+}