海康接口对接开发

jiangping

2023-12-28 e59a768f56efb64bf2fad412f62eca2a836b652f

海康接口对接开发

 server/db/business.approve_param.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:create', '新建审批模版配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:delete', '删除审批模版配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:update', '修改审批模版配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:query', '查询审批模版配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:exportExcel', '导出审批模版配置信息表(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java

@@ -20,7 +20,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 * @date 2023/12/28 14:09
 */
@Api(tags = "审批信息记录表")
@RestController

 server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
package com.doumee.api.business;

import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.ApproveParam;
import com.doumee.service.business.ApproveParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;    
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/12/28 11:46
 */
@Api(tags = "审批模版配置信息表")
@RestController
@RequestMapping("/business/approveParam")
public class ApproveParamController extends BaseController {

    @Autowired
    private ApproveParamService approveParamService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:approveparam:create")
    public ApiResponse create(@RequestBody ApproveParam approveParam) {
        return ApiResponse.success(approveParamService.create(approveParam));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:approveparam:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        approveParamService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:approveparam:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        approveParamService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:approveparam:update")
    public ApiResponse updateById(@RequestBody ApproveParam approveParam) {
        approveParamService.updateById(approveParam);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:approveparam:query")
    public ApiResponse<PageData<ApproveParam>> findPage (@RequestBody PageWrap<ApproveParam> pageWrap) {
        return ApiResponse.success(approveParamService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:approveparam:exportExcel")
    public void exportExcel (@RequestBody PageWrap<ApproveParam> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ApproveParam.class).export(approveParamService.findPage(pageWrap).getRecords(), "审批模版配置信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:approveparam:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(approveParamService.findById(id));
    }
}

 server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java

@@ -53,6 +53,7 @@
    private void getRootOrgCode() {
        SystemDictData org =  systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_ROOTORG_CODE);
        if(org!=null){
            SystemDictData orgName =  systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_ROOTORG_NAME);
            String rootOrgId =org.getCode();
            if(StringUtils.isBlank(rootOrgId)){
                BaseResponse<OrgListResponse> res = HKService.getRootOrg(null);
@@ -60,6 +61,10 @@
                    org.setCode(res.getData().getOrgIndexCode());
                    org.setUpdateTime(new Date());
                    systemDictDataBiz.updateById( org);

                    orgName.setCode(res.getData().getOrgName());
                    orgName.setUpdateTime(new Date());
                    systemDictDataBiz.updateById( orgName);
                }
            }
        }

 server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -30,6 +30,7 @@
    public static final String HK_HTTPS ="HK_HTTPS" ;
    public static final String HK_PUSH_URL = "HK_PUSH_URL";
    public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
    public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;

    //被拜访人信息校验方式（0手机号单独校验 1手机号和姓名组合校验）
    public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";

 server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java

@@ -5,7 +5,7 @@

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 * @date 2023/12/28 14:09
 */
public interface ApproveMapper extends BaseMapper<Approve> {


 server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveParamMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.ApproveParam;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/12/28 11:46
 */
public interface ApproveParamMapper extends BaseMapper<ApproveParam> {

}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java

@@ -13,7 +13,7 @@
/**
 * å®¡æ‰¹ä¿¡æ¯è®°å½•è¡¨
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 * @date 2023/12/28 14:09
 */
@Data
@ApiModel("审批信息记录表")
@@ -67,8 +67,8 @@
    @ExcelColumn(name="ERP审批编码")
    private String erpId;

    @ApiModelProperty(value = "审批状态 0待审批 1审批通过 2审批未通过", example = "1")
    @ExcelColumn(name="审批状态 0待审批 1审批通过 2审批未通过")
    @ApiModelProperty(value = "审批状态 0待审批 1审批中 2审批通过 3审批未通过", example = "1")
    @ExcelColumn(name="审批状态 0待审批 1审批中 2审批通过 3审批未通过")
    private Integer status;

    @ApiModelProperty(value = "状态信息")
@@ -87,12 +87,20 @@
    @ExcelColumn(name="审批人姓名")
    private String checkorName;

    @ApiModelProperty(value = "是否终审", example = "1")
    @ExcelColumn(name="是否终审")
    @ApiModelProperty(value = "是否终审 0否 1是", example = "1")
    @ExcelColumn(name="是否终审 0否 1是")
    private Integer isEndCheck;

    @ApiModelProperty(value = "访客申请记录编码(关联visit）", example = "1")
    @ExcelColumn(name="访客申请记录编码(关联visit）")
    private Integer visitId;

    @ApiModelProperty(value = "审批等级", example = "1")
    @ExcelColumn(name="审批等级")
    private Integer level;

    @ApiModelProperty(value = "多人审批方式 0或签 1会签", example = "1")
    @ExcelColumn(name="多人审批方式 0或签 1会签")
    private Integer approveType;

}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,86 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;

/**
 * å®¡æ‰¹æ¨¡ç‰ˆé…ç½®ä¿¡æ¯è¡¨
 * @author æ±Ÿè¹„蹄
 * @date 2023/12/28 11:46
 */
@Data
@ApiModel("审批模版配置信息表")
@TableName("`approve_param`")
public class ApproveParam {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "类型 0审批 1抄送", example = "1")
    @ExcelColumn(name="类型 0审批 1抄送")
    private Integer type;

    @ApiModelProperty(value = "审批人类型 0被访人 1指定人员 2部门主管")
    @ExcelColumn(name="审批人类型 0被访人 1指定人员 2部门主管")
    private String memberType;

    @ApiModelProperty(value = "等级", example = "1")
    @ExcelColumn(name="等级")
    private Integer level;

    @ApiModelProperty(value = "审批人姓名，多个用英文逗号隔开")
    @ExcelColumn(name="审批人姓名，多个用英文逗号隔开")
    private String objNames;

    @ApiModelProperty(value = "审批人编码，多个用英文逗号隔开")
    @ExcelColumn(name="审批人编码，多个用英文逗号隔开")
    private String objIds;

    @ApiModelProperty(value = "审批主管等级 0直接主管 1二级主管 2三级主管 4四级主管", example = "1")
    @ExcelColumn(name="审批主管等级 0直接主管 1二级主管 2三级主管 4四级主管")
    private Integer objLevel;

    @ApiModelProperty(value = "多人审批方式 0或签 1会签", example = "1")
    @ExcelColumn(name="多人审批方式 0或签 1会签")
    private Integer approveType;

    @ApiModelProperty(value = "无主管选项 0流程结束 1由上级主管代替审核", example = "1")
    @ExcelColumn(name="无主管选项 0流程结束 1由上级主管代替审核")
    private Integer noleaderOpt;

}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java

@@ -48,6 +48,10 @@
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "卡类型 0IC卡 1CPU卡  2远距离卡 3M卡")
    @ExcelColumn(name="卡类型 0IC卡 1CPU卡  2远距离卡 3M卡")
    private Integer type;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;
@@ -83,8 +87,8 @@
    @ExcelColumn(name="海康标识")
    private String hkId;

    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步")
    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步 2同步失败")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步 2同步失败")
    private Integer hkStatus;

    @ApiModelProperty(value = "海康最近同步时间")

 server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.doumee.service.business;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.ApproveParam;
