修改同步用户

common-lib/src/main/java/com/mortals/xhx/common/pdu/UploadDeviceReq.java

+package com.mortals.xhx.common.pdu;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class UploadDeviceReq {
+
+    /**
+     * 行为
+     */
+    private String action;
+
+
+    private List<String> deviceCodeList;
+
+    private String content;
+
+
+}

common-lib/src/main/java/com/mortals/xhx/feign/device/IDeviceMessageFeign.java

 package com.mortals.xhx.feign.device;
 
 import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.UploadDeviceReq;
 import com.mortals.xhx.common.pdu.device.DeviceMsgReqPdu;
 import com.mortals.xhx.feign.IFeign;
 import feign.hystrix.FallbackFactory;
@@ -30,6 +31,16 @@ public interface IDeviceMessageFeign extends IFeign {
     Rest<String> callbackByProduct(@RequestBody DeviceMsgReqPdu devicePdu);
 
 
+    /**
+     * 设备消息 下发
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping(value = "/notify/downMsg")
+    Rest<String> downMsg(@RequestBody UploadDeviceReq req);
+
+
 }
 
 
@@ -44,6 +55,11 @@ class DeviceMessageFeignFallbackFactory implements FallbackFactory<IDeviceMessag
             public Rest<String> callbackByProduct(DeviceMsgReqPdu devicePdu) {
                 return Rest.fail("发送消息失败，请稍后再试!");
             }
+
+            @Override
+            public Rest<String> downMsg(UploadDeviceReq req) {
+                return Rest.fail("发送消息失败，请稍后再试!");
+            }
         };
     }
 }

doc/api.md

@@ -2074,41 +2074,6 @@ data|object|数据对象
 
 ```
 
-### 删除状态设置
-
-**请求URL:** basic/status/delete
-
-**请求方式:** GET
-
-**内容类型:** application/json;charset=utf-8
-
-**简要描述:** 删除状态设置
-
-**请求参数:**
-
-参数名称|类型|必填|描述
-:---|:---|:---|:------
-id|String|是|数组
-
-**请求样例:**
-```
-    http://localhost:8080/basic/status/delete?id=1&id=2'
-```
-**响应参数:**
-
-参数名称 |参数类型|备注|其它
----|---|---|---
-code|Integer|结果码（-1.失败，1.成功）|-
-msg|String|消息|-
-
-**响应消息样例:**
-```
-{
-    "code":1,
-	"msg":"成功"
-}
-
-```
 ## 基础设置
 
 ### 查询基础设置列表
@@ -2333,42 +2298,6 @@ data|object|数据对象
 
 ```
 
-### 删除基础设置
-
-**请求URL:** basic/set/delete
-
-**请求方式:** GET
-
-**内容类型:** application/json;charset=utf-8
-
-**简要描述:** 删除基础设置
-
-**请求参数:**
-
-参数名称|类型|必填|描述
-:---|:---|:---|:------
-id|String|是|数组
-
-**请求样例:**
-```
-    http://localhost:8080/basic/set/delete?id=1&id=2'
-```
-**响应参数:**
-
-参数名称 |参数类型|备注|其它
----|---|---|---
-code|Integer|结果码（-1.失败，1.成功）|-
-msg|String|消息|-
-
-**响应消息样例:**
-```
-{
-    "code":1,
-	"msg":"成功"
-}
-
-
-```
 ## 终端服务
 ### 工作人员登录
 
@@ -2589,6 +2518,10 @@ page| Integer |否|当前页
 size| Integer |否|每页条数，值为-1，查询所有记录
 deviceCode| String  |否|设备编码
 meetStatusList| arrays  |否|会议状态列表(0.等待中,1.进行中,2.已结束)
+orderColList| arrays  |否|排序列表字段
+ | object  |否|排序列表对象
+  colName| String  |否|排序列名
+  sortKind| String  |否|排序方式（asc:升序，desc:降序，默认升序）
 
 **请求样例:**
 ```
@@ -2596,7 +2529,8 @@ meetStatusList| arrays  |否|会议状态列表(0.等待中,1.进行中,2.已结
         "page":1,
         "size":10,
         "deviceCode","adfdd",
-        "meetStatusList":[0,1]
+        "meetStatusList":[0,1],
+        "orderColList":["colName":"meetStatus","sortKind":"desc",]
   }
 
 ```
@@ -2683,7 +2617,11 @@ data|object|数据对象
 }
 
 ```
-
+## 下发消息
+消息type|参数描述|其它
+:---|:---|:---
+refreshWorkman|刷新工作人员|-
+refreshMetting|刷新会议列表|-
 
 ## 字典附录
 ### meetStatus

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java

@@ -4,8 +4,13 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateRange;
 import cn.hutool.core.date.DateUtil;
 import com.mortals.xhx.common.code.MeetStatusEnum;
+import com.mortals.xhx.common.pdu.UploadDeviceReq;
+import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.metting.model.MettingRecordQuery;
+import com.mortals.xhx.module.room.model.RoomEntity;
+import com.mortals.xhx.module.room.service.RoomService;
 import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -16,6 +21,7 @@ import com.mortals.xhx.module.metting.service.MettingRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -31,6 +37,10 @@ import java.util.stream.Collectors;
 @Slf4j
 public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRecordDao, MettingRecordEntity, Long> implements MettingRecordService {
 
+    @Autowired
+    private IDeviceMessageFeign messageFeign;
+    @Autowired
+    private RoomService roomService;
 
     @Override
     protected void validData(MettingRecordEntity entity, Context context) throws AppException {
@@ -38,8 +48,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
         Date meetTimeStart = entity.getMeetTimeStart();
         Date meetTimeEnd = entity.getMeetTimeEnd();
         if (!ObjectUtils.isEmpty(meetTimeStart) && !ObjectUtils.isEmpty(meetTimeEnd)) {
-
-
             MettingRecordQuery mettingRecordQuery = new MettingRecordQuery();
             mettingRecordQuery.setMeetStatus(MeetStatusEnum.等待中.getValue());
             mettingRecordQuery.setRoomId(entity.getRoomId());
@@ -71,6 +79,14 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
             }
 
         }
+
+        UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+        RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
+        if(!ObjectUtils.isEmpty(roomEntity)){
+            uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomEntity.getDeviceCode()));
+            uploadDeviceReq.setAction("refreshMetting");
+            messageFeign.downMsg(uploadDeviceReq);
+        }
     }
 
 

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java

 package com.mortals.xhx.module.metting.web;
 
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
@@ -67,4 +68,12 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
             }
         }
     }
+
+    public static void main(String[] args) {
+        MettingRecordEntity mettingRecordEntity = new MettingRecordEntity();
+        mettingRecordEntity.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+
+        System.out.println(JSON.toJSONString(mettingRecordEntity));
+    }
+
 }
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

@@ -3,8 +3,11 @@ package com.mortals.xhx.module.workman.service.impl;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.util.SecurityUtil;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.pdu.UploadDeviceReq;
+import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.gocome.model.GocomeRecordEntity;
 import com.mortals.xhx.module.gocome.service.GocomeRecordService;
+import com.mortals.xhx.module.room.model.RoomEntity;
 import com.mortals.xhx.module.room.model.RoomQuery;
 import com.mortals.xhx.module.room.service.RoomService;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
@@ -19,6 +22,7 @@ import com.mortals.xhx.module.workman.service.WorkmanService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Arrays;
 import java.util.Date;
 
 /**
@@ -36,6 +40,8 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
     private GocomeRecordService gocomeRecordService;
      @Autowired
     private RoomService roomService;
+    @Autowired
+    private IDeviceMessageFeign messageFeign;
 
 
     @Override
@@ -66,6 +72,45 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
             roomQuery.setCountPersonIncrement(1L);
             roomService.update(roomQuery,context);
         }
+
+        UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+        RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
+        if(!ObjectUtils.isEmpty(roomEntity)){
+            uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomEntity.getDeviceCode()));
+            uploadDeviceReq.setAction("refreshWorkman");
+            messageFeign.downMsg(uploadDeviceReq);
+        }
+    }
+
+
+
+    @Override
+    protected void updateAfter(WorkmanEntity entity, Context context) throws AppException {
+        super.updateAfter(entity, context);
+        UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+        RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
+        if(!ObjectUtils.isEmpty(roomEntity)){
+            uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomEntity.getDeviceCode()));
+            uploadDeviceReq.setAction("refreshWorkman");
+            messageFeign.downMsg(uploadDeviceReq);
+        }
+    }
+
+    @Override
+    protected void removeBefore(Long[] ids, Context context) throws AppException {
+        WorkmanQuery workmanQuery = new WorkmanQuery();
+        workmanQuery.setIdList(Arrays.asList(ids));
+        this.find(workmanQuery,context).forEach(entity->{
+            UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+            RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
+            if(!ObjectUtils.isEmpty(roomEntity)){
+                uploadDeviceReq.setDeviceCodeList(Arrays.asList(roomEntity.getDeviceCode()));
+                uploadDeviceReq.setAction("refreshWorkman");
+                messageFeign.downMsg(uploadDeviceReq);
+            }
+        });
+
+        super.removeBefore(ids, context);
     }
 
     @Override

smart-office-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.basic.model.BasicStatusQuery;
 import com.mortals.xhx.module.basic.service.BasicStatusService;
 import com.mortals.xhx.module.device.model.DeviceEntity;