加大于号

pom.xml

@@ -135,17 +135,6 @@
 		</dependency>
 
         <!-- 定时需要的jar包 -->
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>2.2.1</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency><!-- 该依赖必加，里面有sping对schedule的支持 -->
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
@@ -170,6 +159,10 @@
             <artifactId>druid</artifactId>
             <version>1.0.28</version>
         </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -595,7 +595,7 @@
 
   <select id="selectByGroupId" parameterType="java.lang.String" resultType="java.util.HashMap">
     SELECT
-      c.id,c.alias,c.ip,c.username,c.`password`,c.`port`,c.factory, c.type,c.org_id
+      c.id,c.alias,c.ip,c.username,c.password,c.port,c.factory, c.type,c.org_id
     FROM
       monitor_camera c
     LEFT JOIN monitor_gorup_camera gc ON gc.cameraid = c.id

src/main/java/com/chinaitop/depot/config/ScheduleConfig.java

@@ -48,7 +48,8 @@ public class ScheduleConfig {
         //可选，QuartzScheduler 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了
         factory.setOverwriteExistingJobs(true);
         //设置自动启动，默认为true
-        factory.setAutoStartup(true);
+//        factory.setAutoStartup(true);
+        factory.setAutoStartup(false);
 
         return factory;
     }

src/main/java/com/chinaitop/depot/monitor/mapper/DiagPlanMapper.xml

@@ -162,6 +162,9 @@
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.monitor.model.DiagPlan">
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_monitor_diag_plan.nextVal from dual
+    </selectKey>
     insert into monitor_diag_plan
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">

src/main/java/com/chinaitop/depot/monitor/mapper/DiagResultMapper.xml

