注册ip所在地，机构全称

src/main/java/com/caimei365/tools/controller/BaseApi.java

@@ -5,12 +5,15 @@ import com.caimei365.tools.service.CmOrganValueSystemService;
 import com.caimei365.tools.service.CmRepurchaseFrequencyService;
 import com.caimei365.tools.service.CmVipCouponService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 
 /**
  * Description
@@ -21,6 +24,7 @@ import javax.annotation.Resource;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/tools")
+@Slf4j
 public class BaseApi {
 
     @Resource
@@ -43,10 +47,11 @@ public class BaseApi {
     /**
      * 临时接口
      */
-    /*@GetMapping("/record/update")
-    public void svipCoupon(){
-        cmBehaviorRecordService.insertBehaviorUser();
-    }*/
+    @GetMapping("/record/update")
+    public void svipCoupon(Integer startId, Integer endId) throws IOException {
+
+        cmBehaviorRecordService.setIpAddress(startId, endId);
+    }
 
     /**
      * 数据ip地址

src/main/java/com/caimei365/tools/mapper/CmBehaviorRecordMapper.java

@@ -45,13 +45,13 @@ public interface CmBehaviorRecordMapper {
      * 查询所有老数据
      * @return
      */
-    List<CmBehaviorRecordPo> findList(@Param("startId") Integer startId, @Param("endId") Integer endId);
+    List<CmUserPo> findList(@Param("startId") Integer startId, @Param("endId") Integer endId);
 
     /**
      * 修改老数据ip所在地
-     * @param cmBehaviorRecordPo
+     * @param userPo
      */
-    void updateOldData(CmBehaviorRecordPo cmBehaviorRecordPo);
+    void updateOldData(CmUserPo userPo);
 
     List<CmVipCouponPo> selSvipCoupon(@Param("startTime") String startTime, @Param("endTime") String endTime);
 

src/main/java/com/caimei365/tools/model/po/CmUserPo.java

@@ -40,6 +40,7 @@ public class CmUserPo implements Serializable {
     private String auditNote;        // auditNote
     private String registerTime;        // 注册时间
     private String registerIP;        // 注册ip
+    private String ipAddress;        // 注册ip地址
     private String loginTime;        // 登录时间
     private String loginFailTime;        // 登录失败次数
     private String loginIP;        // 登录ip

src/main/java/com/caimei365/tools/service/CmBehaviorRecordService.java

@@ -3,6 +3,8 @@ package com.caimei365.tools.service;
 import com.caimei365.tools.model.po.CmBehaviorRecordPo;
 import com.caimei365.tools.model.po.IpSavePo;
 
+import java.io.IOException;
+
 /**
  * Description
  *
@@ -14,7 +16,7 @@ public interface CmBehaviorRecordService {
 
     void updateBehaviorTime();
 
-    void setIpAddress(Integer startId, Integer endId);
+    void setIpAddress(Integer startId, Integer endId) throws IOException;
 
     void updateBehaviorUser();
 

src/main/java/com/caimei365/tools/service/impl/CmBehaviorRecordServiceImpl.java

@@ -3,6 +3,7 @@ package com.caimei365.tools.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.caimei365.tools.mapper.CmBehaviorRecordMapper;
 import com.caimei365.tools.model.po.CmBehaviorRecordPo;
+import com.caimei365.tools.model.po.CmUserPo;
 import com.caimei365.tools.model.po.IpSavePo;
 import com.caimei365.tools.service.CmBehaviorRecordService;
 import lombok.extern.slf4j.Slf4j;
@@ -256,16 +257,15 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
     }
 
     @Override
-    public void setIpAddress(Integer startId, Integer endId) {
-        List<CmBehaviorRecordPo> list = recordMapper.findList(startId,endId);
+    public void setIpAddress(Integer startId, Integer endId) throws IOException {
+        List<CmUserPo> list = recordMapper.findList(startId,endId);
         String region = "";
-        for (CmBehaviorRecordPo recordPo: list) {
+        for (CmUserPo user: list) {
             try {
                 // 获取ip所在地
-                region = recordIp(recordPo.getIP());
-                recordPo.setRegion(region);
-                recordPo.setIsReckon("1");
-                recordMapper.updateOldData(recordPo);
+                region = recordIp(user.getRegisterIP());
+                user.setIpAddress(region);
+                recordMapper.updateOldData(user);
             } catch (IOException e) {
                 e.printStackTrace();
             }

src/main/resources/mapper/CmBehaviorRecordMapper.xml

@@ -23,14 +23,13 @@
             isReckon = #{isReckon}
         WHERE recordID = #{recordID}
     </update>
-    <select id="findList" resultType="com.caimei365.tools.model.po.CmBehaviorRecordPo">
-        SELECT * FROM cm_behavior_record where recordID between #{startId} and #{endId}
+    <select id="findList" resultType="com.caimei365.tools.model.po.CmUserPo">
+        SELECT userID, registerIP FROM USER where userID between #{startId} and #{endId}
     </select>
     <update id="updateOldData">
-        UPDATE cm_behavior_record
-        SET isReckon = #{isReckon},
-            region = #{region}
-        WHERE recordID = #{recordID}
+        UPDATE USER
+        SET ipAddress = #{ipAddress}
+        WHERE userID = #{userID}
     </update>
 
 
@@ -203,8 +202,8 @@
         END)AS companyType,
         (
         CASE WHEN b.userID = 0 THEN ''
-        WHEN u.userIdentity = 2 THEN c.sname
-        WHEN u.userIdentity = 4 THEN IF(c.sname != u.userName,c.sname,'')
+        WHEN u.userIdentity = 2 THEN c.name
+        WHEN u.userIdentity = 4 THEN IF(c.name != u.userName,c.name,'')
         END)AS corporateName,
         (
         CASE WHEN b.userID = 0 THEN ''
@@ -234,7 +233,6 @@
         LEFT JOIN USER u ON b.userID = u.userID
         LEFT JOIN club c ON b.userID = c.userID
         LEFT JOIN shop s ON b.userID = s.userID
-        LEFT JOIN cm_roos_information cri ON b.IP = cri.IP
         WHERE  b.IP != '106.55.202.118' AND b.delFlag = 0  AND b.accessDate = #{accessDate}
         GROUP BY b.IP, b.accessDate,b.userID, b.behaviorType ORDER BY b.accessTime DESC
     </select>