Merge branch 'V1' of http://223.75.76.159:9090/xiao547607/smart-community-server

common/src/main/java/com/jpsoft/smart/modules/base/service/DeviceInfoService.java

@@ -13,6 +13,7 @@ public interface DeviceInfoService {
 	int update(DeviceInfo model);
 	int delete(String id);
 	List<DeviceInfo> list();
+	DeviceInfo getByDeviceNo(String deviceNo);
 	Page<DeviceInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize,boolean count, List<Sort> sortList);
 	void updateByDeviceNo(String deviceNo, String ip);
 }

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/DeviceInfoServiceImpl.java

@@ -61,6 +61,11 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
 		return deviceInfoDAO.list();
 	}
 
+	@Override
+	public DeviceInfo getByDeviceNo(String deviceNo){
+		return deviceInfoDAO.getByDeviceNo(deviceNo);
+	}
+
 	@Override
 	public Page<DeviceInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
         Page<DeviceInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{

web/src/main/java/com/jpsoft/smart/modules/base/controller/DeviceInfoController.java

@@ -44,19 +44,28 @@ public class DeviceInfoController {
         MessageResult<DeviceInfo> msgResult = new MessageResult<>();
 
         try {
-            deviceInfo.setId(UUID.randomUUID().toString());
-            deviceInfo.setDelFlag(false);
-            deviceInfo.setCreateBy(subject);
-            deviceInfo.setCreateTime(new Date());
-            
-            int affectCount = deviceInfoService.insert(deviceInfo);
+            DeviceInfo item = deviceInfoService.getByDeviceNo(deviceInfo.getDeviceNo());
 
-            if (affectCount > 0) {
-                msgResult.setResult(true);
-                msgResult.setData(deviceInfo);
-            } else {
+            if(item == null) {
+
+                deviceInfo.setId(UUID.randomUUID().toString());
+                deviceInfo.setDelFlag(false);
+                deviceInfo.setCreateBy(subject);
+                deviceInfo.setCreateTime(new Date());
+
+                int affectCount = deviceInfoService.insert(deviceInfo);
+
+                if (affectCount > 0) {
+                    msgResult.setResult(true);
+                    msgResult.setData(deviceInfo);
+                } else {
+                    msgResult.setResult(false);
+                    msgResult.setMessage("数据库添加失败");
+                }
+            }
+            else{
                 msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
+                msgResult.setMessage("设备编号已经存在，不能重复添加！");
             }
         }
         catch(Exception ex){