From 2fef20fe45a1fc901b51243bcc60682524447990 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期五, 23 八月 2024 18:55:41 +0800
Subject: [PATCH] Merge branch '2.0.0-release' of http://nonxin.cn:8090/r/product/product-server/V2.0.0
---
product-server-device/src/main/java/com/product/device/service/DeviceManagerService.java | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/product-server-device/src/main/java/com/product/device/service/DeviceManagerService.java b/product-server-device/src/main/java/com/product/device/service/DeviceManagerService.java
index ffb6c76..8b54120 100644
--- a/product-server-device/src/main/java/com/product/device/service/DeviceManagerService.java
+++ b/product-server-device/src/main/java/com/product/device/service/DeviceManagerService.java
@@ -5,12 +5,11 @@
import java.util.List;
import java.util.Map;
-import com.product.admin.config.CmnConst;
+import com.product.core.config.Global;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
-import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.device.config.DeviceConst;
import com.product.module.sys.service.UserService;
@@ -21,7 +20,7 @@
/**
* 璁惧绠＄悊
- * @Author
+ * @Author
* @Date 2022/3/8 16:33
* @Desc 鍔熻兘鐩稿叧 service
*/
@@ -35,13 +34,12 @@
/**
* 鑾峰彇璁惧淇℃伅 鍖呮嫭瀛愯澶�
* @param uuid
- * @param device_sn
* @return
*/
- public FieldSetEntity findDeviceAndSub(String uuid,String asset_code) {
- FieldSetEntity dev=findDevice(uuid,asset_code);
- if(dev !=null) {
- DataTableEntity dt=baseDao.listTable(DeviceConst.TABLE_PRODUCT_DEVICE_ARCHIVE,"parent_sn=?", new String[] {asset_code},new String[]{"uuid","device_name","asset_code","device_version","device_status"});
+ public FieldSetEntity findDeviceAndSub(String uuid,String device_number) {
+ FieldSetEntity dev=findDevice(uuid);
+ if(dev !=null && "device".equals(Global.getSystemConfig("system_platform_type", "")) ) {
+ DataTableEntity dt=baseDao.listTable(DeviceConst.PRODUCT_DEVICE_INFO,"uuid=?", new String[] {uuid},new String[]{});
if(!DataTableEntity.isEmpty(dt)) {
baseDao.loadPromptData(dt);
Map <String,DataTableEntity> sub=new HashMap<>();
@@ -50,31 +48,25 @@
//dev.addSubDataTable(dt);
}
}
-
+
return dev;
}
/**
* 鑾峰彇璁惧淇℃伅 鍖呮嫭瀛愯澶�
* @param uuid
- * @param device_sn
+ * @param asset_code
* @return
*/
- public FieldSetEntity findDevice(String uuid,String asset_code) {
+ public FieldSetEntity findDevice(String uuid) {
StringBuilder st=new StringBuilder();
List<String> pa=new ArrayList<String>();
- if(!StringUtils.isEmpty(asset_code)) {
- st.append("asset_code=?");
- pa.add(asset_code);
- }
if(!StringUtils.isEmpty(uuid)) {
- if(st.length()>0) {
- st.append(" and ");
- }
st.append("uuid=?");
pa.add(uuid);
+ }else {
+ return null;
}
-
- FieldSetEntity dev=baseDao.getFieldSetEntityByFilter(DeviceConst.TABLE_PRODUCT_DEVICE_ARCHIVE, new String[]{"uuid","device_name","asset_code","device_version","device_status"}, st.toString(), pa.toArray(), false, null);
+ FieldSetEntity dev=baseDao.getFieldSetEntityByFilter(DeviceConst.PRODUCT_DEVICE_INFO, new String[]{}, st.toString(), pa.toArray(), false, null);
baseDao.loadPromptData(dev);
return dev;
}
@@ -83,8 +75,8 @@
* 濡傛灉鏈夊瓙璁惧锛岄渶瑕佹妸瀛愯澶囩姸鎬佷竴璧峰彉鏇�
* @return
*/
- public boolean deviceStatusChange(String asset_code,String status) {
- return baseDao.executeUpdate("update product_device_archives set device_status=? where asset_code=? or parent_sn=?",new String[] {status,asset_code,asset_code});
+ public boolean deviceStatusChange(String device_number,String status) {
+ return baseDao.executeUpdate("update product_device_info set device_status=? where device_number=?",new String[] {status,device_number});
}
/**
* 娣诲姞璁惧杩愯璁板綍
@@ -95,7 +87,7 @@
* @return
*/
public boolean appendDeivceManageLog(String asset_code,String user,String type,String log,String table,String uuid ) {
-
+
return true;
}
/**
@@ -114,7 +106,7 @@
sql.append("\nselect technician ,'鎶�鏈礋璐ｄ汉' from product_device_archives where asset_code='").append(asset_code).append("' union");
sql.append("\nselect safety_manager ,'瀹夊叏绠＄悊鍛�' from product_device_archives where asset_code='").append(asset_code).append("'");
sql.append("\n) b left join product_sys_users a on b.userid=a.user_id");
-
+
DataTableEntity dte = baseDao.listTable(sql.toString(), new Object[]{});
// dte.getMeta().addAliasTable("product_sys_users", "a");
// dte.getMeta().addAliasTable("product_device_archives", "b");
@@ -130,7 +122,7 @@
}
return dte;
-
+
}
-
+
}
--
Gitblit v1.9.2