预警行政划分

src/main/java/org/springblade/founder/ztrxyj/entity/ZtryYjYhcz.java

@@ -49,4 +49,5 @@ public class ZtryYjYhcz {
 	 * 操作类型：1删除
 	 */
 	private String czlx;
+
 }

src/main/java/org/springblade/founder/ztrxyj/entity/Ztryyjxx.java

@@ -66,6 +66,25 @@ public class Ztryyjxx {
 	private String deviceName;
 	private String captureUrl;
 
+	public String getQhmc() {
+		return qhmc;
+	}
+
+	public void setQhmc(String qhmc) {
+		this.qhmc = qhmc;
+	}
+
+	private String qhmc;
+
+	public String getQhdm() {
+		return qhdm;
+	}
+
+	public void setQhdm(String qhdm) {
+		this.qhdm = qhdm;
+	}
+
+	private String qhdm;
 	public String getScbz() {
 		return scbz;
 	}

src/main/java/org/springblade/founder/ztrxyj/mapper/ztgjMapper.xml

@@ -18,12 +18,14 @@
 
     <select id="getListYjgj" resultType="org.springblade.founder.ztrxyj.entity.Ztryyjxx">
         select xxzjbh, faceName, faceUrl, score, captureTime,
-        faceDbId, faceCertNo, alarmTime, faceDbName, panoramaUrl, deviceId, deviceName,
+        faceDbId, faceCertNo, alarmTime, faceDbName, panoramaUrl, yj.deviceId, yj.deviceName,
+        (select dict.name from sys_dictitem dict
+        where dict.code=(select left(yd.gbCode,6) from tb_maztry_yj_device yd where yd.deviceId=yj.deviceId ) and dict.groupid = 'CODE_XZQH' ) qhmc,
         captureUrl from tb_maztry_yj yj right join (
 
          select idcard,zpsj from ( select
         faceCertNo idcard, max(captureTime) zpsj
-        from tb_maztry_yj
+        from tb_maztry_yj yj left join tb_maztry_yj_device sb on yj.deviceId=sb.deviceId
         <where>
         and scbz='0'
         <if test="xxzjbh != null and xxzjbh != ''">
@@ -32,6 +34,9 @@
             <if test="faceName != null and faceName != ''">
                 and faceName = #{faceName}
             </if>
+            <if test="qhdm != null and qhdm != ''">
+                and left(sb.gbCode,6) like concat(#{qhdm},'%')
+            </if>
 
             <if test="score != null and score != ''">
                 and score = #{score}
@@ -79,7 +84,7 @@
     <select id="getListYjgjCount" resultType="java.lang.Integer">
       select count(1) from (  select idcard,zpsj from ( select
         faceCertNo idcard, max(captureTime) zpsj
-        from tb_maztry_yj
+        from tb_maztry_yj yj left join tb_maztry_yj_device sb on yj.deviceId=sb.deviceId
         <where>
             and scbz='0'
             <if test="xxzjbh != null and xxzjbh != ''">
@@ -88,7 +93,9 @@
             <if test="faceName != null and faceName != ''">
                 and faceName = #{faceName}
             </if>
-
+            <if test="qhdm != null and qhdm != ''">
+                and left(sb.gbCode,6) like concat(#{qhdm},'%')
+            </if>
             <if test="score != null and score != ''">
                 and score = #{score}
             </if>
@@ -129,15 +136,20 @@
     </select>
     <select id="getListYjXqgj" resultType="org.springblade.founder.ztrxyj.entity.Ztryyjxx">
          select  xxzjbh, faceName, faceUrl, score, captureTime,
-            faceDbId, faceCertNo, alarmTime, faceDbName, panoramaUrl, deviceId, deviceName, captureUrl,
+            faceDbId, faceCertNo, alarmTime, faceDbName, panoramaUrl, yj.deviceId, yj.deviceName, captureUrl,
             (select cz.xxdjry_xm from tb_maztry_yj_yhcz cz where cz.glxxzjbh=yj.xxzjbh limit 1 ) scrxm,
-        (select cz.xxdjdw_gajgmc from tb_maztry_yj_yhcz cz where cz.glxxzjbh=yj.xxzjbh  limit 1) scrdwmc
-            from tb_maztry_yj yj
+        (select cz.xxdjdw_gajgmc from tb_maztry_yj_yhcz cz where cz.glxxzjbh=yj.xxzjbh  limit 1) scrdwmc,
+        (select dict.name from sys_dictitem dict where dict.code=left(sb.gbCode,6) and dict.groupid = 'CODE_XZQH' ) qhmc
+            from tb_maztry_yj yj left join tb_maztry_yj_device sb
+        on yj.deviceId=sb.deviceId
         <where>
+
             <if test="scbz != null and scbz != ''">
                 and scbz=#{scbz}
             </if>
-
+            <if test="qhdm != null and qhdm != ''">
+                and left(sb.gbCode,6) like concat(#{qhdm},'%')
+            </if>
             <if test="xxzjbh != null and xxzjbh != ''">
                 and xxzjbh = #{xxzjbh}
             </if>
@@ -182,12 +194,16 @@
         order by captureTime desc limit  #{ page }, #{ limit }
     </select>
     <select id="getListYjXqgjCount" resultType="java.lang.Integer">
-        select  count(1)  from tb_maztry_yj yj
+        select  count(1)  from tb_maztry_yj yj left join tb_maztry_yj_device sb
+        on yj.deviceId=sb.deviceId
         <where>
 
             <if test="scbz != null and scbz != ''">
                 and scbz=#{scbz}
             </if>
+            <if test="qhdm != null and qhdm != ''">
+                and left(sb.gbCode,6) like concat(#{qhdm},'%')
+            </if>
             <if test="xxzjbh != null and xxzjbh != ''">
                 and xxzjbh = #{xxzjbh}
             </if>

src/main/java/org/springblade/founder/ztrxyj/service/ztgjServiceImpl.java

@@ -40,6 +40,15 @@ public class ztgjServiceImpl implements ztgjService {
 		int end = easyUIPage.getEnd();
 		ztryyjxx.setPage(begin);
 		ztryyjxx.setLimit(end);
+		if (StringUtils.isNotEmpty(ztryyjxx.getQhdm())) {
+			String zhfzxyrHjdzXzqhdm = ztryyjxx.getQhdm();
+			if (zhfzxyrHjdzXzqhdm.endsWith("0000")) {
+				zhfzxyrHjdzXzqhdm = zhfzxyrHjdzXzqhdm.substring(0, 2);
+			} else if (zhfzxyrHjdzXzqhdm.endsWith("00")) {
+				zhfzxyrHjdzXzqhdm = zhfzxyrHjdzXzqhdm.substring(0, 4);
+			}
+			ztryyjxx.setQhdm(zhfzxyrHjdzXzqhdm);
+		}
 		rtMap.put("rows",ztgj.getListYjgj(ztryyjxx));
 		rtMap.put("total",ztgj.getListYjgjCount(ztryyjxx));
 
@@ -103,6 +112,18 @@ public class ztgjServiceImpl implements ztgjService {
 					JSONObject result=JSONObject.parseObject(resultString);
 					if(result.getInteger("code")==200){
 						ztgj.updatesftsZtzp(certNo);
+						XzxtUser user = SecureUtil.getUserXzxt();
+						ZtryYjYhcz yhcz=new ZtryYjYhcz();
+						yhcz.setXxzjbh(getOrderIdByUuid());
+						yhcz.setGlxxzjbh(certNo);
+						yhcz.setXxdjryXm(user.getRealname());
+						yhcz.setXxdjdwGajgjgdm(user.getUnitcode());
+						yhcz.setXxdjdwGajgmc(user.getUnitname());
+						yhcz.setXxdjryGmsfhm(user.getIdentitycard());
+						yhcz.setXxdjryLxdh(user.getPhone());
+						yhcz.setCzlx("2"); //1删除,2撤控
+
+						ztgj.insertYjYhcz(yhcz);
 					}else {
 						//推送未成功2,删除3，推送成功1
 						ztgj.updatesftsZtzp(certNo);
@@ -154,6 +175,15 @@ public class ztgjServiceImpl implements ztgjService {
 		int end = easyUIPage.getEnd();
 		ztryyjxx.setPage(begin);
 		ztryyjxx.setLimit(end);
+		if (StringUtils.isNotEmpty(ztryyjxx.getQhdm())) {
+			String zhfzxyrHjdzXzqhdm = ztryyjxx.getQhdm();
+			if (zhfzxyrHjdzXzqhdm.endsWith("0000")) {
+				zhfzxyrHjdzXzqhdm = zhfzxyrHjdzXzqhdm.substring(0, 2);
+			} else if (zhfzxyrHjdzXzqhdm.endsWith("00")) {
+				zhfzxyrHjdzXzqhdm = zhfzxyrHjdzXzqhdm.substring(0, 4);
+			}
+			ztryyjxx.setQhdm(zhfzxyrHjdzXzqhdm);
+		}
 		rtMap.put("rows",ztgj.getListYjXqgj(ztryyjxx));
 		rtMap.put("total",ztgj.getListYjXqgjCount(ztryyjxx));