root/lanzhouhailiang_two
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: plc

Browse Source
This commit is contained in:
yanps
2023-12-07 13:44:51 +08:00
parent 0e5e839396
commit 5fe3cb7661
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java
View File

@@ -36,19 +36,46 @@ public interface OpcPlcService extends CommonService<OpcPlc> {
*/
List<OpcPlcDto> queryAll(OpcPlcQueryParam query);
/**
* 根据ID查询
* @param id
* @return
*/
OpcPlc getById(String id);
/**
* 根据ID查询
* @param id
* @return
*/
OpcPlcDto findById(String id);
/**
* 插入一条新数据。
* @param resources
* @return
*/
int insert(OpcPlcDto resources);
/**
* 根据ID更新数据
* @param resources
* @return
*/
int updateById(OpcPlcDto resources);
/**
* 根据id删除
* @param id
* @return
*/
int removeById(String id);
/**
* 根据多个id删除
* @param ids
* @return
*/
int removeByIds(Set<String> ids);
/**
@@ -68,7 +95,7 @@ public interface OpcPlcService extends CommonService<OpcPlc> {
/**
* 根据OPC标识得到前端PLC下拉选列表
*
* @param opc_uuid
* @return
*/
List<OpcPlc> selectListByOpcID(String opc_uuid);

13
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java
View File

@@ -106,18 +106,7 @@ public class OpcPlcServiceImpl extends CommonServiceImpl<OpcPlcMapper, OpcPlc> i
@Override
public List<OpcPlc> selectListByOpcID(String opc_uuid) {
//OPC_PLC表【acs_opc_plc】
// JSONArray arr = WQLObject.getWQLObject("acs_opc_plc").query("is_delete= '0' AND is_active= '1' and opc_server_id = '" + opc_uuid + "'").getResultJSONArray(0);
// JSONArray result = new JSONArray();
// for (int i = 0; i < arr.size(); i++) {
// JSONObject obj = arr.getJSONObject(i);
// JSONObject json = new JSONObject();
// json.put("plc_id", obj.getString("plc_id"));
// json.put("plc_code", obj.getString("plc_code"));
// json.put("plc_name", obj.getString("plc_name"));
// result.add(json);
// }
// return result;
List<OpcPlc> lists = opcPlcMapper.selectList(new LambdaQueryWrapper<OpcPlc>()
.eq(OpcPlc::getIs_delete, "0")