merge

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 
+import com.steerinfo.dil.feign.SSOFeign;
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.UniversalMapper;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -40,11 +42,12 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @Autowired
     private UniversalMapper universalMapper;
 
+
     @ApiOperation("登录接口")
     @PostMapping("bpLogin")
     public RESTfulResult bpLogin(String userName,String password,String app_code) {
 
-        backgroundProcessingService.bpLogin(userName);
+        //backgroundProcessingService.bpLogin();
         return success();
     }
 

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

@@ -95,6 +95,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查作业点")
     @PostMapping("/getOperationPointByLike")
     public RESTfulResult getOperationPointByLike(@RequestBody(required = false) Map<String,Object> map) {
+        System.out.println(map.get("id"));
         List<Map<String, Object>> list = universalMapper.getOperationPointByLike(map);
         return success(list);
     }
@@ -209,5 +210,10 @@ public class UniversalController extends BaseRESTfulController {
         return success(orderIds);
     }
 
-
+    @ApiOperation(value = "需求快捷编码")
+    @PostMapping("/getDemandRulesCode")
+    public RESTfulResult getDemandRulesCode(@RequestBody(required = false) Map<String,Object> map) {
+        List<Map<String, Object>> demandRules = universalMapper.getDemandRulesCode(map);
+        return success(demandRules);
+    }
 }

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

@@ -67,4 +67,6 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getOrderIds(Map<String, Object> map);
 
+    List<Map<String, Object>> getDemandRulesCode(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/util/SSOUtil.java

@@ -0,0 +1,130 @@
+//package com.steerinfo.dil.util;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.steerinfo.dil.feign.SSOFeign;
+//import org.apache.log4j.Logger;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//public class SSOUtil {
+//
+//    @Autowired
+//    private SSOFeign ssoFeign;
+//
+//    static final Logger log = Logger.getLogger(SSOUtil.class);
+//
+//
+//    @Value(value = "${sso.userName}" )
+//    private String userName;
+//
+//    @Value(value = "${sso.password}" )
+//    private String password;
+//
+//    @Value(value = "${sso.orgId}" )
+//    private String orgId;
+//
+//    @Value(value = "${sso.groupId}" )
+//    private String groupId;
+//
+//    @Value(value = "${sso.companyId}" )
+//    private String companyId;
+//
+//    /**
+//     * 登录并返回token
+//     * @return
+//     */
+//    public  String login(){
+//        try{
+//            JSONObject result = ssoFeign.login(userName,password);
+//            String token = result.getJSONObject("data").getString("accessToken");
+//            log.debug(token);
+//            return  token;
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            log.error("登录SSO失败！"+e.getMessage());
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 新增SSO用户
+//     * @return
+//     */
+//    public  JSONObject addUser(String userName,String userCode ,String orgName,String orgCode){
+//        try{
+//            String token = login();
+//            if(token == null){
+//                throw new Exception("登录SSO失败，无法新增角色！");
+//            }
+//            JSONObject result =  ssoFeign.addUser(token,userName,userCode,orgName,orgCode,groupId,companyId,orgId);
+//            log.debug(result);
+//            return result;
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            log.error("登录SSO失败！"+e.getMessage());
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 删除SSO用户
+//     * @return
+//     */
+//    public  JSONObject deleteUser(String userId){
+//        try{
+//            String token = login();
+//            if(token == null){
+//                throw new Exception("登录SSO失败，无法新增角色！");
+//            }
+//            JSONObject result =  ssoFeign.deleteUser(token,userId);
+//            log.debug(result);
+//            return result;
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            log.error("登录SSO失败！"+e.getMessage());
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 查询SSO角色
+//     * @return
+//     */
+//    public  JSONObject getRolesUser(){
+//        try{
+//            String token = login();
+//            if(token == null){
+//                throw new Exception("登录SSO失败！");
+//            }
+//            JSONObject result =  ssoFeign.getRolesUser(token,companyId);
+//            log.debug(result);
+//            return result;
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            log.error("登录SSO失败！"+e.getMessage());
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 授权SSO用户
+//     * @return
+//     */
+//    public  JSONObject addUserroles(String userId ,String userCode,String roleId){
+//        try{
+//            String token = login();
+//            if(token == null){
+//                throw new Exception("登录SSO失败，无法新增角色！");
+//            }
+//            JSONObject result =  ssoFeign.addUserroles(token,userId,userCode,roleId);
+//            log.debug(result);
+//            return result;
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            log.error("登录SSO失败！"+e.getMessage());
+//        }
+//        return null;
+//    }
+//}

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

@@ -304,7 +304,9 @@
         RC.TRANS_RANGE_ID "id",
         RC.TRANS_RANGE_ID "value",
         RC.TRANS_RANGE_NAME "label",
-        RC.TRANS_RANGE_NAME "text"
+        RC.TRANS_RANGE_NAME "text",
+        rc.START_POINT_ID   "shippingPointId",
+        rc.END_POINT_ID     "receivingPointId"
         from RMS_TRANS_RANGE RC
         where DELETED = 0
         )
