Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/core/controller/BaseController.java

@@ -199,4 +199,12 @@ public class BaseController
     {
         return getLoginUser().getUsername();
     }
+
+    /**
+     * 获取用户ID
+     */
+    public String getUserId()
+    {
+        return getLoginUser().getUserId();
+    }
 }

base-common/src/main/java/com/ozs/common/utils/AppendUtils.java

@@ -0,0 +1,51 @@
+package com.ozs.common.utils;
+
+import org.springframework.util.ObjectUtils;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+
+/**
+ * @author Administrator
+ */
+public class AppendUtils {
+    public static String stringAppend(Integer number) {
+        String s = null;
+        int i = 0;
+        if (number > 1000) {
+            BigDecimal e = new BigDecimal(number);
+            BigDecimal f = new BigDecimal(1000);
+            BigDecimal divide = e.divide(f);
+            String d = divide.toString();
+            String[] split = d.split("\\.");
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append("K" + split[0]);
+            if (split.length>1) {
+                stringBuilder.append("+");
+                for (char c : split[1].toCharArray()) {
+                    if (c == '0') {
+                        i++;
+                    }
+                }
+                String substring = split[1].substring(i);
+                stringBuilder.append(substring+"km");
+            }
+            return stringBuilder.toString();
+        } else {
+            return s = String.valueOf(number);
+        }
+    }
+
+    public static int stringSplit(String miles) {
+        String[] split = miles.split("\\+");
+        if (split.length>1) {
+            String substring1 = split[0].substring(1);
+            int number = Integer.parseInt(split[1]);
+            int integer = Integer.parseInt(substring1);
+            integer=integer*1000;
+            return integer + number;
+        }else {
+            return Integer.parseInt(miles);
+        }
+    }
+}

base-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.id = #{userId}
+		where u.id = #{id}
 	</select>
 
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">