fix:修改设备事件代码

pom.xml

@@ -41,11 +41,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-tomcat</artifactId>-->
-<!--            <scope>provided</scope>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

src/main/java/com/admin/areaBase/Base.java

@@ -27,7 +27,6 @@ public class Base {
         this.y_cm_stop = y_cm_stop;
         this.track_presence = track_presence;
         this.exclude_falling = exclude_falling;
-
     }
 
     // Getter 和 Setter 方法

src/main/java/com/pub/jdbc/BaseDAO.java

@@ -35,7 +35,7 @@ import com.pub.system.SystemCache;
 public class BaseDAO {
 	@Autowired
 	private JdbcTemplate jdbcTemplate = null;
-
+	
 
 	/**
 	 * 除了null，有值就更新
@@ -111,7 +111,7 @@ public class BaseDAO {
 		}
 
 	}
-
+	
 	/**
 	 * 根据字段更新,设置了null也会更新
 	 * @param vo
@@ -147,7 +147,7 @@ public class BaseDAO {
 		}
 
 	}
-
+	
 	/**
 	 * 除了null，有值就更新
 	 * @param vo
@@ -231,7 +231,7 @@ public class BaseDAO {
 			throw new BusinessException("更新数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 除了null，有值就更新
 	 * @param vo
@@ -246,7 +246,7 @@ public class BaseDAO {
 			throw new BusinessException("更新数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 根据字段更新Array,设置了null也会更新
 	 * @param vo
@@ -269,7 +269,7 @@ public class BaseDAO {
 	public void updateSQL(String sql) {
 		jdbcTemplate.update(sql);
 	}
-
+	
 	/**
 	 * 插入数据
 	 * @param vo
@@ -320,7 +320,7 @@ public class BaseDAO {
 			throw new BusinessException("插入数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 插入数据(wy)
 	 * @param vo
@@ -330,7 +330,6 @@ public class BaseDAO {
 			// 设置创建时间为当前时间
 			if (vo.getAttribute(Fields.CREATE_TIME) == null) {
 				vo.setAttribute(Fields.CREATE_TIME, new Timestamp(System.currentTimeMillis()));
-
 			}
 			String tableName = vo.getTableName();
 			Map<String, Integer> types = getColumnTypes(tableName);
@@ -354,7 +353,7 @@ public class BaseDAO {
 			throw new BusinessException("插入数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 插入数组
 	 * @param vo
@@ -467,7 +466,7 @@ public class BaseDAO {
 			throw new BusinessException("查询数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 根据条件进行查询所有数据(wy)
 	 * @param <T>
@@ -511,7 +510,7 @@ public class BaseDAO {
 			throw new BusinessException("查询数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 根据条件进行查询所有数据不关心删除标记(wy)
 	 * @param <T>
@@ -556,7 +555,7 @@ public class BaseDAO {
 			throw new BusinessException("查询数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 根据条件进行查询分页数据
 	 * @param <T>
@@ -710,7 +709,7 @@ public class BaseDAO {
 			String sql = getQueryByPK(vo, tableName, fieldNames, pk);
 
 			if (sql == null) {
-				return null;
+				return null; 
 			}
 			list = jdbcTemplate.query(sql, new RowMapper<SuperVO>() {
 				@Override
@@ -730,7 +729,7 @@ public class BaseDAO {
 			throw new BusinessException("查询数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 根据键名查询
 	 * @author wy
@@ -748,7 +747,7 @@ public class BaseDAO {
 			String[] fieldNames = getValidNames(vo, types);
 			String sql = getQueryByKey(vo, tableName, fieldNames, keyName, k);
 			if (sql == null) {
-				return null;
+				return null; 
 			}
 			list = jdbcTemplate.query(sql, new RowMapper<SuperVO>() {
 				@Override
@@ -986,7 +985,7 @@ public class BaseDAO {
 			throw new BusinessException("删除数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 根据键名删除数据
 	 * @param clazz
@@ -1046,7 +1045,7 @@ public class BaseDAO {
 			throw new BusinessException("删除数据异常", e);
 		}
 	}
-
+	
 	/**
 	 * 删除一个List
 	 * @param delList
@@ -1135,7 +1134,7 @@ public class BaseDAO {
 		}
 		return null;
 	}
-
+	
 	/**
 	 * 获得查询SQL(wy)
 	 * @param tableName
@@ -1164,7 +1163,7 @@ public class BaseDAO {
 		}
 		return null;
 	}
-
+	
 	/**
 	 * 获得查询SQL不关心删除标记(wy)
 	 * @param tableName
@@ -1215,7 +1214,7 @@ public class BaseDAO {
 		}
 		return null;
 	}
-
+	
 	/**
 	 * 根据键名获得查询语句
 	 * @author wy
@@ -1372,7 +1371,7 @@ public class BaseDAO {
 		buffer.append(" where " + vo.getPKFieldName() + "=?");
 		return buffer.toString();
 	}
-
+	
 	/**
 	 * 获得更新SQL
 	 * @author wy

src/main/java/com/wxxcx/index/WxxcxIndexController.java

@@ -653,10 +653,7 @@ public class WxxcxIndexController<AesException extends Throwable> {
     public R devSave(DevVO vo) {
         R r = JSONUtil.getSuccessMsg(null);
         // 数据库更新
-        baseDAO.updateSQL("update dev_info set dev_name ='" + vo.getDev_name() + "',north_angle=" + vo.getNorth_angle() +
-                ",start_x=" + vo.getStart_x() + ",stop_x=" + vo.getStop_x() + ",start_y=" + vo.getStart_y() + ",stop_y="
-                + vo.getStop_y() + ",height=" + vo.getHeight() + ",start_z=" + vo.getStart_z() + ",stop_z=" + vo.getStop_z() +
-                ",status_light=" + vo.getStatus_light() + " where dev_id ='" + vo.getDev_id() + "' ");
+        baseDAO.updateSQL("update dev_info set dev_name ='" + vo.getDev_name() + "',north_angle=" + vo.getNorth_angle() + ",start_x=" + vo.getStart_x() + ",stop_x=" + vo.getStop_x() + ",start_y=" + vo.getStart_y() + ",stop_y=" + vo.getStop_y() + ",height=" + vo.getHeight() + ",start_z=" + vo.getStart_z() + ",stop_z=" + vo.getStop_z() + ",status_light=" + vo.getStatus_light() + " where dev_id ='" + vo.getDev_id() + "' ");
 
         DevVO devInfoVO = baseDAO.queryByKey(DevVO.class, "dev_id", vo.getDev_id());
         String software = devInfoVO.getSoftware();

src/main/java/com/wxxcx/scheduling/ScheduledTask.java

@@ -21,6 +21,4 @@ public class ScheduledTask {
     }
 
 
-
 }
-