From 947688a33cd6b76917eedd3765e88bd05fdeb20d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 17 三月 2024 18:09:33 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java | 2
server/dmvisit_web/src/main/resources/application.yml | 2
server/openapi/src/main/resources/application.yml | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 5
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 6
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 151 +++++++--------------
server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java | 10 -
server/dmvisit_admin/src/main/resources/application.yml | 2
server/dmvisit_service/src/main/java/com/doumee/core/utils/FtpUtil.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 27 +--
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java | 135 ++++++++++++++++--
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 23 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 5
15 files changed, 206 insertions(+), 172 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
index 5da9575..b275cdf 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
+++ b/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鏌ヨ")
diff --git a/server/dmvisit_admin/src/main/resources/application.yml b/server/dmvisit_admin/src/main/resources/application.yml
index e051fda..e7fd5cb 100644
--- a/server/dmvisit_admin/src/main/resources/application.yml
+++ b/server/dmvisit_admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: testHS
+ active: proHS
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/FtpUtil.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/FtpUtil.java
index 14662a7..a62bf46 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/FtpUtil.java
+++ b/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");
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index ab4e651..d285e67 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/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;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index f71401d..232b0ea 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/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 = "涓嬪彂寮�濮嬫椂闂�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java
index 5eea870..261c650 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java
+++ b/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);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index b1f536c..cc32054 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/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)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index ab80e1c..a004435 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/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())
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index d661135..d7a86bf 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/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)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index c9965cf..70c1451 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/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);
diff --git a/server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java b/server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java
index e1fc4ba..363cb0d 100644
--- a/server/dmvisit_web/src/main/java/com/doumee/api/ScheduleTool.java
+++ b/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 {
diff --git a/server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java b/server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java
index 5562a5b..1e3743d 100644
--- a/server/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java
+++ b/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({
diff --git a/server/dmvisit_web/src/main/resources/application.yml b/server/dmvisit_web/src/main/resources/application.yml
index cc7d5b6..789558e 100644
--- a/server/dmvisit_web/src/main/resources/application.yml
+++ b/server/dmvisit_web/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: proHS
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
index e5a2eae..c077a10 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
+++ b/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;
}
diff --git a/server/openapi/src/main/resources/application.yml b/server/openapi/src/main/resources/application.yml
index bb74450..52d569b 100644
--- a/server/openapi/src/main/resources/application.yml
+++ b/server/openapi/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: testHS
+ active: proHS
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3