投选日期，及主键修改

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/TpInfoMapper.java

 package com.ruoyi.system.mapper;
 package com.ruoyi.system.mapper;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.system.domain.TpInfo;
 import com.ruoyi.system.domain.TpInfo;
 import com.ruoyi.system.domain.TpInfoCb;
 import com.ruoyi.system.domain.TpInfoCb;
 
 
@@ -85,7 +87,7 @@ public interface TpInfoMapper
      */
      */
     public int deleteTpInfoCbByZbid(Long id);
     public int deleteTpInfoCbByZbid(Long id);
 
 
-    TpInfo selectTpInfoByIp(String ip);
+    TpInfo selectTpInfoByIp(Map map);
 
 
 
 
     List<TpInfo> selectTpInfoListjg(TpInfo tpInfo);
     List<TpInfo> selectTpInfoListjg(TpInfo tpInfo);

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/TpInfoServiceImpl.java

@@ -2,8 +2,7 @@ package com.ruoyi.system.service.impl;
 
 
 import java.net.Inet4Address;
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
 import java.net.UnknownHostException;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DateUtils;
@@ -12,7 +11,6 @@ import com.ruoyi.system.domain.TpDept;
 import com.ruoyi.system.mapper.TpDeptMapper;
 import com.ruoyi.system.mapper.TpDeptMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import java.util.ArrayList;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.system.domain.TpInfoCb;
 import com.ruoyi.system.domain.TpInfoCb;
@@ -69,7 +67,7 @@ public class TpInfoServiceImpl implements ITpInfoService
     @Override
     @Override
     public AjaxResult insertTpInfo(TpInfo tpInfo) throws UnknownHostException {
     public AjaxResult insertTpInfo(TpInfo tpInfo) throws UnknownHostException {
         Date nowDate = DateUtils.getNowDate();
         Date nowDate = DateUtils.getNowDate();
-        Date date = DateUtils.dateTime("yyyy-MM-dd", "2024-10-20");
+        Date date = DateUtils.dateTime("yyyy-MM-dd", "2024-10-22");
 
 
         if(nowDate.after(date)){
         if(nowDate.after(date)){
             return AjaxResult.error("已过投票日期，不允许投票！");
             return AjaxResult.error("已过投票日期，不允许投票！");
@@ -77,10 +75,21 @@ public class TpInfoServiceImpl implements ITpInfoService
 
 
         String ipdz = Inet4Address.getLocalHost().getHostAddress();
         String ipdz = Inet4Address.getLocalHost().getHostAddress();
 //        String ip = IpUtils.getIpAddr();
 //        String ip = IpUtils.getIpAddr();
-        String ip = tpInfo.getIpdz();
-        tpInfo.setIpdz(ip);
+
+        String adzh = tpInfo.getIpdz();// ad
+        String tyzh = tpInfo.getYl1(); // 统一
+        if(null==tyzh||"".equals(tyzh)){
+            return AjaxResult.error("请重新登录");
+        }
+        if(null==adzh||"".equals(adzh)){
+           adzh = tyzh;
+        }
+        tpInfo.setIpdz(tyzh);  //后续都存id
         //根据ip查询
         //根据ip查询
-        TpInfo tpInfo1=tpInfoMapper.selectTpInfoByIp(ip);
+        Map map = new HashMap();
+        map.put("adzh", adzh);
+        map.put("tyzh", tyzh);
+        TpInfo tpInfo1=tpInfoMapper.selectTpInfoByIp(map);
         if(tpInfo1!=null){
         if(tpInfo1!=null){
            return AjaxResult.error("已投票，请勿重复投票");
            return AjaxResult.error("已投票，请勿重复投票");
         }
         }

ruoyi-admin/src/main/resources/mapper/system/TpInfoMapper.xml

@@ -63,10 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from tp_info_cb
         from tp_info_cb
         where zbid = #{zbid}
         where zbid = #{zbid}
     </select>
     </select>
-    <select id="selectTpInfoByIp" resultMap="TpInfoResult">
+    <select id="selectTpInfoByIp" resultMap="TpInfoResult" parameterType="java.util.Map">
         select id, name, sfzh, ipdz, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5
         select id, name, sfzh, ipdz, create_by, create_time, update_by, update_time, remark, yl1, yl2, yl3, yl4, yl5
         from tp_info
         from tp_info
-        where ipdz = #{ip}
+        where (ipdz =#{adzh} or ipdz = #{tyzh} )
     </select>
     </select>
     <select id="selectTpInfoListjg" resultMap="TpInfoResult">
     <select id="selectTpInfoListjg" resultMap="TpInfoResult">
         select a.name,a.ipdz,a.create_time,GROUP_CONCAT(b.dwmc) dwmc from tp_info a left join tp_info_cb b on a.id=b.zbid
         select a.name,a.ipdz,a.create_time,GROUP_CONCAT(b.dwmc) dwmc from tp_info a left join tp_info_cb b on a.id=b.zbid