接口转发修改

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() + "");

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<CompanyEntity> getSubCompany(FilterCompanyRequest companyRequest);
-
-    List<CompanyEntity> getSubCompany2(FilterCompanyRequest companyRequest);
-
-    List<CompanyEntity> filterCompany(FilterCompanyRequest companyRequest);
-
-
-    boolean deleteCompany(Long customerId);
+    CompanyEntity findCompany2(String CustomerId);
 
-    AliKeyEntity findKey(String customerId);
 }

src/main/java/com/glxp/api/entity/auth/AliKeyEntity.java

@@ -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;
-
-}

src/main/java/com/glxp/api/req/auth/FilterCompanyRequest.java

@@ -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<String> auditStatusList;
-}

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<CompanyEntity> filterCompany(FilterCompanyRequest companyRequest);
-
     CompanyEntity findCompany(String CustomerId);
 
-    List<CompanyEntity> getSubCompany(FilterCompanyRequest commitRequest);
-
-    List<CompanyEntity> getSubCompany2(FilterCompanyRequest commitRequest);
-
-    CompanyEntity findCompanyByName(String companyName);
-
-//    boolean insertCompany(CompanyEntity companyEntity);
-
-    AliKeyEntity findKey(String customerId);
-
-    boolean deleteCompany(Long customerId);
-
-    boolean insertCompany(CompanyEntity companyEntity);
-
 }

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<CompanyEntity> companyEntities = companyDao.filterCompany(filterCompanyRequest);
-        if (companyEntities != null && companyEntities.size() > 0) {
-            return companyEntities.get(0);
-        }
-        return null;
-    }
-
-    @Override
-    public List<CompanyEntity> filterCompany(FilterCompanyRequest companyRequest) {
-        return companyDao.filterCompany(companyRequest);
-    }
-
-    @Override
-    public CompanyEntity findCompany(String CustomerId) {
-        return companyDao.findCompany(CustomerId);
-    }
-
-    @Override
-    public List<CompanyEntity> getSubCompany(FilterCompanyRequest commitRequest) {
-        if (commitRequest == null) {
-            return Collections.emptyList();
-        }
-        int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
-        PageHelper.offsetPage(offset, commitRequest.getLimit());
-        List<CompanyEntity> companyEntities = companyDao.getSubCompany(commitRequest);
-        return companyEntities;
-    }
-
-    @Override
-    public List<CompanyEntity> getSubCompany2(FilterCompanyRequest commitRequest) {
-        if (commitRequest == null) {
-            return Collections.emptyList();
-        }
-        int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
-        PageHelper.offsetPage(offset, commitRequest.getLimit());
-        List<CompanyEntity> 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);
     }
 }

src/main/resources/mybatis/mapper/system/CompanyDao.xml

@@ -32,7 +32,7 @@
         #{appId},
         #{appSecret})
     </insert>
-    <select id="findCompany" parameterType="java.lang.String"
+    <select id="findCompany2" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.system.CompanyEntity">
         SELECT *
         FROM sup_company
@@ -40,269 +40,4 @@
     </select>
 
 
