From c2fefe136945b6a80f49b29dbf6e105fe58eed3c Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Sun, 13 Apr 2025 02:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/web/controller/app/EqDeviceController.java | 8 +++++++- .../org/dromara/web/controller/app/EqTextController.java | 9 +++++++++ .../main/java/org/dromara/web/device/DeviceCtlCmd.java | 4 ++++ .../java/org/dromara/web/device/iot/DeviceMsgDto.java | 3 +++ .../java/org/dromara/web/domain/bo/EqDeviceCmdBo.java | 1 + .../main/java/org/dromara/web/service/IotService.java | 3 +++ .../dromara/web/service/impl/EqEquipmentServiceImpl.java | 1 + .../src/main/resources/i18n/messages_en_US.properties | 6 ++++++ .../src/main/resources/i18n/messages_zh_CN.properties | 6 ++++++ 9 files changed, 40 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java index 78838b933..d105da43c 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java @@ -243,7 +243,13 @@ public class EqDeviceController extends BaseController { //zc 字典中数据多语言按照录入 } }).toList(); - return rowsData.stream().collect(Collectors.groupingBy(EqEquipmentLogVo::getCreatedYearDay)); + return rowsData.stream() + .collect(Collectors.groupingBy( + EqEquipmentLogVo::getCreatedYearDay, + () -> new TreeMap<>(Comparator.reverseOrder()), // 提供一个倒序的TreeMap + Collectors.toList() // 将每个key对应的元素收集到列表中 + )); +// return rowsData.stream().collect(Collectors.groupingBy(EqEquipmentLogVo::getCreatedYearDay)); } /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java index 405a5a44a..50cbd95f5 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqTextController.java @@ -619,6 +619,15 @@ public class EqTextController extends BaseController { MessageUtils.message("email.name3") )); + //checkCodeStatusStr + result.put("checkCodeStatusStr",Arrays.asList( + MessageUtils.message("checkCodeStatusStr.name1"), + MessageUtils.message("checkCodeStatusStr.name2"), + MessageUtils.message("checkCodeStatusStr.name3"), + MessageUtils.message("checkCodeStatusStr.name4"), + MessageUtils.message("checkCodeStatusStr.name5") + )); + return R.ok(result); } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java b/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java index ea08591be..318057476 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java @@ -38,8 +38,12 @@ public class DeviceCtlCmd { //照明灯开关 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98 public static final String LightSwitch_true = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98\r\n"; + //遥控器对码 public static final String RFControllorPair = "URC+ECTAS=GarageDoor,RFControllorPair,{},{},\r\n"; + //擦除已匹配的遥控器 public static final String RFControllorErase = "URC+ECTAS=GarageDoor,RFControllorErase,{},{},\r\n"; + //遥控器退出对码 + public static final String RFControllorExit = "URC+ECTAS=GarageDoor,RFControllorExit,{},{},\r\n"; public static final String wifiDefault = "wifiDefault\r\n";//wifi默认值 随意填写 } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java b/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java index e1c539d5d..e9f14afbe 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java @@ -194,6 +194,7 @@ public class DeviceMsgDto { * 2.遥控器对码完成 * 3.遥控器擦除中 * 4.遥控器擦除完成 + * 5.遥控器对码失败 */ private Integer checkCodeStatus; @@ -202,11 +203,13 @@ public class DeviceMsgDto { * 2.遥控器对码完成 * 3.遥控器擦除中 * 4.遥控器擦除完成 + * 5.遥控器对码失败 */ private String checkCodeStatusStr; /** * 已配对遥控器数量 */ private Integer rfcNumber; + } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceCmdBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceCmdBo.java index 7075ff770..031cbcf13 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceCmdBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceCmdBo.java @@ -41,6 +41,7 @@ public class EqDeviceCmdBo implements Serializable { * 8.关灯 * 9对码 * 10.清码 + * 11.遥控器退出对码 * 20.支持单独修改wifi */ private int operateType; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java index a9c68da57..37ff8fbd5 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java @@ -111,6 +111,9 @@ public class IotService { result.setCheckCodeStatus(Integer.valueOf(resultMap.get("checkCodeStatus")==null?"-1":resultMap.get("checkCodeStatus"))); result.setCheckCodeStatusStr(MessageUtils.message("checkCodeStatusStr.name"+result.getCheckCodeStatus())); result.setRfcNumber(Integer.valueOf(resultMap.get("RFControllorNumber")==null?"-1":resultMap.get("RFControllorNumber"))); +// String duiMa = resultMap.get("RFControllor"); +// int duiMaStatus = "paired".equals(duiMa)?1:"failed".equals(duiMa)?2:"erasing".equals(duiMa)?3:"erased".equals(duiMa)?4:"pairing".equals(duiMa)?0:-1; +// result.setDuiMaStatus(duiMaStatus);//对码状态 return result; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index 3a9cfd918..06c4f215b 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -235,6 +235,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { case 8: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关 case 9: cmd = DeviceCtlCmd.RFControllorPair; break;//对码 case 10: cmd = DeviceCtlCmd.RFControllorErase; break;//清码 + case 11: cmd = DeviceCtlCmd.RFControllorExit; break;//遥控器退出对码 case 20: cmd = DeviceCtlCmd.wifiDefault; break;//wifi单独修改 default: return "指令类型错误"; diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties index e024f86e9..638befc2d 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties @@ -533,3 +533,9 @@ protocol.user=When you apply for a user, it means that you have agreed to abide 4. It is forbidden to carry out various destructive acts against this site in any way. 5. If you violate relevant national laws and regulations, this website will not be responsible. Your login information will be recorded without a doubt. If necessary, we will provide such information to the relevant national management departments." protocol.personal=Wuxi Moc Technology Co., Ltd. (hereinafter referred to as ""this application"" or ""we"" or ""MOC"") is committed to protecting your personal privacy.
Please read this privacy statement carefully. By using any of our services, you agree to follow any terms in this privacy agreement.
This application respects and protects the personal privacy of all users of the service. In order to provide you with more accurate and personalized services, this application will use and disclose your personal information in accordance with the provisions of this privacy policy. However, this application will treat this information with a high degree of diligence and prudence. Unless otherwise provided in this privacy policy, this application will not disclose or provide this information to third parties without your prior permission. This application will update this privacy policy from time to time. When you agree to this application service use agreement, you are deemed to have agreed to the entire content of this privacy policy. This privacy policy is an integral part of this application service use agreement.
1. Scope of application
a) When you register for this application account, you provide personal registration information according to the requirements of this application;
b) When you use the network services of this application or visit the web pages of this application platform, this application automatically receives and records the information on your browser and mobile phone, including but not limited to your IP address, browser type, language used, access date and time, software and hardware feature information, and web page records you need;
c) User personal data obtained by this application from business partners through legal means.
You understand and agree that the following information is not subject to this privacy policy:
a) Keyword information you enter when using the search service provided by this application platform;
b) Information data collected by this application about you published in this application, including but not limited to participation in activities, transaction information and evaluation details;
c) Violation of legal provisions or violations of the rules of this application and the measures taken by this application against you.
2. Use of information:
a) This application will not provide, sell, rent, share or trade your personal information to any unrelated third party, unless you have obtained your prior permission, or the third party and this application (including this application's affiliates) provide services to you individually or jointly, and after the end of the service, it will be prohibited from accessing all of the information it previously had access to.
b) This application also does not allow any third party to collect, edit, sell or disseminate your personal information by any means. If any user of this application platform engages in the above activities, once discovered, this application has the right to immediately terminate the service agreement with the user.
c) For the purpose of serving users, this application may use your personal information to provide you with information of interest to you, including but not limited to sending you product and service information, or sharing information with this application's partners so that they can send you information about their products and services (the latter requires your prior consent).
3. Information Disclosure
Under the following circumstances, this application will disclose your personal information in whole or in part according to your personal wishes or legal provisions:
a) Disclose to a third party with your prior consent;
b) Share your personal information with a third party in order to provide the products and services you requested;
c) Disclose to a third party or administrative or judicial institution in accordance with relevant legal provisions or the requirements of administrative or judicial institutions;
d) If you violate relevant Chinese laws, regulations or this application service agreement or related rules, you need to disclose to a third party;
e) If you are a qualified intellectual property complainant and have filed a complaint, you shall disclose to the respondent at the request of the respondent so that both parties can deal with possible rights disputes;
f) In a transaction created on this application platform, if any party to the transaction performs or partially performs the transaction obligations and makes a request for information disclosure, this application has the right to decide to provide the user with the necessary information such as the contact information of the counterparty to facilitate the completion of the transaction or the resolution of disputes.
g) Other disclosures that this application deems appropriate in accordance with laws, regulations or website policies.
4. Information storage and exchangeThe information and data collected by this application about you will be stored on the servers of this application and (or) its affiliated companies. Such information and data may be transmitted to your country, region or overseas where this application collects information and data and be accessed, stored and displayed overseas.
5. Use of cookies
a) If you do not refuse to accept cookies, this application will set or access cookies on your computer so that you can log in or use the services or functions of this application platform that rely on cookies. This application uses cookies to provide you with more thoughtful personalized services, including promotional services.
b) You have the right to choose to accept or refuse to accept cookies. You can refuse to accept cookies by modifying your browser settings. However, if you choose to refuse to accept cookies, you may not be able to log in or use the network services or functions of this application that rely on cookies.
c) The relevant information obtained through the cookies set by this application will be subject to this policy.
6. Information Security
a) This application account has security protection function, please keep your username and password information properly. This application will ensure that your information is not lost, abused or altered by encrypting user passwords and other security measures. Despite the aforementioned security measures, please also note that there is no ""perfect security measure"" on the information network.
b) When using the network service of this application for online transactions, you will inevitably disclose your personal information, such as contact information or postal address, to the transaction counterparty or potential transaction counterparty. Please properly protect your personal information and provide it to others only when necessary. If you find that your personal information has been leaked, especially the username and password of this application, please contact the customer service of this application immediately so that this application can take appropriate measures.
7. Children's Privacy
Protecting children's privacy is important to us. We will not direct our website or application to children under the age of 13 (or 16, where applicable by law), nor will we knowingly collect any personal data from them. If we learn that a child has provided personally identifiable information to a website or application, we will make reasonable efforts to delete such information from such website or application's files.
8. Data Security
We have implemented certain physical, administrative, and technical measures to protect the information we collect from and about our customers and website and application visitors.While we make every reasonable effort to help ensure the integrity and security of our network and systems, we cannot guarantee our security measures.
9. Contact Information
We hope that this Privacy Statement will answer your questions about our collection, use, and disclosure of your personal data.If you have additional questions about this Privacy Statement or the practices described herein, you can contact us at:
Wuxi Moc Door Technology Co., Ltd.
Tel: +86 0510 88553132
E-mail: aioc-service@mocdoor.com
10. Revisions to This Privacy Statement
This application reserves the right to change, modify, add, delete or otherwise revise portions of this Privacy Statement at any time at its sole discretion. If we do so, we will let you know about the changes to the website or application by including a copy of the old version of the Privacy Statement. The date this Privacy Statement was last revised is indicated at the top of the page. Your continued use of the Site or App following the posting of changes to these terms will constitute your acceptance of those changes. If we change this Privacy Statement in a material way, we will provide you with appropriate notice." + +checkCodeStatusStr.name1=Remote control to code +checkCodeStatusStr.name2=Remote control code matching completed +checkCodeStatusStr.name3=Remote control erasing +checkCodeStatusStr.name4=Remote erase complete +checkCodeStatusStr.name5=The remote control fails to match the code diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties index c13b3e6da..655546e72 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -529,3 +529,9 @@ email.name2=有效性为 email.name3=分钟，请尽快填写。 protocol.user=当您申请用户时，表示您已经同意遵守本规章。
欢迎您加入本站点参与交流和讨论，本站点为社区，为维护网上公共秩序和社会稳定，请您自觉遵守以下条款：
一、不得利用本站危害国家安全、泄露国家秘密，不得侵犯国家社会集体的和公民的合法权益，不得利用本站制作、复制和传播下列信息：
（一）煽动抗拒、破坏宪法和法律、行政法规实施的；
（二）煽动颠覆国家政权，推翻社会主义制度的；
（三）煽动分裂国家、破坏国家统一的；
（四）煽动民族仇恨、民族歧视，破坏民族团结的；
（五）捏造或者歪曲事实，散布谣言，扰乱社会秩序的；
（六）宣扬封建迷信、淫秽、色情、赌博、暴力、凶杀、恐怖、教唆犯罪的；
（七）公然侮辱他人或者捏造事实诽谤他人的，或者进行其他恶意攻击的；
（八）损害国家机关信誉的； （九）其他违反宪法和法律行政法规的；
（十）进行商业广告行为的。 二、互相尊重，对自己的言论和行为负责。 三、禁止在申请用户时使用相关本站的词汇，或是带有侮辱、毁谤、造谣类的或是有其含义的各种语言进行注册用户，否则我们会将其删除。 四、禁止以任何方式对本站进行各种破坏行为。 五、如果您有违反国家相关法律法规的行为，本站概不负责，您的登录信息均被记录无疑，必要时，我们会向相关的国家管理部门提供此类信息。 protocol.personal=无锡莫克科技有限公司（以下简称为“本应用”或“我们”或“MOC”）致力于保护你的个人隐私。
请仔细阅读本隐私声明，使用我们的任何服务，即表示您同意按照本隐私协议中的任何条款。
本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。
1. 适用范围
a) 在您注册本应用帐号时，您根据本应用要求提供的个人注册信息；
b) 在您使用本应用网络服务，或访问本应用平台网页时，本应用自动接收并记录的您的浏览器和手机上的信息，包括但不限于您的IP地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据；
c) 本应用通过合法途径从商业伙伴处取得的用户个人数据。
您了解并同意，以下信息不适用本隐私权政策：
a) 您在使用本应用平台提供的搜索服务时输入的关键字信息；
b) 本应用收集到的您在本应用发布的有关信息数据，包括但不限于参与活动、成交信息及评价详情；
c) 违反法律规定或违反本应用规则行为及本应用已对您采取的措施。
2. 信息使用：
a) 本应用不会向任何无关第三方提供、出售、出租、分享或交易您的个人信息，除非事先得到您的许可，或该第三方和本应用（含本应用关联公司）单独或共同为您提供服务，且在该服务结束后，其将被禁止访问包括其以前能够访问的所有这些资料。
b) 本应用亦不允许任何第三方以任何手段收集、编辑、出售或者无偿传播您的个人信息。任何本应用平台用户如从事上述活动，一经发现，本应用有权立即终止与该用户的服务协议。
c) 为服务用户的目的，本应用可能通过使用您的个人信息，向您提供您感兴趣的信息，包括但不限于向您发出产品和服务信息，或者与本应用合作伙伴共享信息以便他们向您发送有关其产品和服务的信息（后者需要您的事先同意）。
3. 信息披露
在如下情况下，本应用将依据您的个人意愿或法律的规定全部或部分的披露您的个人信息：
a) 经您事先同意，向第三方披露；
b) 为提供您所要求的产品和服务，而必须和第三方分享您的个人信息；
c) 根据法律的有关规定，或者行政或司法机构的要求，向第三方或者行政、司法机构披露；
d) 如您出现违反中国有关法律、法规或者本应用服务协议或相关规则的情况，需要向第三方披露；
e) 如您是适格的知识产权投诉人并已提起投诉，应被投诉人要求，向被投诉人披露，以便双方处理可能的权利纠纷；
f) 在本应用平台上创建的某一交易中，如交易任何一方履行或部分履行了交易义务并提出信息披露请求的，本应用有权决定向该用户提供其交易对方的联络方式等必要信息，以促成交易的完成或纠纷的解决。
g) 其它本应用根据法律、法规或者网站政策认为合适的披露。
4. 信息存储和交换 本应用收集的有关您的信息和资料将保存在本应用及（或）其关联公司的服务器上，这些信息和资料可能传送至您所在国家、地区或本应用收集信息和资料所在地的境外并在境外被访问、存储和展示。
5. Cookie的使用
a) 在您未拒绝接受cookies的情况下，本应用会在您的计算机上设定或取用cookies ，以便您能登录或使用依赖于cookies的本应用平台服务或功能。本应用使用cookies可为您提供更加周到的个性化服务，包括推广服务。
b) 您有权选择接受或拒绝接受cookies。您可以通过修改浏览器设置的方式拒绝接受cookies。但如果您选择拒绝接受cookies，则您可能无法登录或使用依赖于cookies的本应用网络服务或功能。
c) 通过本应用所设cookies所取得的有关信息，将适用本政策。
6. 信息安全
a) 本应用帐号均有安全保护功能，请妥善保管您的用户名及密码信息。本应用将通过对用户密码进行加密等安全措施确保您的信息不丢失，不被滥用和变造。尽管有前述安全措施，但同时也请您注意在信息网络上不存在“完善的安全措施”。
b) 在使用本应用网络服务进行网上交易时，您不可避免的要向交易对方或潜在的交易对方披露自己的个人信息，如联络方式或者邮政地址。请您妥善保护自己的个人信息，仅在必要的情形下向他人提供。如您发现自己的个人信息泄密，尤其是本应用用户名及密码发生泄露，请您立即联络本应用客服，以便本应用采取相应措施。
7. 儿童隐私
保护儿童的隐私对我们很重要。 我们不会将我们的网站或应用程序定向给 13 岁以下（或 16 岁，在法律适用的情况下）的儿童，也不会在知情的情况下从他们那里收集任何个人数据。 如果我们得知儿童向网站或应用程序提供了个人身份信息，我们将尽合理努力从此类网站或应用程序的文件中删除此类信息。
8. 数据安全
我们已采取某些物理、管理和技术措施来保护我们从客户以及网站和应用程序访问者处收集的信息以及关于这些信息的信息。 虽然我们尽一切合理努力帮助确保我们的网络和系统的完整性和安全性，但我们无法保证我们的安全措施。
9.联系信息
我们希望本隐私声明能够回答您关于我们收集、使用和披露您的个人数据的问题。 如果您对本隐私声明或此处描述的做法有其他疑问，您可以通过以下方式联系我们：
无锡莫克科技有限公司
电话：+86 0510 88553132
邮箱：aioc-service@mocdoor.com
10.本隐私声明的修订
本应用保留自行决定随时更改、修改、添加、删除或以其他方式修订本隐私声明部分内容的权利。 如果我们这样做，我们将通过包含一份旧版隐私声明的副本，让您了解网站或应用程序的更改。 本隐私声明的最后修订日期显示在页面顶部。 您在发布这些条款的更改后继续使用本网站或应用程序即表示您接受这些更改。 如果我们以重大方式更改本隐私声明，我们将向您提供适当的通知。 + +checkCodeStatusStr.name1=遥控器对码中 +checkCodeStatusStr.name2=遥控器对码完成 +checkCodeStatusStr.name3=遥控器擦除中 +checkCodeStatusStr.name4=遥控器擦除完成 +checkCodeStatusStr.name5=遥控器对码失败