Merge branch 'master' of https://git.steerinfo.com/caol/jg_wzjl_api.git

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/controller/MeterBaseCarBlacelistController.java

@@ -85,7 +85,9 @@ public class MeterBaseCarBlacelistController extends BaseRESTfulController {
     public RESTfulResult add(@RequestBody MeterBaseCarBlacelist model) {
         try {
             String msg = meterBaseCarBlacelistService.checkandadd(model);
+            System.out.println(msg);
             if (StringUtils.isNotEmpty(msg)) {
+//       msg != null && !msg.equals("")
                 return failed(null, msg);
             }
         } catch (Exception e) {

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/service/impl/MeterBaseCarBlacelistServiceImpl.java

@@ -161,15 +161,15 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
         if (StringUtils.isEmpty(model.getCarOwnerName())){
             return "车主不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getPunishTypeNo())){
-            return "违规类型编号不能为空！！";
-        }
+//        if (StringUtils.isEmpty(model.getPunishTypeNo())){
+//            return "违规类型编号不能为空！！";
+//        }
         if (StringUtils.isEmpty(model.getPunishTypeName())){
             return "违规类型名称不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getBlackLevelNo())){
-            return "黑名单级别编码不能为空！！";
-        }
+//        if (StringUtils.isEmpty(model.getBlackLevelNo())){
+//            return "黑名单级别编码不能为空！！";
+//        }
         if (StringUtils.isEmpty(model.getBlackLevelName())){
             return "黑名单级别名称不能为空！！";
         }

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/mapper/MeterBaseUnitDirectMapper.java

@@ -8,12 +8,13 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface MeterBaseUnitDirectMapper extends IBaseMapper<MeterBaseUnitDirect, String> {
     String GetNewID();
 
-    List<MeterBaseUnitDirect> selectForUpdate(Map<String, Object> parameters);
+    List<MeterBaseUnitDirect> selectForUpdate(@Param("params") Map<String, Object> parameters);
 
     void deleteBatches(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/util/HttpsRequest.java

@@ -432,4 +432,80 @@ public class HttpsRequest {
         }
         return result.toString();
     }
+
+    /**
+     * 向指定 URL 发送GET方法的请求
+     *
+     * @param url
+     *            发送请求的 URL
+     * @return 所代表远程资源的响应结果
+     */
+    public static String sendGET(String url, String token) {
+        OutputStreamWriter out = null;
+        BufferedReader in = null;
+        StringBuilder result = new StringBuilder();
+        try {
+
+            // 创建SSLContext对象，并使用我们指定的信任管理器初始化
+            TrustManager[] tm = { new MyX509TrustManager() };
+            SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, tm, new java.security.SecureRandom());
+
+            // 从上述SSLContext对象中得到SSLSocketFactory对象
+            SSLSocketFactory ssf = sslContext.getSocketFactory();
+
+            // 打开和URL之间的连接
+            URL realUrl = new URL(url);
+            HttpsURLConnection conn = (HttpsURLConnection) realUrl.openConnection();
+            conn.setSSLSocketFactory(ssf);
+
+            // POST方法
+            conn.setRequestMethod("GET");
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent",
+                    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            conn.setRequestProperty("Content-Type",
+                    "application/json;charset=UTF-8");
+            conn.setRequestProperty("authorization",
+                    "Bearer " + token);
+            conn.connect();
+
+
+            // 获取URLConnection对象对应的输出流
+            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(new InputStreamReader(
+                    conn.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+            System.out.println("-----result-----"+result);
+        } catch (Exception e) {
+            System.out.println("发送 GET 请求出现异常！"+e);
+            e.printStackTrace();
+        }
+        //使用finally块来关闭输出流、输入流
+        finally{
+            try{
+                if(out!=null){
+                    out.close();
+                }
+                if(in!=null){
+                    in.close();
+                }
+            }
+            catch(IOException ex){
+                ex.printStackTrace();
+            }
+        }
+        return result.toString();
+    }
 }

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

@@ -300,4 +300,26 @@ public class SSOUtil {
 
         return msg;
     }
+
+//    /**
+//     * sso重置密码
+//     * @param carNo
+//     * @return
+//     */
+//    public HashMap ssoSelect(String carNo) throws Exception {
+//
+//        String ssoUrl = Configuration.readConfigString("sso.url", "application");
+//
+//        String accessToken = ssoDefaultLogin();
+//
+//        String ssomsg = HttpsRequest.sendPut(ssoUrl + "/v1/sysusers/getUsersByOrgCode/?userCode="+carNo+"&pageNum=1&pageSize=20", null, accessToken);
+//
+//        JSONObject jsonObject = JSONObject.parseObject(ssomsg);
+//
+//        HashMap<String, String> map = new HashMap<>();
+//        map.put("code", "0");
+//        map.put("data", jsonObject.get("data").toString());
+//
+//        return map;
+//    }
 }