1

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

@@ -121,14 +121,11 @@ public class ExcelServiceImpl implements IExcelService {
                 }
                 String snCode = map.get(0);
                 String outTypeString = map.get(1);
-                String companyName = map.get(2);
-                String orderSn = map.get(3);
-                String agentName = map.get(4);
-                String buyDate = map.get(5);
+                String buyDate = map.get(2);
                 CameraOutTypeEnum outTypeEnum = CameraOutTypeEnum.getByMsg(outTypeString);
                 if(outTypeEnum == null || StringUtils.isBlank(snCode) || StringUtils.isBlank(buyDate)){
-                    log.error("outError-->出库错误:出库类型为空或snCode为空:snCode:{},outType:{},companyName:{},orderSn:{},agentName:{}"
-                            ,snCode,outTypeString,companyName,orderSn,agentName);
+                    log.error("outError-->出库错误:出库类型为空或snCode为空:snCode:{},outType:{}"
+                            ,snCode,outTypeString);
                     errorIndex.add(index -3);
                 }
                 CameraInOutParam param = new CameraInOutParam();
@@ -137,18 +134,6 @@ public class ExcelServiceImpl implements IExcelService {
                     param.setOutType(outType);
                 }
                 param.setBuyDate(buyDate);
-                if(StringUtils.isNotBlank(agentName)){
-                    AgentNew agentNew = agentNewService.getByName(agentName);
-                    if(agentNew == null){
-                        log.error("outError-->出库错误:代理商不存在:snCode:{},outType:{},companyName:{},orderSn:{},agentName:{}"
-                                ,snCode,outTypeString,companyName,orderSn,agentName);
-                        errorIndex.add(index -3);
-                    }else {
-                        param.setAgentId(agentNew.getId());
-                    }
-                }
-                param.setCompanyName(companyName);
-                param.setOrderSn(orderSn);
                 param.setSnCode(snCode);
                 params.add(param);
             }else if(type == 2){   //关联客户

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

@@ -264,21 +264,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
         for (SceneVo record : page.getRecords()) {
-            if(record.getStatus() !=0 ){
-                if(param.getType() == 2 || param.getType() == 6){
-                    JSONObject ssObj = ssSceneMap.get(record.getNum());
-                    if(ssObj!=null){
-                        record.setSceneName(ssObj.getString("title"));
-                        record.setThumb(ssObj.getString("thumb"));
-                        record.setWebSite(ssObj.getString("webSite"));
-                        record.setIsObj(ssObj.getInteger("buildObjStatus"));
-                        record.setViewCount(ssObj.getInteger("viewCount"));
-                        record.setStatus(toFdStatus(ssObj.getInteger("status")));
-                        record.setAlgorithmTime(ssObj.getString("algorithmTime"));
-                    }else{
-                        record.setStatus(-1);
-                        record.setWebSite(null);
-                    }
+            if(param.getType() == 2 || param.getType() == 6){
+                JSONObject ssObj = ssSceneMap.get(record.getNum());
+                if(ssObj!=null){
+                    record.setSceneName(ssObj.getString("title"));
+                    record.setThumb(ssObj.getString("thumb"));
+                    record.setWebSite(ssObj.getString("webSite"));
+                    record.setIsObj(ssObj.getInteger("buildObjStatus"));
+                    record.setViewCount(ssObj.getInteger("viewCount"));
+                    record.setStatus(toFdStatus(ssObj.getInteger("status")));
+                    record.setAlgorithmTime(ssObj.getString("algorithmTime"));
+                }else if(record.getStatus() != 0){
+                    record.setStatus(-1);
+                    record.setWebSite(null);
                 }
             }