Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java

@@ -20,7 +20,7 @@ public class DangerDto implements Serializable {
     /**
      * 隐患名称
      */
-    private String name;
+    private String dangerName;
 
     /**
      * 检查项记录id

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -154,7 +154,7 @@ public class AlertCalledController extends BaseController {
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             page = new Page<>(0, Long.MAX_VALUE);
         } else {
-            page.setCurrent(Long.parseLong(pageNum) * Long.parseLong(pageSize));
+            page.setCurrent( (Long.parseLong(pageNum) - 1) * Long.parseLong(pageSize));
             page.setSize(Long.parseLong(pageSize));
         }
         /*分页存在问题 修改分页参数 陈召 2021-09-22 结束*/

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESAlertCalledService.java

@@ -38,7 +38,6 @@ import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository;
  * @version $Id: ESAlertCalledService.java, v 0.1 2021年6月19日 下午5:12:01 gwb Exp $
  */
 @Service
-@DependsOn("liquibase")
 public class ESAlertCalledService {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerExportDataDto.java

@@ -15,7 +15,7 @@ public class HiddenDangerExportDataDto {
      * 隐患名称
      */
     @ExcelProperty(value = "隐患名称", index = 0)
-    private String name;
+    private String dangerName;
 
     /**
      * 检查项名称
@@ -64,7 +64,7 @@ public class HiddenDangerExportDataDto {
      * 状态
      */
     @ExcelProperty(value = "状态", index = 8)
-    private String stateName;
+    private String dangerStateName;
 
     /**
      * 隐患来源

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerImportDto.java

@@ -12,7 +12,7 @@ public class HiddenDangerImportDto {
      * 隐患名称
      */
     @Excel(name = "隐患名称", orderNum = "0")
-    private String name;
+    private String dangerName;
 
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerTemplateDto.java

@@ -19,7 +19,7 @@ public class HiddenDangerTemplateDto implements Serializable {
      * 隐患名称
      */
     @ExcelProperty(value = "隐患名称", index = 0)
-    private String name;
+    private String dangerName;
 
     /**
      * 检查项名称
@@ -75,7 +75,7 @@ public class HiddenDangerTemplateDto implements Serializable {
      */
     @ExcelIgnore
     @ExcelProperty(value = "状态", index = 8)
-    private String stateName;
+    private String dangerStateName;
 
     /**
      * 隐患来源

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -77,6 +77,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             exportDto.setCheckUserName(hiddenDangerDto != null ? hiddenDangerDto.getCheckUserName() : "");
             exportDto.setPointName(hiddenDangerDto != null ? hiddenDangerDto.getPointName() : "");
             exportDto.setInputItemName(hiddenDangerDto != null ? hiddenDangerDto.getInputItemName() : "");
+            exportDto.setDangerTypeName(hiddenDangerDto != null ? hiddenDangerDto.getDangerTypeName() : "");
             return exportDto;
         }).collect(Collectors.toList());
     }