整理

nidapeng

2024-03-20 af6dd48ed508df2ff33f62cd5c40db3f51f9d2a8

整理

 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")

 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

 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="资源类型")

 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());
        }
@@ -391,12 +392,12 @@
        IPage<DeviceRole> newPage = deviceRoleMapper.selectPage(page, queryWrapper);
        if(null != newPage && newPage.getRecords().size() > 0) {
            List<DeviceRole> deviceRoleList = newPage.getRecords();
            for (DeviceRole dto:deviceRoleList) {
          /*    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);

 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());
        }

 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);
                }
            }

 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));
                }