【优化】库内供应商数据导入相关

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/service/impl/MonitorServiceImpl.java

@@ -69,7 +69,7 @@ public class MonitorServiceImpl implements MonitorService {
         }
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("user_id", monitorRulesDto.getUserId());
-        PushMonitorRules detail  = rulesMapper.selectOne(queryWrapper);
+        PushMonitorRules detail = rulesMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(detail)) {
             rulesMapper.insert(monitorRulesDto);
         } else {
@@ -87,7 +87,7 @@ public class MonitorServiceImpl implements MonitorService {
         }
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("user_id", detailVo.getUserId());
-        PushMonitorRules detail  = rulesMapper.selectOne(queryWrapper);
+        PushMonitorRules detail = rulesMapper.selectOne(queryWrapper);
         return R.ok(detail);
     }
 
@@ -99,14 +99,14 @@ public class MonitorServiceImpl implements MonitorService {
             pageVo.getCondition().setUserId(userId);
         }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/companyDynamicList", BeanUtil.beanToMap(pageVo, false, false));
-        log.info("companyDynamicPage=============================>"+map);
+        log.info("companyDynamicPage=============================>" + map);
         return dskOpenApiUtil.responsePageT(map);
     }
 
     @Override
     public Map<String, Object> companyDynamicPageScheduled(PushMonitorDynamicPageVo pageVo) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/company/info/companyDynamicList", BeanUtil.beanToMap(pageVo, false, false));
-        log.info("companyDynamicPage=============================>"+map);
+        log.info("companyDynamicPage=============================>" + map);
         return map;
     }
 
@@ -183,10 +183,10 @@ public class MonitorServiceImpl implements MonitorService {
             }
 
             //如果文件不存在  则文件上传失败
-            if (file == null){
+            if (file == null) {
                 return R.fail("操作失敗，数据异常，請使用正确的模板");
             }
-            if (file.isEmpty()){
+            if (file.isEmpty()) {
                 return R.fail("操作失敗，数据异常，請使用正确的模板");
             }
 
@@ -197,14 +197,14 @@ public class MonitorServiceImpl implements MonitorService {
             //得到最后一行的行号
             int lastRowNum = sheet.getLastRowNum();
             //如果总行数小于等于2 （没有数据）提示数据异常
-            if ((lastRowNum) < 1){
+            if ((lastRowNum) < 1) {
                 return R.fail("未提供有效数据，请确认！");
             }
 
             //进行excel格式判定
             String name = sheet.getRow(2).getCell(0) + "";
             //只要其中一个不满足则格式有误
-            if (!"企业名称".equals(name)){
+            if (!"企业名称".equals(name)) {
                 return R.fail("操作失败，数据异常，请使用正确的模板");
             }
             //行列皆从0开始
@@ -219,7 +219,7 @@ public class MonitorServiceImpl implements MonitorService {
                 companyList.add(companyNameStr);
             }
         } catch (Exception e) {
-            log.error("",e.getMessage());
+            log.error("", e.getMessage());
         } finally {
             RedisUtils.hasValueDelete(lockKey, value);
         }
@@ -261,6 +261,9 @@ public class MonitorServiceImpl implements MonitorService {
             case "新增开庭公告":
                 map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/kaiTingDetail", BeanUtil.beanToMap(cancelVo, false, false));
                 break;
+            case "行政处罚":
+                map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/xingZhengDetail", BeanUtil.beanToMap(cancelVo, false, false));
+                break;
             default:
                 break;
         }
@@ -289,25 +292,25 @@ public class MonitorServiceImpl implements MonitorService {
         String dimensionName = detailVo.getDimensionName();
         switch (dimensionName) {
             case "新增经营异常":
-                detailVo = new PushMonitorSystemDetailVo(value1, null, null,value2);
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null, value2);
                 break;
             case "新增股权冻结":
-                detailVo = new PushMonitorSystemDetailVo(value1, value2, null,null);
+                detailVo = new PushMonitorSystemDetailVo(value1, value2, null, null);
                 break;
             case "新增被执行人":
-                detailVo = new PushMonitorSystemDetailVo(value1, null, null,null);
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null, null);
                 break;
             case "新增失信被执行人":
-                detailVo = new PushMonitorSystemDetailVo(value1, null, null,null);
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null, null);
                 break;
             case "新增法院公告":
-                detailVo = new PushMonitorSystemDetailVo(value1, null, null,value2);
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null, value2);
                 break;
             case "新增裁判文书":
-                detailVo = new PushMonitorSystemDetailVo(value1, null, null,value2);
+                detailVo = new PushMonitorSystemDetailVo(value1, null, null, value2);
                 break;
             case "新增开庭公告":
-                detailVo = new PushMonitorSystemDetailVo(value1, null, value2,null);
+                detailVo = new PushMonitorSystemDetailVo(value1, null, value2, null);
                 break;
             default:
                 break;
@@ -318,7 +321,7 @@ public class MonitorServiceImpl implements MonitorService {
     @Override
     public Map<String, Object> settingHoliday(PushSettingHolidayVo holidayVo) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/monitor/push/settingHoliday", BeanUtil.beanToMap(holidayVo, false, false));
-        log.info("companyDynamicPage=============================>"+map);
+        log.info("companyDynamicPage=============================>" + map);
         return map;
     }
 }