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/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/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
@@ -634,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); @@ -707,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/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_service/src/main/resources/application-proHS.yml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,81 @@ spring: # æ°æ®æºé ç½® datasource: url: jdbc:mysql://10.10.99.68:3306/visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: root password: Hs@20240307 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # è¿æ¥æ± ä¸çæå°ç©ºé²è¿æ¥ jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss #rocketmq: # namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080 # groupId: GID-wakatest # topic: waka-test # username: 4derRb4Sw5EkqUMI # password: v50N97wf4av8Q8I4 knife4j: enable: true basic: enable: true username: admin password: 111111 debug_model: false # Swaggeré ç½® swagger: host: dmtest.ahapp.net title: ${project.name}æ¥å£ææ¡£ description: ${project.name}æ¥å£ææ¡£ enabled: true context-path: /erp_interface # ç¦ç¨swaggeræ¶çéå®åå°å redirect-uri: / ########################åæ¥æ°æ®æ¨¡å¼ ######################## data-sync: org-user-data-origin: 1 #ç»ç»æ°æ® 0èªå»º 2以海康为主 1åæERPç³»ç» visitor-data-origin: 1 #è®¿å®¢æ°æ® 0èªå»º 2以海康为主 1åæERPç³»ç» need-deal-img: true #æ¯å¦éè¦å¤çå¾çæ°æ® ########################微信æ¯ä»ç¸å ³é ç½®######################## wx: pay: appId: wxfab6da18632e28de appSecret: 4ee3b22afa90287834319fc3c1635271 mchId: 1229817002 mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify keyPath: /usr/local/apiclient_cert.p12 tencent: map: remoteHost: https://apis.map.qq.com appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ des_pwd: 123456SDFKDJF ## MQTT## mqtt: host: tcp://192.168.10.198:1883 userName: root passWord: 123456 qos: 1 clientId: ClientId_local #ClientId_localå¿ é¡»å¯ä¸ æ¯å¦ä½ å·²ç»å®äºå«ABC é£ä½ å°±ä¸ç´å«ABC å ¶ä»å°æ¹å°±ä¸è¦ä½¿ç¨ABCäº timeout: 10 keepalive: 20 topic1: A/pick/warn/# #ç¬¦å·æ¯ä»£è¡¨æ´ä¸ªwarnä¸é¢çå ¨é¨åä¸»é¢ æ²¡æçè§£çè¯ å¯ä»¥ç¾åº¦ä»ç»çè§£ä¸ä¸ topic2: A/cmd/resp topic3: ABCF topic4: ABCH 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/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; }