@@ -138,6 +138,9 @@
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.monitor.model.DiagResult" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_monitor_diag_result.nextVal from dual
+    </selectKey>
     insert into monitor_diag_result
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -536,8 +539,8 @@
         JOIN (
           select * from (
             SELECT
-              row_number() over(partition by to_date(dr.camera_id, 'yyyy-mm-dd')) rn,
-              MAX(to_date(dr.create_time, 'yyyy-mm-dd')) over() create_time,
+              ROW_NUMBER() OVER(PARTITION BY dr.camera_id ORDER BY dr.create_time DESC) rn,
+              dr.create_time,
               dr.camera_id
             FROM
              monitor_diag_result dr

src/main/java/com/chinaitop/depot/monitor/mapper/GroupMapper.xml

@@ -109,6 +109,9 @@
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.monitor.model.Group">
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_monitor_group.nextVal from dual
+    </selectKey>
     insert into monitor_group
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -207,7 +210,10 @@
   </delete>
 
   <insert id="insertGroupCamera" parameterType="java.util.HashMap">
-     INSERT INTO monitor_gorup_camera(groupid,cameraid) values (#{groupid,jdbcType=INTEGER}, #{cameraid,jdbcType=INTEGER})
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_monitor_gorup_camera.nextVal from dual
+    </selectKey>
+     INSERT INTO monitor_gorup_camera(id,groupid,cameraid) values (#{id,jdbcType=INTEGER}, #{groupid,jdbcType=INTEGER}, #{cameraid,jdbcType=INTEGER})
   </insert>
 
   <delete id="deleteGroupCamera" parameterType="java.util.HashMap">

src/main/java/com/chinaitop/depot/monitor/service/impl/MonitorZDService.java

@@ -159,7 +159,7 @@ public class MonitorZDService {
                 monitorCamera.getUsername(),
                 monitorCamera.getPassword(),
                 factory,
-                Integer.parseInt(monitorCamera.getType()),
+                Integer.parseInt(monitorCamera.getType()),//球机的话检测会转一圈，枪机不会
                 zdvalue,rootPath);
 
         if(ret == 0){//成功
@@ -218,7 +218,7 @@ public class MonitorZDService {
             }
             diagResultMapper.insertSelective(diagResult);
             //todo 短信发送
-            sendMsg(sms.toString(),camera.getAlias(),zdArr[15],camera.getId().toString());
+//            sendMsg(sms.toString(),camera.getAlias(),zdArr[15],camera.getId().toString());
         }
     }
 

src/main/java/com/chinaitop/depot/monitor/service/impl/QualityDlagServiceImpl.java

@@ -8,7 +8,6 @@ import java.util.Map;
 import java.util.UUID;
 
 import com.chinaitop.depot.monitor.mapper.DiagPlanMapper;
-import org.apache.commons.lang.ObjectUtils;
 import org.quartz.CronScheduleBuilder;
 import org.quartz.CronTrigger;
 import org.quartz.Scheduler;
@@ -77,34 +76,34 @@ public class QualityDlagServiceImpl implements QualityDlagService {
     /**
 	 * 项目启动时，初始化定时器
 	 */
-	@PostConstruct
-	public void init() {
-		DiagPlanExample example = new DiagPlanExample();
-		List<DiagPlan> diagPlanList = diagPlanMapper.selectByExample(example);
-		for(DiagPlan list:diagPlanList) {
-			CronTrigger cronTrigger = MonitorUtils.getCronTrigger(scheduler, list.getQuartzid());
-			if(!ObjectUtils.toString(list.getQuartztime(),"").isEmpty()) {
-				//设置定时任务的时间触发规则
-				CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(list.getQuartztime());
-				CronTrigger cronTriggers = TriggerBuilder.newTrigger().withIdentity(list.getQuartzid(),quartzGroup) .withSchedule(scheduleBuilder).build();
-				MonitorJobEnty monitorJob = new MonitorJobEnty();
-				monitorJob.setId(list.getQuartzid());
-				monitorJob.setParams(list.getQuartzid());
-				monitorJob.setCronExpression(cronTriggers.getCronExpression());
-				monitorJob.setBeanName("MonitorJob");
-				monitorJob.setMethodName("run");
-				monitorJob.setCreateTime(new Date());
-				monitorJob.setStatus((byte)MonitorStatus.NORMAL.getValue());
-				monitorJob.setOrgId(list.getOrgId());
-				//如果不存在，则创建
-				if(cronTrigger == null) {
-					MonitorUtils.createMonitorJob(scheduler, monitorJob);
-				}else {
-					MonitorUtils.updateMonitorJob(scheduler, monitorJob);
-				}
-			}
-		}
-	}
+//	@PostConstruct
+//	public void init() {
+//		DiagPlanExample example = new DiagPlanExample();
+//		List<DiagPlan> diagPlanList = diagPlanMapper.selectByExample(example);
+//		for(DiagPlan list:diagPlanList) {
+//			CronTrigger cronTrigger = MonitorUtils.getCronTrigger(scheduler, list.getQuartzid());
+//			if(!ObjectUtils.toString(list.getQuartztime(),"").isEmpty()) {
+//				//设置定时任务的时间触发规则
+//				CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(list.getQuartztime());
+//				CronTrigger cronTriggers = TriggerBuilder.newTrigger().withIdentity(list.getQuartzid(),quartzGroup) .withSchedule(scheduleBuilder).build();
+//				MonitorJobEnty monitorJob = new MonitorJobEnty();
+//				monitorJob.setId(list.getQuartzid());
+//				monitorJob.setParams(list.getQuartzid());
+//				monitorJob.setCronExpression(cronTriggers.getCronExpression());
+//				monitorJob.setBeanName("MonitorJob");
+//				monitorJob.setMethodName("run");
+//				monitorJob.setCreateTime(new Date());
+//				monitorJob.setStatus((byte)MonitorStatus.NORMAL.getValue());
+//				monitorJob.setOrgId(list.getOrgId());
+//				//如果不存在，则创建
+//				if(cronTrigger == null) {
+//					MonitorUtils.createMonitorJob(scheduler, monitorJob);
+//				}else {
+//					MonitorUtils.updateMonitorJob(scheduler, monitorJob);
+//				}
+//			}
+//		}
+//	}
 
     /**
      * 诊断计划列表

src/main/java/com/chinaitop/depot/monitor/service/quartzJob/QualityJob.java

@@ -1,99 +0,0 @@
-/*
-package com.chinaitop.depot.monitor.service.quartzJob;
-
-import com.chinaitop.depot.monitor.model.DiagPlan;
-import com.chinaitop.depot.monitor.service.impl.QualityDlagServiceImpl;
-import com.chinaitop.depot.monitor.util.MonitorZD;
-import com.chinaitop.utils.activiti.SpringContextHolder;
-import com.chinaitop.utils.quartz.service.DepotScheduler;
-import com.chinaitop.utils.quartz.service.NeedQuartz;
-import org.quartz.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-*/
-/**
- * @auther mafy
- * @createtime 2017/10/22 0022
- *//*
-
-//注解为解决线程并发问题
-@DisallowConcurrentExecution
-@PersistJobDataAfterExecution
-public class QualityJob implements Job {
-
-    private QualityDlagServiceImpl qualityDlagService = SpringContextHolder.getBean(QualityDlagServiceImpl.class);//视频定时
-
-    private DepotScheduler myScheduler = SpringContextHolder.getBean(DepotScheduler.class);//定时器
-
-    //跑项目定时
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-
-        // 获取 JobDataMap , 并从中取出参数
-        JobDataMap data = jobExecutionContext.getJobDetail().getJobDataMap();
-        String id = data.getString(DepotScheduler.QUARTZID);//获取定时器id(新增定时那边获取过来的)，然后从数据库中查询对应的监测信息
-        String groupids = data.getString("groupids");//获取定时器分组数据
-        System.out.println("定时器-分组序号："+groupids);
-
-        //获取DiagPlan对象
-        QualityDlagServiceImpl qualityDlagService = SpringContextHolder.getBean(QualityDlagServiceImpl.class);
-        DiagPlan diagPlan = qualityDlagService.getDlagPlanByQuartzId(id);
-
-        new Thread(new QuartyThread(diagPlan)).start();
-    }
-
-
-    */
-/**
-     * 查询数据库获取所有定时任务，切开启定时
-     * @param scheduler
-     * @throws SchedulerException
-     *//*
-
-    public void qualityScheduler(Scheduler scheduler) throws SchedulerException{
-        initDLL();//加载dll文件
-        //initQuartzForZd();//加载定时计划
-    }
-
-    //初始化dll文件
-    private void initDLL(){
-//        System.out.println(System.getProperty("java.library.path"));
-        try {
-            System.loadLibrary("MonitorZD");
-//            MonitorZD monitorZD = SpringContextHolder.getBean(MonitorZD.class);
-            MonitorZD monitorZD = MonitorZD.getMonitorZDObj();
-            monitorZD.InitHCSdk();
-            monitorZD.InitDHSdk();
-        } catch (Exception e) {
-            System.out.println("DLL文件加载失败，视频诊断模块不可使用");
-            //e.printStackTrace();
-        }
-    }
-
-    //查询定时计划
-    private void initQuartzForZd(){
-        qualityDlagService = SpringContextHolder.getBean(QualityDlagServiceImpl.class);
-        List<DiagPlan> diagPlanList = qualityDlagService.selectRepeatPlan();
-        //循环计划list，add到定时计划里
-        try {
-            for (int i = 0; i < diagPlanList.size(); i++) {
-                DiagPlan diagPlan = diagPlanList.get(i);
-                Map<String,Object> map = new HashMap<String,Object>();//定时器传参数用
-                map.put("groupids",diagPlan.getGroupId());
-                map.put(DepotScheduler.QUARTZID, NeedQuartz.QUALITY);
-                Thread.sleep(1000);
-                myScheduler.addJob(diagPlan.getQuartztime(),QualityDlagServiceImpl.getQuartzGroup(),diagPlan.getQuartzid(),Class.forName(QualityDlagServiceImpl.getQuartzClass()),map);
-                System.out.println("定时计划<"+diagPlan.getDetailtime()+">启动成功");
-            }
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}
-
-*/

src/main/java/com/chinaitop/depot/monitor/util/MonitorZDTest.java

@@ -67,8 +67,9 @@ public class MonitorZDTest {
         //dm.sayHello();
         //int err=dm.Start("172.16.10.150", 7000, "admin", "12345", 1,1,zdvalue,path);
 //        int err=dm.Start("192.168.60.150", 8000, "admin", "admin12345", 1,2,zdvalue,path);
-        int err=dm.Start("10.100.1.150", 8000, "admin", "admin12345",1,1,zdvalue,path);
-//        int err=dm.Start("192.168.1.1", 8000, "admin", "12345", 1,2,zdvalue,path);
+//        int err=dm.Start("10.20.106.134", 8000, "admin", "a12345678",1,1,zdvalue,path);
+        int err=dm.Start("10.20.10.153", 8000, "admin", "ADMIN12345",1,2,zdvalue,path);
+//        int err=dm.Start("10.20.159.140", 37777, "admin", "admin123456", 2,2,zdvalue,path);
         if(0==err||"0".equals(err)){
             System.out.println("启动诊断成功");
         }else{

src/main/java/com/chinaitop/depot/monitor/util/Upload.java

@@ -1,10 +0,0 @@
-package com.chinaitop.depot.monitor.util;
-
-/**
- * @auther mafy
- * @createtime 2017/10/26 0026
- */
-public class Upload {
-
-
-}

src/main/resources/bootstrap.yml

@@ -66,6 +66,7 @@ sendMessage:
   com: COM4
   modem: modem.com4
 
+windows-path: E:/monitorzd/
 ---
 server:
   port: 9017

src/test/java/com/chinaitop/depot/server/DepotServerApplicationTests.java

@@ -1,16 +0,0 @@
-package com.chinaitop.depot.server;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class DepotServerApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}