ERP接口

k94314517

2024-03-17 947688a33cd6b76917eedd3765e88bd05fdeb20d

ERP接口

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

@@ -78,7 +78,7 @@
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:empower:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Empower> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(Empower.class).export(empowerService.findPage(pageWrap).getRecords(), "人员授权导入记录", response);
        ExcelExporter.build(Empower.class).export(empowerService.findPage(pageWrap).getRecords(), "授权记录", response);
    }

    @ApiOperation("根据ID查询")

 server/dmvisit_admin/src/main/resources/application.yml

@@ -10,7 +10,7 @@
  #  application:
  #    name: doumeemes
  profiles:
    active: testHS
    active: proHS

  # JSON返回配置
  jackson:

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

@@ -540,7 +540,7 @@

    public static void main(String[] args) throws Exception {
        try {
            FtpUtil ftpUtil = new FtpUtil("10.10.99.63", 21, "ftptest","doumee168" );
            FtpUtil ftpUtil = new FtpUtil("175.27.187.84", 21, "ftpuser","doumee168" );
            ftpUtil.uploadOnlineFile("https://profile-avatar.csdnimg.cn/default.jpg!1", "test"+"/", UUID.randomUUID().toString()+"test.jpg");
            /*FtpUtil myFtp = new FtpUtil("106.15.54.228", 21, "ftptlg",
                    "tlg168.com");

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java

@@ -1,5 +1,6 @@
package com.doumee.dao.admin.request;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@@ -33,6 +34,10 @@
    @ApiModelProperty(value = "姓名")
    private String name;


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

    @ApiModelProperty(value = "手机号")
    private String phone;


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

@@ -82,59 +82,58 @@
    private String companyId;

    @ApiModelProperty(value = "姓名")
    @ExcelColumn(name="姓名",index = 1)
    @ExcelColumn(name="姓名",index = 1,width = 6)
    @TableField(exist = false)
    private String memberName;

    @ApiModelProperty(value = "手机号")
    @ExcelColumn(name="手机号" ,index = 2)
    @ExcelColumn(name="手机号" ,index = 2,width = 10)
    @TableField(exist = false)
    private String memberPhone;

    @ApiModelProperty(value = "身份证")
    @ExcelColumn(name="身份证",index= 3)
    @ExcelColumn(name="身份证",index= 3,width = 12)
    @TableField(exist = false)
    private String memberidCard;

    @ApiModelProperty(value = "所属公司")
    @ExcelColumn(name="所属公司",index= 4)
    @ExcelColumn(name="所属公司",index= 4,width = 12)
    @TableField(exist = false)
    private String companyName;

    @ApiModelProperty(value = "门禁有效期开始")
    @ExcelColumn(name="门禁有效期开始",index= 5,dateFormat = "yyyy-MM-dd")
    @ExcelColumn(name="门禁有效期开始",index= 5,dateFormat = "yyyy-MM-dd",width = 10)
    private Date startTime;

    @ApiModelProperty(value = "门禁有效期结束", example = "1")
    @ExcelColumn(name="门禁有效期结束",index= 6,dateFormat = "yyyy-MM-dd")
    @ExcelColumn(name="门禁有效期结束",index= 6,dateFormat = "yyyy-MM-dd",width = 10)
    private Date endTime;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="创建时间",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
    private Date createDate;

    @ApiModelProperty(value = "操作人")
    @ExcelColumn(name="操作人",index= 7)
    @TableField(exist = false)
    private String createrName;
    @ApiModelProperty(value = "卡片集合（英文逗号隔开）")
    private String cardNos;

    @ApiModelProperty(value = "一卡通授权下发状态 0待下发 1任务执行 2下发成功 3已取消 4下发失败 5任务下载已结束 6不符合下发条件 ", example = "1")
    @ExcelColumn(name="下发状态",index= 8,valueMapping ="0=待下发;1=已下发;2=下发成功;3=已取消;4=下发失败;5=任务下载已结束;6==不符合下发条件" )
    @ExcelColumn(name="下发状态",index= 8,valueMapping ="0=待下发;1=已下发;2=下发成功;3=已取消;4=下发失败;5=任务下载已结束;6==不符合下发条件",width = 10 )
    private Integer sendStatus;

    @ApiModelProperty(value = "下发类型 0实时 1定时 ", example = "1")
    @ExcelColumn(name="下发类型",index= 9,valueMapping ="0=实时;1=定时" )
    @ExcelColumn(name="下发类型",index= 9,valueMapping ="0=实时;1=定时",width = 6 )
    private Integer sendType;

    @ApiModelProperty(value = "下发时间")
    @ExcelColumn(name="下发时间",index= 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="下发时间",index= 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date sendDate;

    @ApiModelProperty(value = "下发备注")
    @ExcelColumn(name="下发备注",index= 11)
    @ExcelColumn(name="下发备注",index= 11,width = 16)
    private String sendInfo;

    @ApiModelProperty(value = "下发开始时间")

 server/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java

@@ -101,4 +101,6 @@
    void roleUserAuthor(UserAuthorRequest param);

    void parkCarAuthor(CarAuthorRequest param);

    void saveInterfaceLog(Object param, String path, String result, Integer type);
}

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

@@ -393,19 +393,12 @@

    @Override
    public List<Member> findList(Member member) {
        return memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                .selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .eq(Objects.isNull(member.getType()),Member::getType,member.getType())
                .eq(Member::getIsdeleted,Constants.ZERO)
        );
//        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
//        if(null != member.getType()) {
//            wrapper.lambda().eq(Member::getType,member.getType());
//        }
//        wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
//        return memberMapper.selectList(wrapper);
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        if(null != member.getType()) {
            wrapper.lambda().eq(Member::getType,member.getType());
        }
        wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
        return memberMapper.selectList(wrapper);
    }

    @Override
@@ -641,7 +634,9 @@
                .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
//                .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
                .eq(Member::getType,Constants.memberType.internal)
                .orderByDesc(Member::getCreateDate);
@@ -714,7 +709,9 @@
                .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName())
                        .or().like(Company::getName,pageWrap.getModel().getCompanyName()))
                .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,
                        DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo())
                )
                .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
                .eq(Member::getType,Constants.memberType.visitor)

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

@@ -269,7 +269,10 @@
                        pageWrap.getModel().getKeyWords())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
                        VisitEvent::getCarNo,
                        pageWrap.getModel().getKeyWords())
                        pageWrap.getModel().getCarNo())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getVisitorWorkUint()),
                        VisitEvent::getVisitorWorkUint,
                        pageWrap.getModel().getVisitorWorkUint())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        Company::getName,
                        pageWrap.getModel().getCompanyName())

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

@@ -113,7 +113,6 @@
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void createFKForErp(ErpVisitDTO erpVisitDTO){
        try {
            if (Objects.isNull(erpVisitDTO)
                    || StringUtils.isBlank(erpVisitDTO.getName())
                    || StringUtils.isBlank(erpVisitDTO.getPhone())
@@ -166,11 +165,6 @@
                visits.setWithUserList(visitsList);
            }
            this.createFk(visits,true);
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(erpVisitDTO,"/visitBiz/resource/createVisit",null,Constants.ZERO);
        }
    }

    @Transactional(propagation = Propagation.NOT_SUPPORTED)

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

@@ -4,6 +4,7 @@
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.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
@@ -505,50 +506,44 @@
    @Override
    public List<RoleListResponse> erpQueryDeviceList(RoleListRequest param){
        List<RoleListResponse> result = new ArrayList<>();
        try{
           List<DeviceRole> deviceRoleList = this.deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                   .eq(DeviceRole::getIsdeleted,Constants.ZERO)
                   .eq(!Objects.isNull(param.getId()),DeviceRole::getId,param.getId())
                   .like(StringUtils.isNotBlank(param.getName()),DeviceRole::getName,param.getName())
                   .orderByAsc(DeviceRole::getCreateDate)
           );
           List<String> roleIds = new ArrayList<String>();
           if(CollectionUtils.isNotEmpty(deviceRoleList)){
               for (DeviceRole deviceRole:deviceRoleList) {
                   if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                       List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
                       roleIds.addAll(doorList);
                   }
               }
               if(CollectionUtils.isNotEmpty(roleIds)){
                   List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,roleIds));
                   for (DeviceRole deviceRole:deviceRoleList) {
                       RoleListResponse roleListResponse = new RoleListResponse();
                       BeanUtils.copyProperties(deviceRole,roleListResponse);
                       if(deviceRole.getType().equals("2")){
                           roleListResponse.setType(Constants.ONE);
                       }else{
                           roleListResponse.setType(Constants.ZERO);
                       }
                       if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                           List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
                           List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
                           List<Device> roleDeviceList = deviceList.stream().filter(m-> doorList.contains(m.getId().toString())).collect(Collectors.toList());
                           for (Device device:roleDeviceList) {
                               DeviceListResponse deviceListResponse = new DeviceListResponse();
                               BeanUtils.copyProperties(device,deviceListResponse);
                               DeviceListResponseList.add(deviceListResponse);
                           }
                           roleListResponse.setDeviceList(DeviceListResponseList);
                       }
                       result.add(roleListResponse);
                   }
       List<DeviceRole> deviceRoleList = this.deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
               .eq(DeviceRole::getIsdeleted,Constants.ZERO)
               .eq(!Objects.isNull(param.getId()),DeviceRole::getId,param.getId())
               .like(StringUtils.isNotBlank(param.getName()),DeviceRole::getName,param.getName())
               .orderByAsc(DeviceRole::getCreateDate)
       );
       List<String> roleIds = new ArrayList<String>();
       if(CollectionUtils.isNotEmpty(deviceRoleList)){
           for (DeviceRole deviceRole:deviceRoleList) {
               if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                   List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
                   roleIds.addAll(doorList);
               }
           }
       }catch (BusinessException e){
            throw e;
       }finally {
           saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO);
           if(CollectionUtils.isNotEmpty(roleIds)){
               List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,roleIds));
               for (DeviceRole deviceRole:deviceRoleList) {
                   RoleListResponse roleListResponse = new RoleListResponse();
                   BeanUtils.copyProperties(deviceRole,roleListResponse);
                   if(deviceRole.getType().equals("2")){
                       roleListResponse.setType(Constants.ONE);
                   }else{
                       roleListResponse.setType(Constants.ZERO);
                   }
                   if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                       List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
                       List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
                       List<Device> roleDeviceList = deviceList.stream().filter(m-> doorList.contains(m.getId().toString())).collect(Collectors.toList());
                       for (Device device:roleDeviceList) {
                           DeviceListResponse deviceListResponse = new DeviceListResponse();
                           BeanUtils.copyProperties(device,deviceListResponse);
                           DeviceListResponseList.add(deviceListResponse);
                       }
                       roleListResponse.setDeviceList(DeviceListResponseList);
                   }
                   result.add(roleListResponse);
               }
           }
       }
       return result;
    }
@@ -564,23 +559,17 @@
    @Override
    public List<ParkListResponse> parkList(ParkListRequest param){
        List<ParkListResponse> result = new ArrayList<>();
        try{
            List<Parks> parksList = this.parksMapper.selectList(new QueryWrapper<Parks>().lambda()
                    .eq(Parks::getIsdeleted,Constants.ZERO)
                    .eq(!Objects.isNull(param.getId()),Parks::getId,param.getId())
                    .like(StringUtils.isNotBlank(param.getName()),Parks::getName,param.getName())
            );
            if(CollectionUtils.isNotEmpty(parksList)){
                for (Parks parks:parksList) {
                    ParkListResponse parkListResponse = new ParkListResponse();
                    BeanUtils.copyProperties(parks,parkListResponse);
                    result.add(parkListResponse);
                }
        List<Parks> parksList = this.parksMapper.selectList(new QueryWrapper<Parks>().lambda()
                .eq(Parks::getIsdeleted,Constants.ZERO)
                .eq(!Objects.isNull(param.getId()),Parks::getId,param.getId())
                .like(StringUtils.isNotBlank(param.getName()),Parks::getName,param.getName())
        );
        if(CollectionUtils.isNotEmpty(parksList)){
            for (Parks parks:parksList) {
                ParkListResponse parkListResponse = new ParkListResponse();
                BeanUtils.copyProperties(parks,parkListResponse);
                result.add(parkListResponse);
            }
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
        return result;
    }
@@ -593,7 +582,6 @@
    @Override
    public PageData<VisitEventListResponse> visitListPage(PageWrap<VisitListRequest> param) {
        PageData<VisitEventListResponse> result = new PageData<>();
        try{
            VisitListRequest visitListRequest = param.getModel();
            IPage<VisitEvent> page = new Page<>(param.getPage(), param.getCapacity());
            MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -632,11 +620,6 @@
            }
            IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper);
            result = PageData.from(pageData);
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
        return result;
    }

@@ -644,7 +627,7 @@
    @Override
    public PageData<DoorEventListResponse> doorEventListPage(PageWrap<DoorEventListRequest> param) {
        PageData<DoorEventListResponse> result = new PageData<>();
        try{

            DoorEventListRequest doorEventListRequest = param.getModel();
            IPage<DeviceEvent> page = new Page<>(param.getPage(), param.getCapacity());
            MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -686,11 +669,6 @@

            IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper);
            result = PageData.from(pageData);
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO);
        }
        return result;
    }

@@ -698,7 +676,6 @@
    @Override
    public PageData<CarEventListResponse> carEventList(PageWrap<CarEventListRequest> param) {
        PageData<CarEventListResponse> result = new PageData<>();
        try{
            CarEventListRequest carEventListRequest = param.getModel();
            IPage<CarEvent> page = new Page<>(param.getPage(), param.getCapacity());
            MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -750,12 +727,6 @@
                    i.setVehiclePicUrl(null);
                }
            });
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
        }

        return  result;
    }

@@ -764,7 +735,6 @@

    @Override
    public void orgUpdate(OrgUpdateRequest param){
        try{
            if(Objects.isNull(param)
                    ||Objects.isNull(param.getId())
                    ||StringUtils.isBlank(param.getName())
@@ -823,16 +793,10 @@
                companyMapper.updateById(company);
                //TODO 海康数据更新
            }
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/orgUpdate",null,Constants.ZERO);
        }
    }

    @Override
    public void userUpdate(UserUpdateRequest param){
        try{
            if(param.getIsdeleted() == 1){
                if(  Objects.isNull(param.getId()) ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -909,11 +873,6 @@
                //添加人员卡片数据
                dealMemberCard(member,param);
            }
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO);
        }
    }

    /**
@@ -1012,7 +971,6 @@

    @Override
    public void roleUserAuthor(UserAuthorRequest param){
        try{
            if(Objects.isNull(param)
                    ||StringUtils.isBlank(param.getUserId())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -1038,17 +996,11 @@
                    .set(Member::getEndTime,param.getValidEndTime())
                    .set(Member::getEditDate,new Date())
                    .set(Member::getHkStatus,Constants.ZERO ));
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/event/role/userAuthor",null,Constants.ZERO);
        }
    }


    @Override
    public void parkCarAuthor(CarAuthorRequest param){
        try{
            if(Objects.isNull(param)
                    ||StringUtils.isBlank(param.getCarCode())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -1095,11 +1047,6 @@
                    throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，停车库信息不存在，授权失败");
                }
            }
        }catch (BusinessException e){
            throw e;
        }finally {
            saveInterfaceLog(param,"/event/park/carAuthor",null,Constants.ZERO);
        }
    }


@@ -1145,7 +1092,7 @@
    }


    @Transactional(propagation = Propagation.NOT_SUPPORTED)
    @Override
    public void saveInterfaceLog(Object param, String path, String result, Integer type) {
        InterfaceLog interfaceLog=new InterfaceLog();
        interfaceLog.setType(type);

 server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java

@@ -35,8 +35,8 @@
 * @date 2021-10-10 14:40:35
 * https://www.bejson.com/othertools/cron/  cron 表达式生成地址
 */
@Component
@EnableScheduling
//@Component
//@EnableScheduling
@Slf4j
public class ScheduleTool {


 server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java

@@ -6,7 +6,6 @@
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FaceImageCompress;
import com.doumee.core.utils.FtpUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
import io.swagger.annotations.Api;
@@ -45,15 +44,6 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;


    @ApiOperation(value = "压缩图片", notes = "压缩图片", httpMethod = "POST", position = 6)
    @ApiImplicitParams({
        @ApiImplicitParam(name = "folder", value = "文件夹", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
    })
    @GetMapping(value = "/compressImg")
    public void compressImg(@RequestParam(name = "folder") String folder, @RequestParam(name = "width") int width, HttpServletRequest request, HttpServletResponse response) throws Exception {
       FaceImageCompress. compressAllFiles(new File(folder),width);
    }

    @ApiOperation(value = "上传", notes = "上传", httpMethod = "POST", position = 6)
    @ApiImplicitParams({

 server/dmvisit_web/src/main/resources/application.yml

@@ -10,7 +10,7 @@
  #  application:
  #    name: doumeemes
  profiles:
    active: dev
    active: proHS

  # JSON返回配置
  jackson:

 server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java

@@ -1,5 +1,6 @@
package com.doumee.api.web;

import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.ErpLoginRequired;
import com.doumee.core.constants.ResponseStatus;
@@ -13,6 +14,7 @@
import com.doumee.dao.web.reqeust.ErpVisitDTO;
import com.doumee.service.business.VisitsService;
import com.doumee.service.business.ext.ERPSyncService;
import com.google.gson.JsonObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -56,7 +58,19 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "accessSecret", value = "访问秘钥，由访客端提供", required = true)
    })
    public ApiResponse<AccessTokenResponse> accesstoken(@RequestParam  String accessKey, @RequestParam  String accessSecret) {
        return  ApiResponse.success(erpSyncService.createERPToken(accessKey,accessSecret));
        ApiResponse response = ApiResponse.success(null);
        try {
            response.setData(erpSyncService.createERPToken(accessKey,accessSecret));
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        Map<String,String> param = new HashMap<>();
        param.put("accessKey",accessKey);
        param.put("accessSecret",accessSecret);
        erpSyncService.saveInterfaceLog(param,"/visitbiz/accesstoken", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }

    @ErpLoginRequired
@@ -67,7 +81,16 @@
    })
    public ApiResponse<List<RoleListResponse>> roleList(@RequestBody RoleListRequest param) {
        param.setToken(this.getToken());
        return  ApiResponse.success(erpSyncService.erpQueryDeviceList(param));
        ApiResponse response = ApiResponse.success(null);
        try {
            response.setData(erpSyncService.erpQueryDeviceList(param));
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(param,"/visitbiz/resource/role/lis", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }

    @ErpLoginRequired
@@ -78,7 +101,16 @@
    })
    public ApiResponse<List<ParkListResponse>> parkList(@RequestBody ParkListRequest param) {
        param.setToken(this.getToken());
        return  ApiResponse.success(erpSyncService.parkList(param));
        ApiResponse response = ApiResponse.success(null);
        try {
            response.setData(erpSyncService.parkList(param));
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(param,"/visitbiz/resource/role/list", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }

    @ErpLoginRequired
@@ -89,7 +121,16 @@
    })
    public ApiResponse<PageData<VisitEventListResponse>> visitList (@RequestBody PageWrap<VisitListRequest> pageWrap) {
        pageWrap.getModel().setToken(this.getToken());
        return ApiResponse.success(erpSyncService.visitListPage(pageWrap));
        ApiResponse response = ApiResponse.success(null);
        try {
            response.setData(erpSyncService.visitListPage(pageWrap));
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(pageWrap,"/visitbiz/resource/visit/list", JSONObject.toJSONString(response),Constants.ZERO);
        return response;
    }

    @ErpLoginRequired
@@ -100,7 +141,16 @@
    })
    public ApiResponse<PageData<DoorEventListResponse>> doorEventList (@RequestBody PageWrap<DoorEventListRequest> pageWrap) {
        pageWrap.getModel().setToken(this.getToken());
        return ApiResponse.success(erpSyncService.doorEventListPage(pageWrap));
        ApiResponse response = ApiResponse.success(null);
        try {
            response.setData(erpSyncService.doorEventListPage(pageWrap));
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(pageWrap,"/visitbiz/resource/doorEvent/list", JSONObject.toJSONString(response),Constants.ZERO);
        return response;
    }

    @ErpLoginRequired
@@ -111,7 +161,16 @@
    })
    public ApiResponse<PageData<CarEventListResponse>> carEventList (@RequestBody PageWrap<CarEventListRequest> pageWrap) {
        pageWrap.getModel().setToken(this.getToken());
        return ApiResponse.success(erpSyncService.carEventList(pageWrap));
        ApiResponse response = ApiResponse.success(null);
        try {
            response.setData(erpSyncService.carEventList(pageWrap));
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(pageWrap,"/visitbiz/resource/carvisit/list", JSONObject.toJSONString(response),Constants.ZERO);
        return response;
    }

    @ErpLoginRequired
@@ -122,8 +181,16 @@
    })
    public ApiResponse orgUpdate(@RequestBody OrgUpdateRequest param) {
        param.setToken(this.getToken());
        erpSyncService.orgUpdate(param);
        return  ApiResponse.success(null);
        ApiResponse response = ApiResponse.success(null);
        try {
            erpSyncService.orgUpdate(param);
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(param,"/visitbiz/event/org/update", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }

    @ErpLoginRequired
@@ -134,8 +201,16 @@
    })
    public ApiResponse userUpdate(@RequestBody UserUpdateRequest param) {
        param.setToken(this.getToken());
        erpSyncService.userUpdate(param);
        return  ApiResponse.success(null);
        ApiResponse response = ApiResponse.success(null);
        try {
            erpSyncService.userUpdate(param);
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(param,"/visitbiz/event/user/update", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }

    @ErpLoginRequired
@@ -145,8 +220,16 @@
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "授权token值", required = true)
    })
    public ApiResponse roleUserAuthor(@RequestBody UserAuthorRequest param) {
        erpSyncService.roleUserAuthor(param);
        return  ApiResponse.success(null);
        ApiResponse response = ApiResponse.success(null);
        try {
            erpSyncService.roleUserAuthor(param);
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(param,"/visitbiz/event/role/userAuthor", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }

    @ErpLoginRequired
@@ -164,9 +247,7 @@
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        //-----TODO-------记日志-------start-----

        //-----TODO-------记日志-------end-----
        erpSyncService.saveInterfaceLog(param,"/visitbiz/event/park/carAuthor", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }

@@ -178,8 +259,16 @@
    })
    public ApiResponse approveApply(@RequestBody ApproveNoticeRequest param) {
        param.setToken(this.getToken());
        erpSyncService.approveApply(param);
        return  ApiResponse.success(null);
        ApiResponse response = ApiResponse.success(null);
        try {
            erpSyncService.approveApply(param);
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(param,"/visitbiz/event/approve/notice", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }

    @ErpLoginRequired
@@ -190,8 +279,16 @@
    })
    public ApiResponse  createVisit(@Valid @RequestBody ErpVisitDTO param) {
        param.setToken(this.getToken());
        visitsService.createFKForErp(param);
        return  ApiResponse.success("操作成功");
        ApiResponse response = ApiResponse.success(null);
        try {
            visitsService.createFKForErp(param);
        }catch (BusinessException e){
            response = ApiResponse.failed(e.getCode(), e.getMessage());
        }catch (Exception e){
            response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
        }
        erpSyncService.saveInterfaceLog(param,"/visitbiz/resource/createVisit", JSONObject.toJSONString(response),Constants.ZERO);
        return  response;
    }



 server/openapi/src/main/resources/application.yml

@@ -10,7 +10,7 @@
  #  application:
  #    name: doumeemes
  profiles:
    active: testHS
    active: proHS

  # JSON返回配置
  jackson: