Merge branches 'develop' and 'wanghaicheng' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/SignInService.java

@@ -11,6 +11,7 @@ import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.verify.VerifyUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -64,6 +65,9 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
      * @date 2020/4/20 9:29 下午
      */
     public RestResponse signIn(CapitalRepairRequest request) {
+        boolean ret = VerifyUtils.preJudgment(request.getCoordinate());
+        if (!ret)
+            return RestResponse.fail(MessageUtils.get("msg.longitude.error"));
         SignIn oldSignIn = getOne(request.getMtCompanyId(), request.getProjectId(), request.getUserId());
         if (ObjectUtil.isNotEmpty(oldSignIn)) {
             String approachTime = oldSignIn.getApproachTime();

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -30,6 +30,7 @@ import cn.com.ty.lift.common.model.PushUserInfo;
 import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.ty.lift.common.utils.SendMessageUtil;
 import cn.com.ty.lift.common.verify.Validate;
+import cn.com.ty.lift.common.verify.VerifyUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
@@ -385,6 +386,12 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         Optional<Lift> oldLift = getOne(null, lift.getId());
         if (!oldLift.isPresent())
             return RestResponse.fail(MessageUtils.get("msg.lift.not.exist"));
+        String coordinate = lift.getCoordinate();
+        if (Objects.nonNull(coordinate)) {
+            boolean ret = VerifyUtils.preJudgment(coordinate);
+            if (!ret)
+                return RestResponse.fail(MessageUtils.get("msg.longitude.error"));
+        }
         boolean result = updateById(lift);
         if (!result)
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));

lift-business-service/src/main/resources/locale/response.properties

@@ -34,4 +34,5 @@ msg.record.not.exist=\u4FDD\u517B\u5355\u4E0D\u5B58\u5728
 msg.lift.not.exist=\u7535\u68AF\u4E0D\u5B58\u5728
 msg.project.not.exist=\u9879\u76EE\u4E0D\u5B58\u5728
 msg.contract.not.exist=\u5408\u540C\u4E0D\u5B58\u5728
-msg.capital.not.sign.record=\u8BE5\u9879\u76EE\u8FD8\u6CA1\u6709\u7B7E\u5230\u8BB0\u5F55
+msg.capital.not.sign.record=\u8BE5\u9879\u76EE\u8FD8\u6CA1\u6709\u7B7E\u5230\u8BB0\u5F55
+msg.longitude.error=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u7ECF\u7EAC\u5EA6

lift-common/src/main/java/cn.com.ty.lift.common/verify/VerifyUtils.java

@@ -0,0 +1,31 @@
+package cn.com.ty.lift.common.verify;
+
+import java.util.regex.Pattern;
+
+/**
+ * @author bieao
+ * @date 2020/5/11
+ * @description 验证类
+ */
+public class VerifyUtils {
+
+    /**
+     * @param coordinate 经纬度
+     * @return 是否为经纬度
+     * @description 验证经纬度
+     * @date 2020/5/11 10:19 上午
+     */
+    public static boolean preJudgment(String coordinate) {
+        String[] split = coordinate.split(",");
+        if (split.length < 2) return false;
+        String longitude = split[0];
+        String latitude = split[1];
+        //经度： -180.0～+180.0（整数部分为0～180，必须输入1到8位小数）
+        String longitudePattern = "^[\\-\\+]?(0?\\d{1,2}\\.\\d{1,8}|1[0-7]?\\d{1}\\.\\d{1,8}|180\\.0{1,8})$";
+        //纬度： -90.0～+90.0（整数部分为0～90，必须输入1到8位小数）
+        String latitudePattern = "^[\\-\\+]?([0-8]?\\d{1}\\.\\d{1,8}|90\\.0{1,8})$";
+        boolean longitudeMatch = Pattern.matches(longitudePattern, longitude);
+        boolean latitudeMatch = Pattern.matches(latitudePattern, latitude);
+        return longitudeMatch && latitudeMatch;
+    }
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -6,6 +6,7 @@ import cn.com.ty.lift.common.utils.ValuePool;
 import cn.com.ty.lift.common.verify.Val;
 import cn.com.ty.lift.common.verify.Validate;
 import cn.com.ty.lift.common.verify.Validation;
+import cn.com.ty.lift.common.verify.VerifyUtils;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceRequest;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceResponse;
 import cn.com.ty.lift.enterprise.oa.entity.Attendance;
@@ -184,6 +185,10 @@ public class AttendanceController {
      */
     @PostMapping("clock")
     public RestResponse clock(@Valid @RequestBody Attendance entity) {
+        String coordinate = entity.getCoordinate();
+        boolean ret = VerifyUtils.preJudgment(coordinate);
+        if (!ret)
+            return RestResponse.fail("请输入正确的经纬度");
         Long mtCompanyId = entity.getMtCompanyId();
         Long userId = entity.getUserId();
         Integer type = entity.getType();

lift-upload/src/main/java/com/upload/controller/SystemConfiguration.java

@@ -1,7 +1,6 @@
 package com.upload.controller;
 
 import cn.com.ty.lift.common.aliservice.aliyunoss.AliyunOSS;
-import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.sql.SqlAnalysisInterceptor;
 import cn.com.ty.lift.common.sql.SqlIllegalInterceptor;
 import cn.com.ty.lift.common.verify.Validation;
@@ -135,11 +134,6 @@ public class SystemConfiguration {
         return sqlExplainInterceptor;
     }
 
-    @Bean
-    public ExportUtils exportUtils() {
-        return new ExportUtils();
-    }
-
     /**
      * 方法参数校验拦截器,标注了@Verifier的方法，会检查参数，如果参数不满足条件，直接抛出异常
      */