import java.util.List;

/**
 * å®¡æ‰¹æ¨¡ç‰ˆé…ç½®ä¿¡æ¯è¡¨Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2023/12/28 11:46
 */
public interface ApproveParamService {

    /**
     * åˆ›å»º
     * 
     * @param approveParam å®žä½“对象
     * @return Integer
     */
    Integer create(ApproveParam approveParam);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);

    /**
     * åˆ é™¤
     *
     * @param approveParam å®žä½“对象
     */
    void delete(ApproveParam approveParam);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param approveParam å®žä½“对象
     */
    void updateById(ApproveParam approveParam);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param approveParams å®žä½“集
     */
    void updateByIdInBatch(List<ApproveParam> approveParams);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return ApproveParam
     */
    ApproveParam findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param approveParam å®žä½“对象
     * @return ApproveParam
     */
    ApproveParam findOne(ApproveParam approveParam);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param approveParam å®žä½“对象
     * @return List<ApproveParam>
     */
    List<ApproveParam> findList(ApproveParam approveParam);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<ApproveParam>
     */
    PageData<ApproveParam> findPage(PageWrap<ApproveParam> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param approveParam å®žä½“对象
     * @return long
     */
    long count(ApproveParam approveParam);
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java

@@ -8,7 +8,7 @@
/**
 * å®¡æ‰¹ä¿¡æ¯è®°å½•è¡¨Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 * @date 2023/12/28 14:09
 */
public interface ApproveService {


 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,154 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ApproveParamMapper;
import com.doumee.dao.business.model.ApproveParam;
import com.doumee.service.business.ApproveParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

/**
 * å®¡æ‰¹æ¨¡ç‰ˆé…ç½®ä¿¡æ¯è¡¨Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2023/12/28 11:46
 */
@Service
public class ApproveParamServiceImpl implements ApproveParamService {

    @Autowired
    private ApproveParamMapper approveParamMapper;

    @Override
    public Integer create(ApproveParam approveParam) {
        approveParamMapper.insert(approveParam);
        return approveParam.getId();
    }

    @Override
    public void deleteById(Integer id) {
        approveParamMapper.deleteById(id);
    }

    @Override
    public void delete(ApproveParam approveParam) {
        UpdateWrapper<ApproveParam> deleteWrapper = new UpdateWrapper<>(approveParam);
        approveParamMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        approveParamMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(ApproveParam approveParam) {
        approveParamMapper.updateById(approveParam);
    }

    @Override
    public void updateByIdInBatch(List<ApproveParam> approveParams) {
        if (CollectionUtils.isEmpty(approveParams)) {
            return;
        }
        for (ApproveParam approveParam: approveParams) {
            this.updateById(approveParam);
        }
    }

    @Override
    public ApproveParam findById(Integer id) {
        return approveParamMapper.selectById(id);
    }

    @Override
    public ApproveParam findOne(ApproveParam approveParam) {
        QueryWrapper<ApproveParam> wrapper = new QueryWrapper<>(approveParam);
        return approveParamMapper.selectOne(wrapper);
    }

    @Override
    public List<ApproveParam> findList(ApproveParam approveParam) {
        QueryWrapper<ApproveParam> wrapper = new QueryWrapper<>(approveParam);
        return approveParamMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<ApproveParam> findPage(PageWrap<ApproveParam> pageWrap) {
        IPage<ApproveParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<ApproveParam> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(ApproveParam::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(ApproveParam::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(ApproveParam::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(ApproveParam::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(ApproveParam::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(ApproveParam::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(ApproveParam::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(ApproveParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(ApproveParam::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.lambda().eq(ApproveParam::getType, pageWrap.getModel().getType());
        }
        if (pageWrap.getModel().getMemberType() != null) {
            queryWrapper.lambda().eq(ApproveParam::getMemberType, pageWrap.getModel().getMemberType());
        }
        if (pageWrap.getModel().getLevel() != null) {
            queryWrapper.lambda().eq(ApproveParam::getLevel, pageWrap.getModel().getLevel());
        }
        if (pageWrap.getModel().getObjNames() != null) {
            queryWrapper.lambda().eq(ApproveParam::getObjNames, pageWrap.getModel().getObjNames());
        }
        if (pageWrap.getModel().getObjIds() != null) {
            queryWrapper.lambda().eq(ApproveParam::getObjIds, pageWrap.getModel().getObjIds());
        }
        if (pageWrap.getModel().getObjLevel() != null) {
            queryWrapper.lambda().eq(ApproveParam::getObjLevel, pageWrap.getModel().getObjLevel());
        }
        if (pageWrap.getModel().getApproveType() != null) {
            queryWrapper.lambda().eq(ApproveParam::getApproveType, pageWrap.getModel().getApproveType());
        }
        if (pageWrap.getModel().getNoleaderOpt() != null) {
            queryWrapper.lambda().eq(ApproveParam::getNoleaderOpt, pageWrap.getModel().getNoleaderOpt());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(approveParamMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(ApproveParam approveParam) {
        QueryWrapper<ApproveParam> wrapper = new QueryWrapper<>(approveParam);
        return approveParamMapper.selectCount(wrapper);
    }
}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java

@@ -19,7 +19,7 @@
/**
 * å®¡æ‰¹ä¿¡æ¯è®°å½•è¡¨Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 * @date 2023/12/28 14:09
 */
@Service
public class ApproveServiceImpl implements ApproveService {
@@ -145,6 +145,12 @@
        if (pageWrap.getModel().getVisitId() != null) {
            queryWrapper.lambda().eq(Approve::getVisitId, pageWrap.getModel().getVisitId());
        }
        if (pageWrap.getModel().getLevel() != null) {
            queryWrapper.lambda().eq(Approve::getLevel, pageWrap.getModel().getLevel());
        }
        if (pageWrap.getModel().getApproveType() != null) {
            queryWrapper.lambda().eq(Approve::getApproveType, pageWrap.getModel().getApproveType());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -135,17 +135,18 @@
        BaseResponse<List<OrgUpdateFailureResponse>> result =  HKService.delBatchOrg(request);
        if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
                //处理新增成功的数据，修改海康同步状态
            if(result.getData()!=null && result.getData().size()>0){
            if(result.getData()!=null && result.getData().size()==0){
                return true;
            }
        }

        return false;
    }


    private OrgAddRequest getOrgAddModel(Company c ) {
        OrgAddRequest model = new OrgAddRequest();
        model.setOrgIndexCode(HKConstants.RES_ORG_INDEX+ UUID.randomUUID().toString().replace("-",""));
        model.setOrgIndexCode(c.getHkId());
        model.setOrgName(c.getName());
//        model.setOrgCode(c.getCode());
        model.setParentIndexCode(c.getHkParentId());
@@ -207,7 +208,7 @@
        company.setHkDate(company.getHkDate());
        companyMapper.updateById(company);
        //下发海康安防平台
        if(!delHkOrg(company)){
        if(!delHkOrg(model)){
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织删除下发失败，请确认该组织无下级组织或组织人员信息~");
        }
    }