-    <select id="filterCompany" parameterType="com.glxp.api.req.auth.FilterCompanyRequest"
-            resultType="com.glxp.api.entity.system.CompanyEntity">
-        SELECT *
-        FROM sup_company
-        <where>
-            <if test="customerId != null and customerId != ''">
-                and parentIdFk = #{customerId}
-            </if>
-            <if test="companyName != null and companyName != ''">
-                and companyName like concat('%', #{companyName}, '%')
-            </if>
-            <if test="creditNum != null and creditNum != ''">
-                and creditNum like concat('%', #{creditNum}, '%')
-            </if>
-            <if test="auditStatus != null and auditStatus != ''">
-                and auditStatus = #{auditStatus}
-            </if>
-            <if test="unitIdFk != null and unitIdFk != ''">
-                and unitIdFk = #{unitIdFk}
-            </if>
-        </where>
-    </select>
-
-    <delete id="deleteCompany" parameterType="java.lang.Long">
-        delete
-        from sup_company
-        where customerId = #{customerId}
-    </delete>
-    <select id="findCompanyByName" parameterType="java.lang.String"
-            resultType="com.glxp.api.entity.system.CompanyEntity">
-        SELECT *
-        FROM sup_company
-        where companyName = #{companyName}
-    </select>
-    <select id="getSubCompany" parameterType="com.glxp.api.req.auth.FilterCompanyRequest"
-            resultType="com.glxp.api.entity.system.CompanyEntity">
-        SELECT *
-        FROM sup_company
-        <where>
-            <if test="customerId != null and customerId != ''">
-                and parentIdFk = #{customerId}
-            </if>
-            <if test="companyName != null and companyName != ''">
-                and companyName like concat('%', #{companyName}, '%')
-            </if>
-            <if test="creditNum != null and creditNum != ''">
-                and creditNum like concat('%', #{creditNum}, '%')
-            </if>
-            <if test="auditStatus != null and auditStatus != ''">
-                and auditStatus = #{auditStatus}
-            </if>
-            <if test="unitIdFk != null and unitIdFk != ''">
-                and unitIdFk = #{unitIdFk}
-            </if>
-            <if test="(auditStatus == null or auditStatus == '') and auditStatusList != null and auditStatusList.size() > 0">
-                <foreach collection="auditStatusList" item="auditStatus" open="AND (" separator="OR" close=")">
-                    auditStatus = #{auditStatus,jdbcType=VARCHAR}
-                </foreach>
-            </if>
-        </where>
-    </select>
-    <select id="getSubCompany2" parameterType="com.glxp.api.req.auth.FilterCompanyRequest"
-            resultType="com.glxp.api.entity.system.CompanyEntity">
-        SELECT *
-        FROM (sup_company
-        inner JOIN company_product_relevance
-        ON sup_company.customerId = company_product_relevance.customerId)
-        <where>
-            <if test="customerId != null and customerId != ''">
-                and parentIdFk = #{customerId}
-            </if>
-            <if test="companyName != null and companyName != ''">
-                and companyName like concat('%', #{companyName}, '%')
-            </if>
-            <if test="creditNum != null and creditNum != ''">
-                and creditNum like concat('%', #{creditNum}, '%')
-            </if>
-            <if test="auditStatus != null and auditStatus != ''">
-                and (sup_company.auditStatus = #{auditStatus}
-                or company_product_relevance.auditStatus = #{auditStatus}
-                )
-            </if>
-            <if test="(auditStatus == null or auditStatus == '') and auditStatusList != null and auditStatusList.size() > 0">
-                <foreach collection="auditStatusList" item="auditStatus" open="AND (" separator="OR" close=")">
-                    auditStatus = #{auditStatus,jdbcType=VARCHAR}
-                </foreach>
-            </if>
-        </where>
-    </select>
-
-    <update id="modifyCompany" parameterType="com.glxp.api.entity.system.CompanyEntity">
-        UPDATE sup_company
-        <trim prefix="set" suffixOverrides=",">
-            <if test="companyName != null">
-                companyName=#{companyName},
-            </if>
-            <if test="bussinessStatus != null">
-                bussinessStatus=#{bussinessStatus},
-            </if>
-            <if test="creditNum != null">
-                creditNum=#{creditNum},
-            </if>
-            <if test="classes != null">
-                classes=#{classes},
-            </if>
-            <if test="area != null">
-                area=#{area},
-            </if>
-            <if test="detailAddr != null">
-                detailAddr=#{detailAddr},
-            </if>
-            <if test="appId != null">
-                appId=#{appId},
-            </if>
-            <if test="appSecret != null">
-                appSecret=#{appSecret},
-            </if>
-            <if test="contacts != null">
-                contacts=#{contacts},
-            </if>
-            <if test="mobile != null">
-                mobile=#{mobile},
-            </if>
-            <if test="tel != null">
-                tel=#{tel},
-            </if>
-            <if test="email != null">
-                email=#{email},
-            </if>
-            <if test="refEntId != null">
-                refEntId=#{refEntId},
-            </if>
-            <if test="entId != null">
-                entId=#{entId},
-            </if>
-            <if test="networkType != null">
-                networkType=#{networkType},
-            </if>
-            <if test="certIdFk != null">
-                certIdFk=#{certIdFk},
-            </if>
-            <if test="areaCode != null">
-                areaCode=#{areaCode},
-            </if>
-            <if test="parentCompany != null">
-                parentCompany=#{parentCompany},
-            </if>
-            <if test="parentIdFk != null">
-                parentIdFk=#{parentIdFk},
-            </if>
-            <if test="contactsPapersType != null">
-                contactsPapersType=#{contactsPapersType},
-            </if>
-            <if test="contactsPapersCode != null">
-                contactsPapersCode=#{contactsPapersCode},
-            </if>
-            <if test="registerStatus != null">
-                registerStatus=#{registerStatus},
-            </if>
-            <if test="jyxkzh != null">
-                jyxkzh=#{jyxkzh},
-            </if>
-            <if test="jyxkzfzjg != null">
-                jyxkzfzjg=#{jyxkzfzjg},
-            </if>
-            <if test="jyxkzyxq != null">
-                jyxkzyxq=#{jyxkzyxq},
-            </if>
-            <if test="jybapzh != null">
-                jybapzh=#{jybapzh},
-            </if>
-            <if test="jybabm != null">
-                jybabm=#{jybabm},
-            </if>
-            <if test="fzrq != null">
-                fzrq=#{fzrq},
-            </if>
-            <if test="suihao != null">
-                suihao=#{suihao},
-            </if>
-            <if test="kaihuhang != null">
-                kaihuhang=#{kaihuhang},
-            </if>
-            <if test="kaihuzhanghao != null">
-                kaihuzhanghao=#{kaihuzhanghao},
-            </if>
-            <if test="auditStatus != null">
-                auditStatus=#{auditStatus},
-            </if>
-            <if test="filePath != null">
-                filePath=#{filePath},
-            </if>
-            <if test="filePath2 != null">
-                filePath2=#{filePath2},
-            </if>
-            <if test="filePath3 != null">
-                filePath3=#{filePath3},
-            </if>
-            <if test="filePath4 != null">
-                filePath4=#{filePath4},
-            </if>
-            <if test="unitIdFk != null">
-                unitIdFk=#{unitIdFk},
-            </if>
-        </trim>
-        WHERE customerId = #{customerId}
-    </update>
-
-    <insert id="insertCompany" parameterType="com.glxp.api.entity.system.CompanyEntity">
-        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})
-    </insert>
-    <select id="findKey" parameterType="java.lang.String"
-            resultType="com.glxp.api.entity.auth.AliKeyEntity">
-        SELECT sup_company.refEntId,
-               sup_company.entId,
-               alicert.appKey,
-               alicert.appSecret
-        from sup_company
-                 INNER JOIN alicert on sup_company.certIdFk = alicert.id
-        where sup_company.customerId = #{customerId}
-    </select>
-
-
 </mapper>