@@ -404,7 +406,8 @@
         RL.LINE_ID "value",
         RL.LINE_NAME "label",
         RL.LINE_NAME "text",
-        NVL(RL_TEMP."points",'无') "points"
+        NVL(RL_TEMP."points",'无') "points",
+        RL.LINE_TYPE    "lineType"
         from RMS_LINE RL
         LEFT JOIN
         (
@@ -425,6 +428,9 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label" || "points", #{index})
             </if>
+            <if test="lineType!=null and lineType!=''">
+                AND REGEXP_LIKE("lineType" , #{lineType})
+            </if>
             <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
                 <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -580,16 +586,16 @@
         FROM RMS_FUEL_TYPE
         WHERE DELETED = 0
         <if test="id!=null and id.size > 0 and !(index!=null and index!='')">
-          UNION
-        SELECT
-        FUEL_TYPE_ID "fuelTypeId",
-        FUEL_TYPE_NAME "fuelTypeName",
-        FUEL_TYPE_ID  "id",
-        FUEL_TYPE_ID "value",
-        FUEL_TYPE_NAME "text",
-        FUEL_TYPE_NAME "label"
-        FROM RMS_FUEL_TYPE
-        WHERE FUEL_TYPE_ID in
+            UNION
+            SELECT
+            FUEL_TYPE_ID "fuelTypeId",
+            FUEL_TYPE_NAME "fuelTypeName",
+            FUEL_TYPE_ID  "id",
+            FUEL_TYPE_ID "value",
+            FUEL_TYPE_NAME "text",
+            FUEL_TYPE_NAME "label"
+            FROM RMS_FUEL_TYPE
+            WHERE FUEL_TYPE_ID in
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}
             </foreach>
@@ -602,5 +608,32 @@
         </where>
         FETCH NEXT 10 ROWS ONLY
     </select>
+    <select id="getDemandRulesCode" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT RDB.BILLING_TYPE "billingType",
+        RDB.BUSINESS_TYPE   "businessType",
+        rdb.LINE_ID "lineId",
+        RDB.CAPACITY_TYPE_ID    "capacityTypeId",
+        RDB.MATERIAL_TYPE_ID    "operationsNameId",
+        RDB.TRANS_RANGE_ID      "operationRange",
+        rdb.COMPANY_ID          "businessCompanyId",
+        RDB.RULES_ID            "value",
+        RDB.RULES_CODE          "label",
+        ROP.OPERATION_POINT_ID  "shippingPointId",
+        ROP2.OPERATION_POINT_ID "receivingPointId"
+        FROM RMS_DEMAND_RULES RDB
+        LEFT JOIN RMS_TRANS_RANGE RTR
+        ON RTR.TRANS_RANGE_ID = RDB.TRANS_RANGE_ID
+        LEFT JOIN RMS_OPERATION_POINT ROP
+        ON ROP.OPERATION_POINT_ID = RTR.START_POINT_ID
+        LEFT JOIN RMS_OPERATION_POINT ROP2
+        ON ROP2.OPERATION_POINT_ID = RTR.END_POINT_ID
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+        </where>
+    </select>
 
 </mapper>