专家等级

lift-ud-service/src/main/java/cn/com/ty/lift/ud/motiontrail/service/impl/MotionTrailServiceImpl.java

@@ -52,7 +52,7 @@ public class MotionTrailServiceImpl extends ServiceImpl<MotionTrailMapper, Motio
         if (null == request.getCreateTime()) {
             return RestResponse.fail("查询时间不能为空");
         }
-        if (null == request.getMobile()) {
+        if (null == request.getMobile() && request.getUserId() == null) {
             return RestResponse.fail("维保工不能为空");
         }
         /*if (null == request.getMtCompanyId()) {
@@ -73,7 +73,7 @@ public class MotionTrailServiceImpl extends ServiceImpl<MotionTrailMapper, Motio
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         list.forEach(item -> {
             String[] split = item.getPosition().split(",");
-            List<Double> mark = Arrays.asList(Double.parseDouble(split[0]), Double.parseDouble(split[1]));
+            List<Double> mark = Arrays.asList(Double.parseDouble(split[1]), Double.parseDouble(split[0]));
             polylines.add(mark);
 
             Map temp = new HashMap();
@@ -115,6 +115,22 @@ public class MotionTrailServiceImpl extends ServiceImpl<MotionTrailMapper, Motio
             UserInfoEntity byUserId = userInfoMapper.getByUserId(mt.getUserId());
             mt.setUserInfo(byUserId);
         }
-        return RestResponse.success(queryTrailByTeam);
+        Map<String, List> rst = new HashMap<>();
+        List polylines = new ArrayList();
+        List texts = new ArrayList();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        queryTrailByTeam.forEach(item -> {
+            String[] split = item.getPosition().split(",");
+            List<Double> mark = Arrays.asList(Double.parseDouble(split[1]), Double.parseDouble(split[0]));
+            polylines.add(mark);
+
+            Map temp = new HashMap();
+            temp.put("position", mark);
+            temp.put("text", sdf.format(item.getCreateTime()));
+            texts.add(temp);
+        });
+        rst.put("polylines", polylines);
+        rst.put("texts", texts);
+        return RestResponse.success(rst);
     }
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/schoolVideo/service/impl/SchoolVideoServiceImpl.java

@@ -46,12 +46,12 @@ public class SchoolVideoServiceImpl extends ServiceImpl<SchoolVideoMapper, Schoo
     public RestResponse examineById(SchoolVideoEntity neDto) {
         if (neDto.getCheckFlag() == 1) {
             schoolVideoMapper.examineById(neDto.getId());
-            return RestResponse.success( "审批通过");
+            return RestResponse.success("审批通过");
         } else {
             // 修改状态为 驳回，并加上驳回理由
             schoolVideoMapper.updateInfoById(neDto.getId(), neDto.getCheckComment());
             // todo 发送消息给该用户
-            return RestResponse.fail( "审批驳回");
+            return RestResponse.fail("审批驳回");
         }
     }
 
@@ -74,10 +74,12 @@ public class SchoolVideoServiceImpl extends ServiceImpl<SchoolVideoMapper, Schoo
     public RestResponse selectByExample(SchoolVideoQuery query) {
         IPage page = query.page();
         List<SchoolVideoEntity> list = schoolVideoMapper.selectByQuery(query.condition(), query);
-        if(ListUtil.isNotEmpty(list)){
+        if (ListUtil.isNotEmpty(list)) {
             for (SchoolVideoEntity st : list) {
                 LiftBrandEntity byId = liftBrandMapper.selectById(st.getBrandId());
-                st.setBrandName(byId.getName());
+                if (byId != null) {
+                    st.setBrandName(byId.getName());
+                }
             }
         }
         int total = schoolVideoMapper.countByQuery(query.condition());

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/impl/UserInfoServiceImpl.java

@@ -160,7 +160,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
             ScoreInfo scoreInfo = iExpertCommentService.getScoreByExpertId(userInfo.getUserId());
             if(null != scoreInfo){
                 //计算平均分，向上取整
-                int averageScore = (int)Math.ceil(scoreInfo.getTotalScore()/scoreInfo.getNum());
+                int averageScore = (int)Math.ceil((double)scoreInfo.getTotalScore()/scoreInfo.getNum());
                 userInfo.setAverageScore(averageScore);
             }else{
                 userInfo.setAverageScore(0);
@@ -278,7 +278,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
                 ScoreInfo scoreInfo = iExpertCommentService.getScoreByExpertId(user.getUserId());
                 if(null != scoreInfo){
                     //计算平均分，向上取整
-                    int averageScore = (int)Math.ceil(scoreInfo.getTotalScore()/scoreInfo.getNum());
+                    int averageScore = (int)Math.ceil((double)scoreInfo.getTotalScore()/scoreInfo.getNum());
                     user.setAverageScore(averageScore);
                 }else{
                     user.setAverageScore(0);
@@ -1074,5 +1074,5 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
         userInfoMapper.rechargePayBalance(userId, money);
         return RestResponse.success();
     }
-
+    
 }