侦查指令导入 车辆布控

src/main/java/com/founder/config/FilterConfig.java

@@ -16,7 +16,7 @@ public class FilterConfig extends WebMvcConfigurerAdapter {
                 excludePathPatterns("/relogin","/reloginto","/css/**","/js/**","/img/**"
                         ,"/refreshCodeCache","/loginFail","/login","/toGetZczlListYth",
                         "/queryAllzTreeData","/queryUnitCode","/queryTypeCode",
-                        "/queryZTreeDataByName"
+                        "/queryZTreeDataByName","/receivedNewData"
                 );
     }
 

src/main/java/com/founder/config/SchedulingConfig.java

+package com.founder.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/*
+ * @Description TODO
+ * @Author du_pengfei
+ * @Date 2021/10/12
+ * @Version 1.0
+ */
+@Configuration
+@EnableScheduling
+public class SchedulingConfig implements SchedulingConfigurer {
+
+    @Bean
+    public ExecutorService executor(){
+        return Executors.newScheduledThreadPool(5);
+    }
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar registrar) {
+        registrar.setScheduler(executor());
+    }
+}

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

@@ -42,6 +42,7 @@ public class AppNotificationVO {
     public String vehicleheight;
     public String vehiclelength;
     public String wheelprintedpattern;
+    public String deviceid;
 
     public String getNotificationId() {
         return notificationId;
@@ -322,4 +323,12 @@ public class AppNotificationVO {
     public void setWheelprintedpattern(String wheelprintedpattern) {
         this.wheelprintedpattern = wheelprintedpattern;
     }
+
+    public String getDeviceid() {
+        return deviceid;
+    }
+
+    public void setDeviceid(String deviceid) {
+        this.deviceid = deviceid;
+    }
 }

src/main/java/com/founder/seq/service/AnjianSeqService.java

@@ -22,4 +22,6 @@ public interface AnjianSeqService {
 
     String ngzbhzhFnVal(String tablename);
 
+    String importZlbhFnVal(String tableName, String unitCode);
+
 }

src/main/java/com/founder/seq/service/AutoSeqService.java

@@ -39,6 +39,17 @@ public  class AutoSeqService implements AnjianSeqService {
         return autoSeqDao.ngzbhzhFnVal(statMap);
     }
 
+    @Override
+    public String importZlbhFnVal(String tableName, String unitCode) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+        HashMap statMap = new HashMap();
+        statMap.put("unitcode", unitCode);
+        statMap.put("tblname", tableName);
+        statMap.put("headstr", getheadstr(tableName));
+        statMap.put("lrsj", formatter.format(new Date()));
+        return autoSeqDao.ngzbhzhFnVal(statMap);
+    }
+
     private String getheadstr(String tblname){
         Sequence sequenceconf = (Sequence) SequenceConfig.loadSequenceConfig().get(tblname);
         if(sequenceconf == null ){

src/main/java/com/founder/zczl/dao/ZczlDao.java

@@ -2,6 +2,7 @@ package com.founder.zczl.dao;
 
 import com.founder.model.*;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -161,11 +162,13 @@ public interface ZczlDao {
 
     List<String> queryAllUserIdByYwlx(String startId);
 
-    List<AppNotificationVO> queryNotification(String id);
+    AppNotificationVO queryNotification(@Param("id") String id);
 
     List<TbAppSubimageinfoobject> queryImageInfo(String id);
 
-    int updateNotification(String id);
+    int updateNotification(@Param("id") String id);
 
+    List<String> queryNotSeedNotification();
 
+    String queryUnitCode(@Param("subCode") String subCode);
 }

src/main/java/com/founder/zczl/service/IZczlService.java

@@ -149,4 +149,19 @@ public interface IZczlService {
     String doQxfp(TbYwZczlSpqx tbYwZczlSpqx);
 
 
+    AppNotificationVO queryNotification(String str);
+
+    List<TbAppSubimageinfoobject> queryImageInfo(String notificationId);
+
+    int updateNotification(String id);
+
+    void importZczl(TbYwZczl tbYwZczl);
+
+    String getXxzjbhFnVal(String unitCode);
+
+    void saveImportZczlfj(TbYwZczlFj fjxx);
+
+    List<String> queryNotSeedNotification();
+
+    String queryUnitCode(String subCode);
 }

src/main/java/com/founder/zczl/service/impl/ZczlService.java

@@ -883,6 +883,14 @@ public class ZczlService implements IZczlService {
         return autoSeqDao.xxzjbhFnVal(statMap);
     }
 
+    public String xxzjbhFnVal(String unitCode){
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+        HashMap statMap = new HashMap();
+        statMap.put("unitcode", unitCode);
+        statMap.put("lrsj", formatter.format(new Date()));
+        return autoSeqDao.xxzjbhFnVal(statMap);
+    }
+
     public String ngzbhzhFnVal(String tblname){
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         HashMap statMap = new HashMap();
@@ -1917,4 +1925,46 @@ public class ZczlService implements IZczlService {
     }
 
     //审批权限查询与设置--end
+
+    @Override
+    public AppNotificationVO queryNotification(String str) {
+        return zczlDao.queryNotification(str);
+    }
+
+    @Override
+    public List<TbAppSubimageinfoobject> queryImageInfo(String notificationId) {
+        return zczlDao.queryImageInfo(notificationId);
+    }
+
+    @Override
+    public int updateNotification(String id) {
+        return zczlDao.updateNotification(id);
+    }
+
+    @Override
+    public void importZczl(TbYwZczl tbYwZczl) {
+        zczlDao.doAddZczlxx(tbYwZczl);
+    }
+
+    @Override
+    public String getXxzjbhFnVal(String unitCode) {
+        return xxzjbhFnVal(unitCode);
+    }
+
+    @Override
+    public void saveImportZczlfj(TbYwZczlFj fjxx) {
+        zczlDao.saveZczlfj(fjxx);
+    }
+
+    @Override
+    public List<String> queryNotSeedNotification() {
+        return zczlDao.queryNotSeedNotification();
+    }
+
+    @Override
+    public String queryUnitCode(String subCode) {
+        return zczlDao.queryUnitCode(subCode);
+    }
+
+
 }

src/main/resources/application-pro.properties

-spring.datasource.url=jdbc:oracle:thin:@47.92.129.99:1600:ORCL
+spring.datasource.url=jdbc:oracle:thin:@10.86.64.17:1521:btxz
 spring.datasource.username=XZXT
 spring.datasource.password=XZXT
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
@@ -9,27 +9,27 @@ logging.level.org.spring.springboot.dao=debug
 
 #redis config
 #\u65B0\u7586
-spring.redis.host=127.0.0.1
+spring.redis.host=10.20.47.137
 #\u5185\u8499
 #redis.host=10.100.17.124
 spring.redis.port=6379
-spring.redis.password=
+spring.redis.password=xzxt#65
 
 spring.jmx.enabled= false
 
-#权限
-qxUrl=http://qx.xzxt.nm:9044
-domain=.xzxt.nm
-#综合应用
-zhyyPath=http://zhyy.xzxt.nm:7001
-ssdw=65
-#侦查指令
+#Ȩ��
+qxUrl=http://qx.xzxt.bt:9044
+domain=.xzxt.bt
+#�ۺ�Ӧ��
+zhyyPath=http://zhyy.xzxt.bt:7001
+ssdw=66
+#���ָ��
 zczlUrl=http://localhost:9022
-#案件侦办
+#�������
 asjZbUrl = http://192.168.0.100:9100
-#案件串并
+#��������
 asjCbUrl = http://localhost:9013
-#侦查平台
+#���ƽ̨
 zcptUrl = http://192.168.0.108:9100
-#在逃平台
+#����ƽ̨
 ztptUrl = http://192.168.0.108:9100
\ No newline at end of file

src/main/resources/mapper/ZczlMapper.xml

@@ -1857,18 +1857,18 @@
         select n.TITLE title,
                n.NOTIFICATIONID notificationId,
                m.BRANDRELIABILITY brandreliability,
-               m.CALLING calling,
+               case when m.CALLING = 0 then '未打电话' when m.calling = 1 then '打电话中' end calling,
                m.CAROFVEHICLE carofvehicle,
                m.NUMOFPASSENGER numofpassenger,
                m.DIRECTION direction,
-               m.SAFETYBELT safetybelt,
-               m.HASPLATE hasplate,
+               case when m.SAFETYBELT = 0 then '未系' when m.SAFETYBELT = 1 then '有系' end safetybelt,
+               case when m.HASPLATE = '0' then '无' when m.HASPLATE = 1 then '有' end hasplate,
                m.HITMARKINFO hitmarkinfo,
-               m.ISALTERED isaltered,
-               m.ISCOVERED iscovered,
-               m.ISDECKED isdecked,
-               m.ISMODIFIED ismodified,
-               m.ISSUSPICIOUS issuspicious,
+               case when m.ISALTERED = '0' then '否' when m.ISALTERED = '1' then '是' end isaltered,
+               case when m.ISCOVERED = '0' then '否' when m.ISCOVERED = '1' then '是' end iscovered,
+               case when m.ISDECKED = '0' then '否' when m.ISDECKED = '1' then '是' end isdecked,
+               case when m.ISMODIFIED = '0' then '否' when m.ISMODIFIED = '1' then '是' end ismodified,
+               case when m.ISSUSPICIOUS = '0' then '否' when m.ISSUSPICIOUS = '1' then '是' issuspicious,
                m.MOTORVEHICLEID motorvehicleid,
                m.NAMEOFPASSEDROAD nameofpassedroad,
                to_char(to_date(m.PASSDAY, 'yyyyMMdd hh24miss'), 'yyyy-MM-dd hh24:mi:ss') passday,
@@ -1888,13 +1888,13 @@
                m.VEHICLECOLOR vehiclecolor,
                m.VEHICLEHEIGHT vehicleheight,
                m.VEHICLELENGTH vehiclelength,
-               m.WHEELPRINTEDPATTERN wheelprintedpattern
+               m.WHEELPRINTEDPATTERN wheelprintedpattern,
+               m.DEVICEID deviceid
 
         from TB_APP_NOTIFICATION n left join TB_APP_MOTORVEHICLEOBJECT m on n.NOTIFICATIONID = m.NOTIFICATIONID
-        where n.flag = '0'
-        <if test="id != null and id != '' ">
-            and n.NOTIFICATIONID = #{id, jdbcType=VARCHAR}
-        </if>
+        where 1=1 and send_zczl_flag = 0
+        and n.NOTIFICATIONID = #{id, jdbcType=VARCHAR}
+
     </select>
 
     <select id="queryImageInfo" resultType="com.founder.model.TbAppSubimageinfoobject">
@@ -1902,16 +1902,24 @@
                WIDTH width,
                STORAGEPATH storagepath
         from TB_APP_SUBIMAGEINFOOBJECT
-        <if test="id != null and id != '' ">
-            and n.NOTIFICATIONID = #{id, jdbcType=VARCHAR}
-        </if>
+        where 1=1
+            and NOTIFICATIONID = #{id, jdbcType=VARCHAR}
+
     </select>
 
     <update id="updateNotification" >
-        update TB_APP_NOTIFICATION set flag = '1'
+        update TB_APP_NOTIFICATION set send_zczl_flag = 1
         where NOTIFICATIONID = #{id, jdbcType=VARCHAR}
     </update>
 
+    <select id="queryNotSeedNotification" resultType="java.lang.String">
+        select NOTIFICATIONID from TB_APP_NOTIFICATION where send_zczl_flag = 0
+    </select>
+
+    <select id="queryUnitCode" resultType="java.lang.String">
+        select code from sys_dictitem where groupid = 'CODE_XZUNIT' and (code like '66__00050000' or code like '66__00040000') and code like #{subCode, jdbcType=VARCHAR} || '%'
+    </select>
+
 
 
 

src/test/java/com/founder/ZczlServiceApplicationTests.java

@@ -3,17 +3,20 @@ package com.founder;
 import cn.afterturn.easypoi.entity.ImageEntity;
 import com.founder.model.AppNotificationVO;
 import com.founder.util.WordUtil;
+import com.founder.zczl.controller.ZczlController;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
 public class ZczlServiceApplicationTests {
 
 	@Test
@@ -25,14 +28,20 @@ public class ZczlServiceApplicationTests {
 		ArrayList<ImageEntity> imageEntities = new ArrayList<>();
 		map.put("title", "蒙A12345");
 		map.put("brandreliability", "100");
+		//map.put("calling", null);
 
-		imageEntities.add(new ImageEntity(WordUtil.image2byte("https://t7.baidu.com/it/u=2531125946,3055766435&fm=193&f=GIF"), 200, 100));
-		imageEntities.add(new ImageEntity(WordUtil.image2byte("https://t7.baidu.com/it/u=2168645659,3174029352&fm=193&f=GIF"), 200, 100));
-		imageEntities.add(new ImageEntity(WordUtil.image2byte("https://t7.baidu.com/it/u=2168645659,3174029352&fm=193&f=GIF"), 200, 100));
+		//ArrayList<ImageEntity> imageEntities1 = new ArrayList<>();
+		//imageEntities1.add(new ImageEntity(WordUtil.image2byte("https://t7.baidu.com/it/u=2168645659,3174029352&fm=193&f=GIF"), 200, 100));
+		map.put("storageurl5", new ImageEntity(WordUtil.image2byte("https://t7.baidu.com/it/u=2168645659,3174029352&fm=193&f=GIF"), 200, 100));
+
+
+		imageEntities.add(new ImageEntity(WordUtil.image2byte("https://192.168.3.1/ts"), 200, 100));
+		//imageEntities.add(new ImageEntity(WordUtil.image2byte("https://t7.baidu.com/it/u=2168645659,3174029352&fm=193&f=GIF"), 200, 100));
+		//imageEntities.add(new ImageEntity(WordUtil.image2byte("https://t7.baidu.com/it/u=2168645659,3174029352&fm=193&f=GIF"), 200, 100));
 
 		map.put("pictures", imageEntities);
 
-		WordUtil.exportWord("src/main/resources/word/export.docx", "src/main/resources/temp", "aaa.docx", map);
+		WordUtil.exportWord("src/main/resources/word/export.docx", "src/main/resources/temp/", "aab.docx", map);
 
 
 
@@ -44,5 +53,24 @@ public class ZczlServiceApplicationTests {
 	}
 
 
+	@Test
+	public void getPath(){
+		//System.out.println(ZczlController.getRootPath());
+		///Users/mac/zczlService/src/test/java/com/founder/ZczlServiceApplicationTests.java
+
+		String classPath = Thread.currentThread().getContextClassLoader()
+				.getResource("").getPath();
+		System.out.println(classPath);
+	}
+
+	@Test
+	public void dateTime(){
+
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd/hh:mm:ss");
+		System.out.println(LocalDateTime.now().format(formatter));
+
+		String s = "slfsdkfj12345".substring(-5);
+		System.out.println(s);
+	}
 
 }