From f92fa878b949540c61cec76f86a0520c8227162a Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Wed, 28 Jun 2023 15:53:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BD=AC=E5=8F=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiRlSupController.java | 2 +- .../com/glxp/api/dao/system/CompanyDao.java | 18 +- .../glxp/api/entity/auth/AliKeyEntity.java | 13 - .../api/req/auth/FilterCompanyRequest.java | 18 -- .../api/service/system/CompanyService.java | 22 -- .../system/impl/CompanyServiceImpl.java | 66 +---- .../mybatis/mapper/system/CompanyDao.xml | 267 +----------------- 7 files changed, 7 insertions(+), 399 deletions(-) delete mode 100644 src/main/java/com/glxp/api/entity/auth/AliKeyEntity.java delete mode 100644 src/main/java/com/glxp/api/req/auth/FilterCompanyRequest.java diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 77c9fcd..6b43354 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -45,7 +45,7 @@ public class UdiRlSupController { private CompanyProductsRelService companyProductsRelService; @AuthRuleAnnotation("") - @PostMapping("/sale/info/insertFilter") + @PostMapping("/directToCpt/sale/info/insertFilter") @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId() + ""); diff --git a/src/main/java/com/glxp/api/dao/system/CompanyDao.java b/src/main/java/com/glxp/api/dao/system/CompanyDao.java index ff0a540..f8e7e28 100644 --- a/src/main/java/com/glxp/api/dao/system/CompanyDao.java +++ b/src/main/java/com/glxp/api/dao/system/CompanyDao.java @@ -1,12 +1,8 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.auth.AliKeyEntity; import com.glxp.api.entity.system.CompanyEntity; -import com.glxp.api.req.auth.FilterCompanyRequest; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper public interface CompanyDao { @@ -16,18 +12,6 @@ public interface CompanyDao { boolean insertCompany(CompanyEntity companyEntity); - CompanyEntity findCompany(String CustomerId); - - CompanyEntity findCompanyByName(String companyName); - - List getSubCompany(FilterCompanyRequest companyRequest); - - List getSubCompany2(FilterCompanyRequest companyRequest); - - List filterCompany(FilterCompanyRequest companyRequest); - - - boolean deleteCompany(Long customerId); + CompanyEntity findCompany2(String CustomerId); - AliKeyEntity findKey(String customerId); } diff --git a/src/main/java/com/glxp/api/entity/auth/AliKeyEntity.java b/src/main/java/com/glxp/api/entity/auth/AliKeyEntity.java deleted file mode 100644 index 9f466d5..0000000 --- a/src/main/java/com/glxp/api/entity/auth/AliKeyEntity.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.glxp.api.entity.auth; - -import lombok.Data; - -@Data -public class AliKeyEntity { - - private String refEntId; - private String entId; - private String appKey; - private String appSecret; - -} diff --git a/src/main/java/com/glxp/api/req/auth/FilterCompanyRequest.java b/src/main/java/com/glxp/api/req/auth/FilterCompanyRequest.java deleted file mode 100644 index ca74579..0000000 --- a/src/main/java/com/glxp/api/req/auth/FilterCompanyRequest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.glxp.api.req.auth; - -import com.glxp.api.util.page.ListPageRequest; -import lombok.Data; - -import java.util.List; - -@Data -public class FilterCompanyRequest extends ListPageRequest { - - private String customerId; - private String companyName; - private String creditNum; - private String auditStatus; - private String unitIdFk; - - private List auditStatusList; -} diff --git a/src/main/java/com/glxp/api/service/system/CompanyService.java b/src/main/java/com/glxp/api/service/system/CompanyService.java index 8843105..8dcc89d 100644 --- a/src/main/java/com/glxp/api/service/system/CompanyService.java +++ b/src/main/java/com/glxp/api/service/system/CompanyService.java @@ -1,10 +1,6 @@ package com.glxp.api.service.system; -import com.glxp.api.entity.auth.AliKeyEntity; import com.glxp.api.entity.system.CompanyEntity; -import com.glxp.api.req.auth.FilterCompanyRequest; - -import java.util.List; public interface CompanyService { @@ -12,24 +8,6 @@ public interface CompanyService { boolean modifyCompany(CompanyEntity companyEntity); - CompanyEntity findCompanyByUnitFk(String unitFk); - - List filterCompany(FilterCompanyRequest companyRequest); - CompanyEntity findCompany(String CustomerId); - List getSubCompany(FilterCompanyRequest commitRequest); - - List getSubCompany2(FilterCompanyRequest commitRequest); - - CompanyEntity findCompanyByName(String companyName); - -// boolean insertCompany(CompanyEntity companyEntity); - - AliKeyEntity findKey(String customerId); - - boolean deleteCompany(Long customerId); - - boolean insertCompany(CompanyEntity companyEntity); - } diff --git a/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java index 9644b5f..6d86b5c 100644 --- a/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java @@ -2,9 +2,9 @@ package com.glxp.api.service.system.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.CompanyDao; -import com.glxp.api.entity.auth.AliKeyEntity; + import com.glxp.api.entity.system.CompanyEntity; -import com.glxp.api.req.auth.FilterCompanyRequest; + import com.glxp.api.service.system.CompanyService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,54 +20,6 @@ public class CompanyServiceImpl implements CompanyService { @Resource CompanyDao companyDao; - @Override - public CompanyEntity findCompanyByUnitFk(String unitFk) { - FilterCompanyRequest filterCompanyRequest = new FilterCompanyRequest(); - filterCompanyRequest.setUnitIdFk(unitFk); - List companyEntities = companyDao.filterCompany(filterCompanyRequest); - if (companyEntities != null && companyEntities.size() > 0) { - return companyEntities.get(0); - } - return null; - } - - @Override - public List filterCompany(FilterCompanyRequest companyRequest) { - return companyDao.filterCompany(companyRequest); - } - - @Override - public CompanyEntity findCompany(String CustomerId) { - return companyDao.findCompany(CustomerId); - } - - @Override - public List getSubCompany(FilterCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - List companyEntities = companyDao.getSubCompany(commitRequest); - return companyEntities; - } - - @Override - public List getSubCompany2(FilterCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - List companyEntities = companyDao.getSubCompany2(commitRequest); - return companyEntities; - } - - @Override - public CompanyEntity findCompanyByName(String companyName) { - return companyDao.findCompanyByName(companyName); - } - @Override public CompanyEntity findCompany() { return companyDao.findCompany(); @@ -82,17 +34,7 @@ public class CompanyServiceImpl implements CompanyService { return companyDao.modifyCompany(companyEntity); } @Override - public boolean insertCompany(CompanyEntity companyEntity) { - return companyDao.insertCompany(companyEntity); - } - - @Override - public AliKeyEntity findKey(String customerId) { - return companyDao.findKey(customerId); - } - - @Override - public boolean deleteCompany(Long customerId) { - return companyDao.deleteCompany(customerId); + public CompanyEntity findCompany(String CustomerId) { + return companyDao.findCompany2(CustomerId); } } diff --git a/src/main/resources/mybatis/mapper/system/CompanyDao.xml b/src/main/resources/mybatis/mapper/system/CompanyDao.xml index 7024da3..0b12966 100644 --- a/src/main/resources/mybatis/mapper/system/CompanyDao.xml +++ b/src/main/resources/mybatis/mapper/system/CompanyDao.xml @@ -32,7 +32,7 @@ #{appId}, #{appSecret}) - - - - - delete - from sup_company - where customerId = #{customerId} - - - - - - - UPDATE sup_company - - - companyName=#{companyName}, - - - bussinessStatus=#{bussinessStatus}, - - - creditNum=#{creditNum}, - - - classes=#{classes}, - - - area=#{area}, - - - detailAddr=#{detailAddr}, - - - appId=#{appId}, - - - appSecret=#{appSecret}, - - - contacts=#{contacts}, - - - mobile=#{mobile}, - - - tel=#{tel}, - - - email=#{email}, - - - refEntId=#{refEntId}, - - - entId=#{entId}, - - - networkType=#{networkType}, - - - certIdFk=#{certIdFk}, - - - areaCode=#{areaCode}, - - - parentCompany=#{parentCompany}, - - - parentIdFk=#{parentIdFk}, - - - contactsPapersType=#{contactsPapersType}, - - - contactsPapersCode=#{contactsPapersCode}, - - - registerStatus=#{registerStatus}, - - - jyxkzh=#{jyxkzh}, - - - jyxkzfzjg=#{jyxkzfzjg}, - - - jyxkzyxq=#{jyxkzyxq}, - - - jybapzh=#{jybapzh}, - - - jybabm=#{jybabm}, - - - fzrq=#{fzrq}, - - - suihao=#{suihao}, - - - kaihuhang=#{kaihuhang}, - - - kaihuzhanghao=#{kaihuzhanghao}, - - - auditStatus=#{auditStatus}, - - - filePath=#{filePath}, - - - filePath2=#{filePath2}, - - - filePath3=#{filePath3}, - - - filePath4=#{filePath4}, - - - unitIdFk=#{unitIdFk}, - - - WHERE customerId = #{customerId} - - - - INSERT INTO sup_company(companyName, bussinessStatus, creditNum, classes, area, - detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode, - refEntId, entId, networkType, certIdFk, parentCompany, parentIdFk, - contactsPapersType, contactsPapersCode, registerStatus, jyxkzh, jyxkzfzjg, jyxkzyxq, - jybapzh, jybabm, fzrq, suihao, kaihuhang, kaihuzhanghao, auditStatus, - filePath, filePath2, filePath3, filePath4, unitIdFk) - values (#{companyName}, - #{bussinessStatus}, - #{creditNum}, - #{classes}, - #{area}, - #{detailAddr}, - #{appId}, - #{appSecret}, - #{contacts}, - #{mobile}, - #{tel}, - #{email}, - #{customerId}, - #{areaCode}, - #{refEntId}, - #{entId}, - #{networkType}, - #{certIdFk}, - #{parentCompany}, - #{parentIdFk}, - #{contactsPapersType}, - #{contactsPapersCode}, - #{registerStatus}, - #{jyxkzh}, - #{jyxkzfzjg}, - #{jyxkzyxq}, - #{jybapzh}, - #{jybabm}, - #{fzrq}, - #{suihao}, - #{kaihuhang}, - #{kaihuzhanghao}, - #{auditStatus}, - #{filePath}, - #{filePath2}, - #{filePath3}, - #{filePath4}, #{unitIdFk}) - - - -