我的设备管理初始查询时添加本地机器ip

src/main/java/com/founder/cjqx/dao/SysClientVpMapper.java

@@ -11,6 +11,8 @@ import java.util.List;
 public interface SysClientVpMapper {
     List<SysClientVp> selectPageList(SysClientVp sysClientVp);
 
+    List<SysClientVp> selectPagejktjList(SysClientVp sysClientVp);
+
     List<SysClientVp> getRycjtjListycs(SysClientVp sysClientVp);
     List<SysClientVp> getRycjtjListzwcjs(SysClientVp sysClientVp);
     List<SysClientVp> getRycjtjListzwwcjs(SysClientVp sysClientVp);

src/main/java/com/founder/cjqx/service/SysClientVpService.java

@@ -12,6 +12,7 @@ import java.util.List;
  */
 public interface SysClientVpService {
     ResultMap ClientVpAll(SysClientVp SysClientVp);
+    ResultMap ClientVpjkAll(SysClientVp SysClientVp);
     SysClientVp getClientVp(SysClientVp sysClientVp);
     XzxtRestResult SaveClientVp(SysClientVp sysClientVp);
     XzxtRestResult SelectClientVp(String id);

src/main/java/com/founder/cjqx/service/impl/SysClientVpServiceImpl.java

@@ -35,8 +35,36 @@ public class SysClientVpServiceImpl implements SysClientVpService {
 
     @Override
     public ResultMap ClientVpAll(SysClientVp sysClientVp) {
+        List<SysClientVp> sysClientVplist=sysClientVpMapper.selectPageList(sysClientVp);
+        ResultMap resultMap=new ResultMap();
+        if (!StringUtils.isEmpty(sysClientVplist)) {
+            //解密
+            for(SysClientVp sysClient : sysClientVplist ){
+                if(sysClient.getPid().length()>=24){
+                    sysClient.setPid(xzxtdecode(sysClient.getPid()));
+                }
+                if(sysClient.getVid().length()>=24){
+                    sysClient.setVid(xzxtdecode(sysClient.getVid()));
+                }
+                if(sysClient.getIp()!=null && sysClient.getIp().length()>=24){
+                    sysClient.setIp(xzxtdecode(sysClient.getIp()));
+                }
+                if(sysClient.getMac()!=null && sysClient.getMac().length()>=24){
+                    sysClient.setMac(xzxtdecode(sysClient.getMac()));
+                }
+            }
+            int totals=sysClientVpMapper.selectPageCount(sysClientVp);
+            resultMap.setCount(totals);
+            resultMap.setData(sysClientVplist);
+            return resultMap;
+        }
+        return resultMap ;
+    }
+
+    @Override
+    public ResultMap ClientVpjkAll(SysClientVp sysClientVp) {
         List<SysClientVp> sysClientVpResultList = new ArrayList<SysClientVp>();
-        List<SysClientVp> sysClientVplist = sysClientVpMapper.selectPageList(sysClientVp);
+        List<SysClientVp> sysClientVplist = sysClientVpMapper.selectPagejktjList(sysClientVp);
 
         List<SysClientVp> rycjtjListycs = sysClientVpMapper.getRycjtjListycs(sysClientVp);
         List<SysClientVp> rycjtjListzwcjs = sysClientVpMapper.getRycjtjListzwcjs(sysClientVp);

src/main/java/com/founder/model/SysClientVp.java

@@ -17,6 +17,8 @@ public class SysClientVp extends PageBean{
 
     private String ip;
 
+    private String baseIp;//本机ip
+
     private String mac;
 
     private String ifythcjy;
@@ -157,6 +159,14 @@ public class SysClientVp extends PageBean{
 
     private String sjwcjs;//手机未采集数
 
+    public String getBaseIp() {
+        return baseIp;
+    }
+
+    public void setBaseIp(String baseIp) {
+        this.baseIp = baseIp;
+    }
+
     public void setMinlrsjStr(String minlrsjStr) {
         this.minlrsjStr = minlrsjStr;
     }

src/main/resources/mapper/SysClientVpMapper.xml

@@ -76,7 +76,7 @@
 
   <sql id="queryWhere" >
     <where>
-      <if test="id!=null and id !=''">AND  vp.id = #{id}</if>
+        <if test="id!=null and id !=''">AND  vp.id = #{id}</if>
         <if test="ip!=null and ip !=''">AND  vp.ip = #{ip}</if>
         <if test="mac!=null and mac !=''">AND  vp.mac = #{mac}</if>
         <if test="ifythcjy!=null and ifythcjy !=''">AND  vp.ifythcjy = #{ifythcjy}</if>
@@ -86,11 +86,26 @@
         <if test="ssdwcode!=null and ssdwcode !=''">AND  vp.SSDW_CODE like #{ssdwcode}||'%'</if>
         <if test="maxlrsjStr != null and maxlrsjStr != ''"> and vp.lrsj <![CDATA[<]]> to_date(#{maxlrsjStr , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
         <if test="minlrsjStr != null and minlrsjStr != ''"> and vp.lrsj <![CDATA[>=]]> to_date(#{minlrsjStr , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
-       AND SCBZ='0'
+        <if test="baseIp!=null and baseIp !=''">or  vp.ip = #{baseIp}</if>
+        AND SCBZ='0'
     </where>
   </sql>
+
+    <!-- 通过条件分页查询，返回数据集 -->
+    <select id="selectPageList" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
+        SELECT * FROM
+        (
+        SELECT A.*, ROWNUM RN
+        FROM (SELECT * FROM Sys_Client_Vp vp
+        <include refid="queryWhere"/>) A
+        WHERE ROWNUM <![CDATA[ <= ]]>  ${end}
+        order by A.SPZT,A.GXSJ desc
+        )
+        WHERE RN <![CDATA[ >= ]]> ${begin}
+    </select>
+
   <!-- 通过条件分页查询，返回数据集 -->
-  <select id="selectPageList" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
+  <select id="selectPagejktjList" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
     SELECT * FROM
     (
       SELECT A.*, ROWNUM RN

src/main/resources/templates/cjqx/sbjkglform.html

@@ -155,7 +155,7 @@
         var laydate = layui.laydate;
         table.render({
             elem: '#test'
-            ,url:'sysClientVplist'
+            ,url:'sysClientjklist'
             ,toolbar: ''
             ,title: '审批设备列表'
             ,method:'get'

src/main/resources/templates/cjqx/sbxxform.html

@@ -220,6 +220,7 @@
                         ifythcjy:$("#ifythcjy option:selected").val(),
                         spzt: $("#spzt  option:selected").val(),
                         sbztstr: $("#sbztstr  option:selected").val(),
+                        ssdwcode: $("#ssdwcode").combobox("getValue"),
                         cjsblxcode:'2'
                     }
                 });