Merge remote-tracking branch 'origin/test' into projects/gouli

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -94,6 +94,7 @@ public enum ResultCode  {
     CAN_NOT_DEL_MODELING_SCENE(50073, "计算中的场景无法删除"),
     RTK_SN_EXIST(50074, "板卡SN码已存在"),
     CAMERA_SN_EXIST(50075, "相机SN码已存在"),
+    LASER_VIEW_ERROR(50076, "激光系统访问失败"),
 
 
     ;

src/main/java/com/fdkankan/manage/entity/RtkInfo.java

@@ -66,6 +66,11 @@ public class RtkInfo implements Serializable {
     @TableField("camera_sn_code")
     private String cameraSnCode;
     /**
+     * 深光rtk插件sn
+     */
+    @TableField("sg_rtk_sn")
+    private String sgRtkSn;
+    /**
      * 运营商
      */
     @TableField(value ="operator",updateStrategy = FieldStrategy.IGNORED )

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -418,17 +418,23 @@ public class LaserService {
 
     public HashMap<String, JSONObject> list(LaserSceneParam newParam) {
         HashMap<String, JSONObject> map = new HashMap<>();
-        FdkkResponse fdkkResponse = laserClient.sceneList(newParam);
-        JSONObject jsonObject = fdkkResponse.getData();
-        if(jsonObject == null){
-            return map;
-        }
-        JSONArray list = jsonObject.getJSONArray("list");
+        try {
+            FdkkResponse fdkkResponse = laserClient.sceneList(newParam);
+            JSONObject jsonObject = fdkkResponse.getData();
+            if(jsonObject == null){
+                return map;
+            }
+            JSONArray list = jsonObject.getJSONArray("list");
 
-        for (Object o : list) {
-            JSONObject obj = (JSONObject) o;
-            map.put(obj.getString("num"),obj);
+            for (Object o : list) {
+                JSONObject obj = (JSONObject) o;
+                map.put(obj.getString("num"),obj);
+            }
+        }catch (Exception e){
+            log.info("激光系统访问失败：{}",e);
+            throw new BusinessException(ResultCode.LASER_VIEW_ERROR);
         }
+
         return map;
     }
 }

src/main/java/com/fdkankan/manage/service/impl/RtkInfoServiceImpl.java

@@ -60,6 +60,9 @@ public class RtkInfoServiceImpl extends ServiceImpl<IRtkInfoMapper, RtkInfo> imp
         if(StringUtils.isNotBlank(param.getCameraSnCode())){
             wrapper.like(RtkInfo::getCameraSnCode,param.getCameraSnCode());
         }
+        if(StringUtils.isNotBlank(param.getSgRtkSn())){
+            wrapper.like(RtkInfo::getSgRtkSn,param.getSgRtkSn());
+        }
         if(StringUtils.isNotBlank(param.getStartTime())&& StringUtils.isNotBlank(param.getEndTime()) ) {
             wrapper.between(RtkInfo::getCreateTime,param.getStartTime(),param.getEndTime());
         }

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -186,7 +186,6 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         }
         IncrementOrderMg incrementOrderMg = iIncrementOrderMgService.addOrder(param, incrementType);
 
-
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
             String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
@@ -230,6 +229,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
             Set<Long> ids = userIncrementList.stream().map(UserIncrement::getId).collect(Collectors.toSet());
             List<UserIncrement> userIncrements = this.listByIds(ids);
+            for (UserIncrement userIncrement : userIncrements) {
+                agentNewLogService.addByUserIncrement(userIncrement);
+            }
             Set<Long> cameraIds = userIncrements.stream().map(UserIncrement::getCameraId).filter(Objects::nonNull).collect(Collectors.toSet());
             for (Long cameraId : cameraIds) {
                 if(cameraId != null){

src/main/java/com/fdkankan/manage/vo/request/RtkInfoParam.java

@@ -11,6 +11,7 @@ public class RtkInfoParam extends RequestBase{
     private String userName;
     private String operator;
     private String cameraSnCode;
+    private String sgRtkSn;
 
     private List<String> timeList;