修改

pom.xml

@@ -16,6 +16,13 @@
 
     <dependencyManagement>
         <dependencies>
+<!--            <dependency>-->
+<!--                <groupId>com.alibaba.cloud</groupId>-->
+<!--                <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
+<!--                <version>2.0.0.RELEASE</version>-->
+<!--                <type>pom</type>-->
+<!--                <scope>import</scope>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
@@ -48,6 +55,10 @@
     </distributionManagement>
 
     <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>-->
+<!--        </dependency>-->
         <!--websocket-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -605,8 +605,8 @@ public class RMScontroller extends BaseRESTfulController {
             ){
                 throw new Exception("单元格数据异常，请检查模板或数据是否正确!");
             }
-            set.add(item.get("NC主键").toString()+item.get("类型").toString());
-            map.put(item.get("NC主键").toString()+item.get("类型").toString(),item);
+            set.add(item.get("NC主键").toString()+"-"+item.get("类型").toString());
+            map.put(item.get("NC主键").toString()+"-"+item.get("类型").toString(),item);
         }
         //去重
         String[] setList = set.toArray(new String[0]);
@@ -1546,4 +1546,36 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> updateInnerCode(@RequestBody Map<String, Object> mapValue) {
         return rmsFeign.updateInnerCode(mapValue);
     }
+
+    @ApiOperation(value = "获取业务类型与控制关系列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getBusinessTypeControlList")
+    public Map<String, Object> getBusinessTypeControlList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
+    ) {
+        return rmsFeign.getBusinessTypeControlList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/addBusinessTypeControl")
+    public Map<String, Object> addBusinessTypeControl(@RequestBody Map<String, Object> mapValue) {
+        return rmsFeign.addBusinessTypeControl(mapValue);
+    }
+
+    @PostMapping("/updateBusinessTypeControl")
+    public Map<String, Object> updateBusinessTypeControl(@RequestBody Map<String, Object> mapValue) {
+        return rmsFeign.updateBusinessTypeControl(mapValue);
+    }
+
+    @PostMapping("/deleteBusinessTypeControl")
+    public Map<String, Object> deleteBusinessTypeControl(@RequestBody Map<String, Object> mapValue) {
+        return rmsFeign.deleteBusinessTypeControl(mapValue);
+    }
 }

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -87,6 +87,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查公司计划单位")
+    @PostMapping("/getCompanyMesByPlanLike")
+    public RESTfulResult getCompanyMesByPlanLike(@RequestBody(required = false) Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getCompanyMesByPlanLike(map);
+        return success(list);
+    }
+
 
     @ApiModelProperty(value = "边输边查环保标准")
     @PostMapping("/getEmissionStandardByLike")

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -789,6 +789,21 @@ public interface RmsFeign {
 
     @PostMapping(value = "/api/v1/rms/rmspersonnel/updateInnerCode")
     Map<String, Object> updateInnerCode(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/getBusinessTypeControlList")
+    Map<String, Object> getBusinessTypeControlList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/addBusinessTypeControl")
+    Map<String, Object> addBusinessTypeControl(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/updateBusinessTypeControl")
+    Map<String, Object> updateBusinessTypeControl(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsbusinesstypecontrols/deleteBusinessTypeControl")
+    Map<String, Object> deleteBusinessTypeControl(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -20,6 +20,8 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getCompanyMesByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getCompanyMesByPlanLike(Map<String, Object> map);
+
     List<Map<String, Object>> getMaterialTypeByLike(Map<String, Object> map);
     List<Map<String, Object>> getMaterialByLike(Map<String, Object> map);
 

src/main/resources/application-prod.yml

@@ -24,23 +24,24 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:8000}
   TmsFeign:
-    url: ${TMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:8000}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:8093}
+    url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:80/bd}
+    url: ${RMSFEIGN_URL:172.16.90.202:8000}
+#    url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8096}
+    url: ${TMSFEIGN_URL:172.16.90.202:8000}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
     url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.202:8000}
 
 
 #远程调用

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1323,4 +1323,133 @@
             </if>
         </where>
     </select>
+    <select id="getCompanyMesByPlanLike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.SSO_ID "ssoId",
+        RC.SSO_CODE "ssoCode",
+        RC.COMPANY_ID "id",
+        RC.COMPANY_ID   "key",
+        RC.COMPANY_ID "value",
+        <if test="companyType==null">
+            RC.COMPANY_TYPE || '-' ||
+        </if>
+        RC.COMPANY_NAME "label",
+        RC.COMPANY_NAME "text",
+        RC.COMPANY_NAME "companyName",
+        T2 ."rootCompanyId",
+        T2 ."rootCompanyName",
+        'label' "prop"
+        from RMS_COMPANY RC
+        LEFT JOIN (
+        SELECT "companyId",MAX("level") "rootIndex" FROM
+        (
+        SELECT
+        RC.COMPANY_ID "rootCompanyId",
+        RC.COMPANY_NAME "rootCompanyName",
+        LEVEL "level",
+        CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+        FROM
+        RMS_COMPANY RC
+        CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+        )
+        GROUP BY "companyId"
+        ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+        LEFT JOIN
+        (
+        SELECT
+        RC.COMPANY_ID "rootCompanyId",
+        RC.COMPANY_NAME "rootCompanyName",
+        LEVEL "level",
+        CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+        FROM
+        RMS_COMPANY RC
+        CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+        ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+        <where>
+            DELETED = 0
+            <if test="companyType!=null and companyType!=''">
+                AND RC.COMPANY_TYPE = #{companyType}
+            </if>
+            <if test="companyId!=null and companyId!=''">
+                AND RC.COMPANY_ID = #{companyId}
+            </if>
+            <if test="businessCompanyId!=null and businessCompanyId!=''">
+                AND RC.COMPANY_ID = #{businessCompanyId}
+            </if>
+            <if test="supplierCompanyId!=null and supplierCompanyId!=''">
+                AND RC.COMPANY_ID = #{supplierCompanyId}
+            </if>
+            <if test="receiveCompanyId!=null and receiveCompanyId!=''">
+                AND RC.COMPANY_ID = #{receiveCompanyId}
+            </if>
+            <if test="carrierId!=null and carrierId!=''">
+                AND RC.COMPANY_ID = #{carrierId}
+            </if>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
+            </if>
+            <if test="isListed !=null and isListed!=''">
+                AND RC.is_Listed IS NOT NULL
+            </if>
+            <if test="lastIndex!=null">
+                and RC.COMPANY_ID &lt; #{lastIndex}
+            </if>
+        </where>
+        <if test="noRow == null">
+            order by
+            RC.COMPANY_ID desc,
+            LENGTH(company_name)
+            FETCH NEXT 10 ROWS ONLY
+        </if>
+        )
+        <if test="id!=null and id.size>0">
+            UNION
+            select
+            RC.SSO_ID "ssoId",
+            RC.SSO_CODE "ssoCode",
+            RC.COMPANY_ID "id",
+            RC.COMPANY_ID   "key",
+            RC.COMPANY_ID "value",
+            <if test="companyType==null">
+                RC.COMPANY_TYPE || '-' ||
+            </if>
+            RC.COMPANY_NAME "label",
+            RC.COMPANY_NAME "text",
+            RC.COMPANY_NAME "companyName",
+            T2 ."rootCompanyId",
+            T2 ."rootCompanyName",
+            'label' "prop"
+            from RMS_COMPANY RC
+            LEFT JOIN (
+            SELECT "companyId",MAX("level") "rootIndex" FROM
+            (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            )
+            GROUP BY "companyId"
+            ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+            LEFT JOIN
+            (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+            where RC.COMPANY_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>