Merge remote-tracking branch 'origin/master'

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/DeviceSyncController.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.server.core.controller.devices;
 
+import com.github.microservice.models.device.DeviceIdsParam;
 import com.github.microservice.models.device.DevicePermissSendResponseParam;
 import com.github.microservice.models.device.DeviceSyncListParam;
-import com.github.microservice.models.device.GateWaySyncParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.staticVariable.OpenApiMark;
@@ -44,7 +44,7 @@ public class DeviceSyncController {
 
     @Operation(summary = "物联网--同步删除设备接口", hidden = true)
     @RequestMapping(value = "deleteDevice", method = {RequestMethod.POST})
-    public ResultContent deleteDevice(@RequestBody DeviceIdParam param) {
+    public ResultContent deleteDevice(@RequestBody DeviceIdsParam param) {
         return deviceSyncFromIotService.deleteDevice(param);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/DeviceInfoDao.java

@@ -29,4 +29,5 @@ public interface DeviceInfoDao extends MongoDao<DeviceInfo>, DeviceInfoDaoExtend
 
     long countByProjectOidAndOnLineState(String projectId, OnLineState onLineState);
 
+    void deleteByDeviceIdIn(List<String> deviceIds);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceSyncFromIotService.java

@@ -1,10 +1,10 @@
 package com.zhongshu.card.server.core.service.devices;
 
+import com.github.microservice.models.device.DeviceIdsParam;
 import com.github.microservice.models.device.DeviceInfoSyncParam;
 import com.github.microservice.models.device.DeviceSyncListParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.openApi.params.DeviceIdParam;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.utils.DateUtils;
@@ -78,9 +78,11 @@ public class DeviceSyncFromIotService {
      * @param param
      * @return
      */
-    public ResultContent deleteDevice(DeviceIdParam param) {
-
-
+    public ResultContent deleteDevice(DeviceIdsParam param) {
+        List<String> deviceIds = param.getDeviceIds();
+        if (ObjectUtils.isNotEmpty(deviceIds)) {
+            deviceInfoDao.deleteByDeviceIdIn(deviceIds);
+        }
         return ResultContent.buildSuccess();
     }
 

FullCardServer/src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@ spring:
     mode: native  # cluster native EMBEDDED
     broker-url: tcp://172.24.50.53:61616?connectionTimeout=6000
     user: admin
-    password: admin123
+    password: 52bXJpZoiPz2AtH6
   data:
     mongodb:
       uri: mongodb://root:8756mongo2024@172.24.50.53:27017,172.24.50.53:27018,172.24.50.53:27019/fullcard?authSource=admin
@@ -104,63 +104,82 @@ logging:
             runner: debug
 dictionary:
   dictionary-list:
-    - { key: sys_sex, name: 性别, description: 用户性别, sort: 1, item:[
-                                                              { key: Male, name: 男, description: 男, sort: 1 },
-                                                              { key: Female, name: 女, description: 女, sort: 2 } ]}
-    - { key: sys_user_name, name: 姓名, description: 用户姓名, sort: 2}
+    - { key: sys_sex, name: 性别, description: 用户性别, sort: 1, item: [
+      { key: Male, name: 男, description: 男, sort: 1 },
+      { key: Female, name: 女, description: 女, sort: 2 } ] }
+    - { key: sys_user_name, name: 姓名, description: 用户姓名, sort: 2 }
     - { key: sys_user_number, name: 公号/学号, description: 公号/学号, sort: 3 }
-    - { key: sys_user_certificate, name: 证件, description: 证件号码, sort: 4, item:[
-                                                                           { key: IDCard, name: 身份证, description: 身份证号码, sort: 1},
-                                                                           { key: Passport, name: 护照, description: 护照号码, sort: 2}]}
+    - { key: sys_user_certificate, name: 证件, description: 证件号码, sort: 4, item: [
+      { key: IDCard, name: 身份证, description: 身份证号码, sort: 1 },
+      { key: Passport, name: 护照, description: 护照号码, sort: 2 } ] }
     - { key: sys_user_org, name: 机构, description: 机构, sort: 5 }
-    - { key: sys_user_type, name: 人员类型, description: 人员类型, sort: 6, item:[
-                                                                      {key: Consumer, name: 普通用户, description: 普通用户, sort: 1},
-                                                                      {key: Platform, name: 平台用户, description: 平台用户, sort: 2},
-                                                                      {key: Student, name: 学生, description: 学生, sort: 3},
-                                                                      {key: Teacher, name: 老师, description: 老师, sort: 4},
-                                                                      {key: ConsumerUser, name: c端用户, description: c端用户, sort: 5},
-                                                                      {key: SuperAdmin, name: 超级管理员用户, description: 超级管理员用户, sort: 6}]}
-    - { key: sys_user_status, name: 人员状态, description: 人员状态, sort: 7,item:[
-                                                                       {key: Normal, name: 正常, description: 正常, sort: 1},
-                                                                       {key: Locked, name: 禁用, description: 禁用, sort: 2}]}
+    - { key: sys_user_type, name: 人员类型, description: 人员类型, sort: 6, item: [
+      { key: Consumer, name: 普通用户, description: 普通用户, sort: 1 },
+      { key: Platform, name: 平台用户, description: 平台用户, sort: 2 },
+      { key: Student, name: 学生, description: 学生, sort: 3 },
+      { key: Teacher, name: 老师, description: 老师, sort: 4 },
+      { key: ConsumerUser, name: c端用户, description: c端用户, sort: 5 },
+      { key: SuperAdmin, name: 超级管理员用户, description: 超级管理员用户, sort: 6 } ] }
+    - { key: sys_user_status, name: 人员状态, description: 人员状态, sort: 7,item: [
+      { key: Normal, name: 正常, description: 正常, sort: 1 },
+      { key: Locked, name: 禁用, description: 禁用, sort: 2 } ] }
     - { key: sys_card_number, name: 卡号, description: 卡号, sort: 8 }
-    - { key: sys_card_type, name: 卡片类型, description: 卡片类型, sort: 9, item:[
-                                                                      {key: SevenCard, name: 七芯卡, description: 七芯卡, sort: 1},
-                                                                      {key: SuperSIM, name: 超级SIM卡, description: 超级SIM卡, sort: 2},
-                                                                      {key: IC, name: IC卡, description: IC卡, sort: 3}]}
-    - { key: sys_card_status, name: 卡片状态, description: 卡片状态, sort: 10, item:[
-                                                                         {key: Enable, name: 正常, description: 正常, sort: 1},
-                                                                         {key: Lock, name: 已锁定, description: 已锁定, sort: 2},
-                                                                         {key: Loss, name: 已挂失, description: 已挂失, sort: 3}]}
+    - { key: sys_card_type, name: 卡片类型, description: 卡片类型, sort: 9, item: [
+      { key: SevenCard, name: 七芯卡, description: 七芯卡, sort: 1 },
+      { key: SuperSIM, name: 超级SIM卡, description: 超级SIM卡, sort: 2 },
+      { key: IC, name: IC卡, description: IC卡, sort: 3 } ] }
+    - { key: sys_card_status, name: 卡片状态, description: 卡片状态, sort: 10, item: [
+      { key: Enable, name: 正常, description: 正常, sort: 1 },
+      { key: Lock, name: 已锁定, description: 已锁定, sort: 2 },
+      { key: Loss, name: 已挂失, description: 已挂失, sort: 3 } ] }
     - { key: sys_org_number, name: 机构编号, description: 机构编号, sort: 11 }
     - { key: sys_org_name, name: 机构名称, description: 机构名称, sort: 12 }
-    - { key: sys_org_type, name: 机构类型, description: 机构类型, sort: 13, item:[
-                                                                      {key: User, name: 用户, description: 用户, sort: 1},
-                                                                      {key: Platform, name: 平台, description: 平台, sort: 2},
-                                                                      {key: Enterprise, name: 企业, description: 企业, sort: 3},
-                                                                      {key: Project, name: 项目, description: 项目, sort: 4},
-                                                                      {key: School, name: 学校, description: 学校, sort: 5},
-                                                                      {key: Shop, name: 店铺, description: 店铺, sort: 6},
-                                                                      {key: BusinessMain, name: 供应商, description: 供应商, sort: 7},
-                                                                      {key: CommonOrg, name: 通用机构, description: 通用机构, sort: 8}]}
-    - { key: sys_org_status, name: 机构状态, description: 机构状态, sort: 14, item:[
-                                                                        {key: Normal, name: 正常, description: 正常, sort: 1},
-                                                                        {key: Locked, name: 禁用, description: 禁用, sort: 2},
-                                                                        {key: Frozen, name: 冻结, description: 冻结, sort: 3}]}
-    - { key: sys_project_type, name: 项目类型, description: 项目类型, sort: 15, item:[
-                                                                          {key: School, name: 学校, description: 学校, sort: 1},
-                                                                          {key: Hospital, name: 医院, description: 医院, sort: 2}]}
+    - { key: sys_org_type, name: 机构类型, description: 机构类型, sort: 13, item: [
+      { key: User, name: 用户, description: 用户, sort: 1 },
+      { key: Platform, name: 平台, description: 平台, sort: 2 },
+      { key: Enterprise, name: 企业, description: 企业, sort: 3 },
+      { key: Project, name: 项目, description: 项目, sort: 4 },
+      { key: School, name: 学校, description: 学校, sort: 5 },
+      { key: Shop, name: 店铺, description: 店铺, sort: 6 },
+      { key: BusinessMain, name: 供应商, description: 供应商, sort: 7 },
+      { key: CommonOrg, name: 通用机构, description: 通用机构, sort: 8 } ] }
+    - { key: sys_org_status, name: 机构状态, description: 机构状态, sort: 14, item: [
+      { key: Normal, name: 正常, description: 正常, sort: 1 },
+      { key: Locked, name: 禁用, description: 禁用, sort: 2 },
+      { key: Frozen, name: 冻结, description: 冻结, sort: 3 } ] }
+    - { key: sys_project_type, name: 项目类型, description: 项目类型, sort: 15, item: [
+      { key: School, name: 学校, description: 学校, sort: 1 },
+      { key: Hospital, name: 医院, description: 医院, sort: 2 } ] }
     - { key: sys_project_status, name: 项目状态, description: 项目状态, sort: 16 }
-    - { key: sys_leave_type, name: 请假类型, description: 请假类型, sort: 17, permission:[add], item:[
-                                                                              {key: person_leave, name: 事假, description: 事假, sort: 1, permission:[add,disable]},
-                                                                              {key: sick_leave, name: 病假, description: 病假, sort: 1, permission:[add,disable]},
-                                                                              {key: funeral_leave, name: 丧假, description: 丧假, sort: 1, permission:[add,disable]}]}
-    - { key: sys_leave_status, name: 请假审批状态, description: 请假审批状态, sort: 18, item:[
-                                                                                 {key: wait, name: 待审核, description: 待审核, sort: 1},
-                                                                                 {key: pass, name: 已通过, description: 已通过, sort: 1},
-                                                                                 {key: refuse, name: 已拒绝, description: 已拒绝, sort: 1}]}
-    - { key: visitorType, name: 访客类型, description: 访客类型, sort: 19,
+    - { key: sys_leave_type, name: 请假类型, description: 请假类型, sort: 17, permission: [ add ], item: [
+      { key: person_leave, name: 事假, description: 事假, sort: 1, permission: [ add,disable ] },
+      { key: sick_leave, name: 病假, description: 病假, sort: 1, permission: [ add,disable ] },
+      { key: funeral_leave, name: 丧假, description: 丧假, sort: 1, permission: [ add,disable ] } ] }
+    - { key: sys_leave_status, name: 请假审批状态, description: 请假审批状态, sort: 18, item: [
+      { key: wait, name: 待审核, description: 待审核, sort: 1 },
+      { key: pass, name: 已通过, description: 已通过, sort: 1 },
+      { key: refuse, name: 已拒绝, description: 已拒绝, sort: 1 } ] }
+    - { key: visitorType, name: 访客类型, description: 访客类型, sort: 19, permission: [ add ],
         item: [
           { key: conventional, name: 会议洽谈, description: 会议洽谈, sort: 1 },
           { key: visiting, name: 探亲访友, description: 探亲访友, sort: 2 },
           { key: business, name: 业务沟通, description: 业务沟通, sort: 3 } ] }
+    - { key: visitorApplyType, name: 预约类型, description: 预约类型, sort: 19, permission: [ ],
+        item: [
+          { key: Invite, name: 邀请访问, description: 邀请访问, sort: 1 },
+          { key: Apply, name: 自助预约, description: 自助预约, sort: 2 }
+        ] }
+    - { key: deviceType, name: 设备类型, description: 设备类型, sort: 19, permission: [ ],
+        item: [
+          { key: Consumer, name: 消费机, description: 消费机, sort: 1 },
+          { key: GateWay, name: 网关, description: 网关, sort: 2 },
+          { key: Door, name: 门禁机, description: 门禁机, sort: 3 },
+          { key: GateDoor, name: 门闸, description: 门闸, sort: 4 },
+          { key: SmartLock, name: 智能门锁, description: 智能门锁, sort: 5 },
+          { key: Elevator, name: 电梯, description: 电梯, sort: 6 },
+        ] }
+    - { key: deviceSpecType, name: 设备型号, description: 设备型号, sort: 19, permission: [ add ],
+        item: [
+          { key: CloudConsumer, name: 云版消费机, description: 云版消费机, sort: 1 },
+        ] }
+