Merge branch 'main' of http://10.10.14.176:3000/huanghai/ccZhiChengTouPiao

src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java

@@ -7,6 +7,7 @@ import com.dsideal.FengHuang.TouPiao.Model.TouPiaoModel;
 import com.dsideal.FengHuang.Util.CommonUtil;
 import com.dsideal.FengHuang.Util.ExcelExportUtil;
 import com.dsideal.FengHuang.Util.FileUtil;
+import com.dsideal.FengHuang.Util.IpUtil;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
@@ -59,6 +60,7 @@ public class TouPiaoController extends Controller {
     @Before({POST.class})
     @IsLoginInterface({})
     public void save(String gaoji, String zhongji) {
+        String ip = IpUtil.getIpAddr(getRequest());
         String toupiaoren_tel = getCookie("toupiaoren_tel");
         if (tm.haveFinishTouPiao(toupiaoren_tel)) {
             Kv kv = Kv.create();
@@ -85,7 +87,7 @@ public class TouPiaoController extends Controller {
             renderJson(kv);
             return;
         }
-        tm.save(toupiaoren_tel, gaojiArray, zhongjiArray);
+        tm.save(toupiaoren_tel, gaojiArray, zhongjiArray,ip);
         Kv kv = Kv.create();
         kv.set("success", true);
         kv.set("message", "投票成功 !");

src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java

@@ -38,7 +38,7 @@ public class TouPiaoModel {
         return cnt > 0;
     }
 
-    public void save(String toupiaoren_tel, String[] gaojiArray, String[] zhongjiArray) {
+    public void save(String toupiaoren_tel, String[] gaojiArray, String[] zhongjiArray,String ip) {
         Record r = getTouPiaoRenInfo(toupiaoren_tel);
         int toupiaoren_type_id = r.getInt("toupiaoren_type_id");
         String sql = "delete from t_toupiao_result where toupiaoren_tel=?";
@@ -54,8 +54,9 @@ public class TouPiaoModel {
             record.set("houxuanren_type_id", 1);
 
             record.set("toupiaoren_tel", toupiaoren_tel);
-            record.set("toupiaoren_name", _map.get(s).getStr("toupiaoren_name"));
+            record.set("toupiaoren_name", _map.get(toupiaoren_tel).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
+            record.set("ip",ip);
             saveList.add(record);
         }
         for (String s : zhongjiArray) {
@@ -65,8 +66,9 @@ public class TouPiaoModel {
             record.set("houxuanren_type_id", 2);
 
             record.set("toupiaoren_tel", toupiaoren_tel);
-            record.set("toupiaoren_name", _map.get(s).getStr("toupiaoren_name"));
+            record.set("toupiaoren_name", _map.get(toupiaoren_tel).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
+            record.set("ip",ip);
             saveList.add(record);
         }
         Db.batchSave("t_toupiao_result", saveList, 100);

src/main/java/com/dsideal/FengHuang/Util/CommonUtil.java

@@ -559,7 +559,7 @@ public class CommonUtil {
 
     //检查是不是放行的特殊IP地址
     public static boolean checkAllowIpAddress(HttpServletRequest request) {
-        String ip = IpUtil.getIpAddr(request);;
+        String ip = IpUtil.getIpAddr(request);
         String[] ips = PropKit.get("IP").split(",");
         boolean flag = false;
         for (int i = 0; i < ips.length; i++)