From af6dd48ed508df2ff33f62cd5c40db3f51f9d2a8 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:38:13 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 7 ++++---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 1 +
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 4 ++--
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 3 +++
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java | 14 ++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 8 +++++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 3 +++
7 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
index 971bc71..a3d6428 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
@@ -6,6 +6,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Device;
import com.doumee.service.business.DeviceService;
import io.swagger.annotations.Api;
@@ -16,6 +18,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -45,6 +48,17 @@
deviceService.deleteById(id);
return ApiResponse.success(null);
}
+ @ApiOperation("淇敼鏄惁闂ㄧ鍏ュ彛")
+ @PostMapping("/updateEntranceById")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updateStatusById(@RequestBody Device param) {
+ Device d = new Device();
+ d.setId(param.getId());
+ d.setEditDate(new Date());
+ d.setIsEntrance(Constants.formatIntegerNum(param.getIsEntrance()));
+ deviceService.updateById(d);
+ return ApiResponse.success(null);
+ }
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 5fa143f..207f3ce 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -26,8 +26,8 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-@Component
-@EnableScheduling
+//@Component
+//@EnableScheduling
public class ScheduleTool {
@Autowired
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index fd2fe65..43410d8 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -76,6 +76,9 @@
@ApiModelProperty(value = "绫诲瀷 0闂ㄧ 1杞﹀簱", example = "1")
@ExcelColumn(name="绫诲瀷 0闂ㄧ 1杞﹀簱")
private Integer type;
+ @ApiModelProperty(value = "鏄惁鍥尯鍑哄叆鍙� 0涓嶆槸 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍥尯鍑哄叆鍙� 0涓嶆槸 1鏄�")
+ private Integer isEntrance;
@ApiModelProperty(value = "璧勬簮绫诲瀷", example = "1")
@ExcelColumn(name="璧勬簮绫诲瀷")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index a8dcc10..b7ba8c9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -326,6 +326,7 @@
QueryWrapper<DeviceRole> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.select("*,(select count(1) from member_role b where b.isdeleted=0 and b.role_id=device_role.id) as memberNum");
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(DeviceRole::getId, pageWrap.getModel().getId());
}
@@ -390,13 +391,13 @@
queryWrapper.lambda().orderByAsc( DeviceRole::getName);
IPage<DeviceRole> newPage = deviceRoleMapper.selectPage(page, queryWrapper);
if(null != newPage && newPage.getRecords().size() > 0) {
- List<DeviceRole> deviceRoleList = newPage.getRecords();
- for (DeviceRole dto:deviceRoleList) {
+ List<DeviceRole> deviceRoleList = newPage.getRecords();
+ /* for (DeviceRole dto:deviceRoleList) {
Member member = new Member();
member.setIsdeleted(Constants.ZERO);
member.setRoleIdParam("["+dto.getId()+"]");
dto.setMemberNum( memberMapper.selectCount(new QueryWrapper<>(member)));
- }
+ }*/
newPage.setRecords(deviceRoleList);
}
return PageData.from(newPage);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index b983c54..591a1b2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -142,6 +142,9 @@
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.lambda().eq(Device::getRemark, pageWrap.getModel().getRemark());
}
+ if (pageWrap.getModel().getIsEntrance() != null) {
+ queryWrapper.lambda().eq(Device::getIsEntrance, pageWrap.getModel().getIsEntrance());
+ }
if (pageWrap.getModel().getName() != null) {
queryWrapper.lambda().like(Device::getName, pageWrap.getModel().getName());
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index 6cc4b9c..911a5c5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -157,6 +157,7 @@
//濡傛灉涓嶅瓨鍦紝鍒欐柊澧炴暟鎹�
model = new Device();
model = initDoorDataByHkData(model,device,date,allHkList);
+ model.setIsEntrance(Constants.ZERO);
addList.add(model);
}
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 5c48c57..b39bf07 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -57,6 +57,8 @@
@Autowired
private MemberMapper memberMapper;
@Autowired
+ private DeviceMapper deviceMapper;
+ @Autowired
private DataSyncConfig dataSyncConfig;
@Autowired
private CarEventMapper carEventMapper;
@@ -132,8 +134,12 @@
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,userNo).last("limit 1"));
if(member !=null){
//濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
+ Device d = deviceMapper.selectOne(new QueryWrapper<Device>().lambda()
+ .eq(Device::getDoorId,request.getSrcIndex())
+ .eq(Device::getIsdeleted,Constants.ZERO)
+ .last("limit 1" ));
delRetentionLis.add(member.getId());
- if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
+ if(!(Constants.equalsInteger(d.getIsEntrance(),Constants.ONE) && Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE)){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
retentionList.add(getRetentionModelByRequest(member,request));
}
--
Gitblit v1.9.3