Commit dde48a48 authored by 赵啸非's avatar 赵啸非

更新附件添加多个设置

parent 9c48b908
...@@ -205,7 +205,14 @@ export default { ...@@ -205,7 +205,14 @@ export default {
}, },
isExport: false, isExport: false,
config: { config: {
search: [], search: [
{
name: "userName",
type: "text",
label: "姓名",
fuzzy: true,
},
],
columns: [ columns: [
{ type: "selection", width: 60 }, { type: "selection", width: 60 },
{ type: "index", label: "序号", width: 50 }, { type: "index", label: "序号", width: 50 },
......
...@@ -196,7 +196,7 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity ...@@ -196,7 +196,7 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity
} }
UploadDeviceReq uploadDeviceReq = new UploadDeviceReq(); UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(entity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList())); uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(entity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
uploadDeviceReq.setAction("refreshMetting"); uploadDeviceReq.setAction("refreshWorkman");
messageFeign.downMsg(uploadDeviceReq); messageFeign.downMsg(uploadDeviceReq);
} }
......
...@@ -95,18 +95,20 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work ...@@ -95,18 +95,20 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
@Override @Override
protected void updateAfter(WorkmanEntity entity, Context context) throws AppException { protected void updateAfter(WorkmanEntity entity, Context context) throws AppException {
super.updateAfter(entity, context);
UploadDeviceReq uploadDeviceReq = new UploadDeviceReq(); UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
RoomEntity roomEntity = roomService.get(entity.getRoomId(), context); RoomEntity roomEntity = roomService.get(entity.getRoomId(), context);
if(!ObjectUtils.isEmpty(roomEntity)){ if(!ObjectUtils.isEmpty(roomEntity)){
uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList())); uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(roomEntity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
uploadDeviceReq.setAction("refreshWorkman"); uploadDeviceReq.setAction("refreshWorkman");
log.info("downMsg:{}", JSON.toJSONString(uploadDeviceReq)); WorkmanEntity workmanEntity = this.get(entity.getId());
log.info("downMsg:{},workmanName:{}", JSON.toJSONString(uploadDeviceReq),workmanEntity.getName());
messageFeign.downMsg(uploadDeviceReq); messageFeign.downMsg(uploadDeviceReq);
}else{ }else{
log.info("roomId:{}",entity.getRoomId()); log.info("roomId:{}",entity.getRoomId());
} }
super.updateAfter(entity, context);
} }
@Override @Override
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</plugin> </plugin>
<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor"> <plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
<property name="enableExecutorTime" value="true" /> <property name="enableExecutorTime" value="true" />
<property name="showSql" value="true" /> <property name="showSql" value="false" />
</plugin> </plugin>
</plugins> </plugins>
</configuration> </configuration>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment