luobang 2 tahun lalu
induk
melakukan
09118ba0b3

+ 8 - 0
src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java

@@ -142,4 +142,12 @@ public class RmsConsigneeController extends BaseRESTfulController {
         List<Map<String,Object>> result=rmsConsigneeService.getConsigneeFarId(state);
         return success(result);
     }
+
+    @ApiOperation(value = "batchUpdateConsigneeRole")
+    @PostMapping("batchUpdateConsigneeRole")
+    public RESTfulResult batchUpdateConsigneeRole() {
+        int i = rmsConsigneeService.batchUpdateConsigneeRole();
+        return success(i);
+    }
+
 }

+ 47 - 0
src/main/java/com/steerinfo/dil/feign/SSOFeign.java

@@ -0,0 +1,47 @@
+package com.steerinfo.dil.feign;
+
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author HUJIANGUO
+ * @create 2021-11-10 11:30
+ */
+@FeignClient(value = "logistic",url = "https://wl.dasteel.cn:32322")
+public interface SSOFeign {
+
+    @PostMapping("/icore.icp.web/pass/v1/sysusers/")
+    Map<String,Object> addUser(@RequestHeader("Authorization") String token,
+//            @HeaderMap Map<String,Object> headerMap,
+                               @RequestParam String userCode,
+                               @RequestParam String userName,
+                               @RequestParam String orgCode,
+                               @RequestParam String orgName,
+                               @RequestParam String groupId,
+                               @RequestParam String companyId,
+                               @RequestParam String orgId);
+
+    @PostMapping("/icore.icp.web/pass/v1/sysuserroles/")
+    Map<String,Object> addUserroles(@RequestHeader("Authorization") String token,
+                                    @RequestParam String userId,
+                                    @RequestParam String userCode,
+                                    @RequestParam String roleId);
+
+    @PostMapping("/icore.icp.web/pass/auth/login")
+    Map<String,Object> login(@RequestParam String loginName,
+                             @RequestParam String password);
+
+    @DeleteMapping("/icore.icp.web/pass/v1/sysuserroles/{userId}")
+    Map<String,Object> sysuserrole(@RequestHeader("Authorization") String token,
+                                   @PathVariable(name = "userId") String userId);
+
+    @GetMapping("/icore.icp.web/pass/v1/sysuserroles/")
+    Map<String,Object> getSysuserrole(@RequestHeader("Authorization") String token,
+                                      @RequestParam("userId") String userId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize);
+
+}

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java

@@ -21,4 +21,7 @@ public interface RmsConsigneeMapper extends IBaseMapper<RmsConsignee, BigDecimal
     BigDecimal getConsigneeByCompanyName(String companyName);
 
     List<Map<String, Object>> getConsigneeFarId(String state);
+
+    List<Map<String, Object>> getConsigeeListSso();
+
 }

+ 2 - 0
src/main/java/com/steerinfo/dil/service/IRmsConsigneeService.java

@@ -36,4 +36,6 @@ public interface IRmsConsigneeService{
     List<Map<String, Object>> getConsigneeFarId(String state);
 
     int signConsignee(Map<String, Object> mapVal);
+
+    int batchUpdateConsigneeRole();
 }

+ 31 - 1
src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.SSOFeign;
 import com.steerinfo.dil.mapper.RmsConsigneeMapper;
 import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsConsignee;
@@ -7,8 +8,10 @@ import com.steerinfo.dil.service.IRmsConsigneeService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
@@ -38,7 +41,9 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
     @Autowired
     private RmsConsigneeMapper rmsConsigneeMapper;
 
-    
+    @Autowired
+    private SSOFeign ssoFeign;
+
     @Override
     public List<Map<String, Object>> getConsigneeList(Map<String, Object> mapValue) {
         return rmsConsigneeMapper.getConsigneeList(mapValue);
@@ -190,4 +195,29 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         return rmsConsigneeMapper.getConsigneeFarId(state);
     }
 
+    @Override
+    public int batchUpdateConsigneeRole() {
+        List<Map<String,Object>> mapList = rmsConsigneeMapper.getConsigeeListSso();
+        Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
+        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
+        String token = (String) data.get("accessToken");
+        for (Map<String, Object> stringObjectMap : mapList) {
+            if(stringObjectMap.get("userId") != null) {
+                String userId = stringObjectMap.get("userId").toString();
+                String consigneeCompanyName = stringObjectMap.get("userCode").toString();
+                if(userId != null) {
+                    System.out.println(stringObjectMap);
+                    Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
+                    Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
+                    String userRoleId = userRoleMap.get("userRoleId").toString();
+                    Map<String,Object> resultMap = ssoFeign.sysuserrole("Bearer " + token, userId);
+                    System.out.println(resultMap);
+                    Map<String,Object> resultMap1 = ssoFeign.addUserroles("Bearer " + token,userId, consigneeCompanyName, "1054405653877100544");
+                    System.out.println(resultMap1);
+                }
+            }
+
+        }
+        return 1;
+    }
 }

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -918,7 +918,7 @@
   <update id="updatecapacityTel">
      update RMS_CAPACITY RC
      set RC.CAPACITY_TEL=#{capacityTel},
-         RC.CAPACITY_VIP=#{capacityVip}
+         RC.CAPACITY_VIP=#{capacityVip},RC.CAPACITY_GPS=#{capacityGps}
      where RC.CAPACITY_NUMBER=#{capacityNumber} and
            CARRIER_ID in (select RC.CARRIER_ID FROM  RMS_CAPACITY_CARRIER RCC
                           LEFT JOIN RMS_CAPACITY RC

+ 4 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml

@@ -795,4 +795,8 @@
     where RC.CONSIGNEE_FAR_ID=RC.CONSIGNEE_ID
       and RC.CONSIGNEE_COMPANY_NAME like #{state}
   </select>
+    <select id="getConsigeeListSso" resultType="java.util.Map">
+      SELECT RC.CONSIGNEE_SSO_ID "userId", RC.CONSIGNEE_COMPANY_NAME "userCode" FROM RMS_CONSIGNEE RC
+      WHERE RC.CONSIGNEE_SETTLEMENT_METHOD = '一票制'
+    </select>
 </mapper>