Browse Source

Merge branch 'dev-wgk' of www/als into master

www 6 months ago
parent
commit
d31dbca6b6

+ 22 - 10
als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultCaseController.java

@@ -4,6 +4,13 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import cn.hutool.core.collection.CollUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.easyes.core.biz.EsPageInfo;
+import org.eco.als.domain.FaultCase;
+import org.eco.als.domain.vo.AirConfigurationImportVo;
+import org.eco.als.domain.vo.AirConfigurationVo;
+import org.eco.als.listener.AirConfigurationImportListener;
+import org.eco.als.listener.FaultCaseImportListener;
+import org.eco.common.excel.core.ExcelResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.eco.common.core.core.domain.CommonResult;
@@ -22,6 +29,7 @@ import org.eco.als.service.IFaultCaseService;
 import org.springframework.web.multipart.MultipartFile;
 import org.eco.common.core.core.page.PageResult;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.ArrayList;
 
@@ -48,20 +56,24 @@ public class FaultCaseController extends BaseController {
         return CommonResult.success(faultCaseService.selectPage(faultCaseBo));
     }
 
+    /**
+     * 查询故障案例列表
+     */
+    @SaCheckPermission("als:faultCase:list")
+    @GetMapping("/esList")
+    public CommonResult<EsPageInfo<FaultCase>> esList(FaultCaseBo faultCaseBo) {
+        return CommonResult.success(faultCaseService.selectEsPage(faultCaseBo));
+    }
+
     /**
      * 导出故障案例列表
      */
     @SaCheckPermission("als:faultCase:export")
     @Log(title = "故障案例", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public CommonResult<Void> export(FaultCaseBo faultCaseBo) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
+    public void export(HttpServletResponse response, FaultCaseBo faultCaseBo) {
         List<FaultCaseVo> list = faultCaseService.selectList(faultCaseBo);
-        if (CollUtil.isEmpty(list)) {
-            return CommonResult.fail("导出列表为空");
-        }
-        faultCaseService.asyncExport(list, "故障案例", loginUser);
-        return CommonResult.success();
+        ExcelUtil.exportExcel(list, "飞机构型", FaultCaseVo.class, response);
     }
 
     @SaCheckPermission("als:faultCase:import")
@@ -76,10 +88,10 @@ public class FaultCaseController extends BaseController {
     @Log(title = "故障案例", businessType = BusinessType.IMPORT)
     @SaCheckPermission("als:faultCase:import")
     @PostMapping("/importData")
-    public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
+    public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) throws IOException {
         LoginUser loginUser = LoginHelper.getLoginUser();
-        faultCaseService.asyncImportData(file, updateSupport, loginUser);
-        return CommonResult.success();
+        ExcelResult<FaultCaseImportVo> result = ExcelUtil.importExcel(file.getInputStream(), FaultCaseImportVo.class, new FaultCaseImportListener(updateSupport, loginUser));
+        return CommonResult.success(result.getAnalysis().getLogInfo());
     }
 
     /**

+ 41 - 10
als-modules/agile-assurance/src/main/java/org/eco/als/domain/FaultCase.java

@@ -2,12 +2,10 @@ package org.eco.als.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serial;
-import java.util.Date;
 import org.dromara.easyes.annotation.HighLight;
 import org.dromara.easyes.annotation.IndexField;
 import org.dromara.easyes.annotation.IndexId;
@@ -16,7 +14,10 @@ import org.dromara.easyes.annotation.rely.Analyzer;
 import org.dromara.easyes.annotation.rely.FieldStrategy;
 import org.dromara.easyes.annotation.rely.FieldType;
 import org.dromara.easyes.annotation.rely.IdType;
-import org.eco.common.orm.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 故障案例对象 als_fault_case_t
@@ -25,10 +26,9 @@ import org.eco.common.orm.core.domain.BaseEntity;
  * @date 2024-11-14
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Table(value = "als_fault_case_t")
 @IndexName("fault_case_index")
-public class FaultCase extends BaseEntity {
+public class FaultCase implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
@@ -76,16 +76,24 @@ public class FaultCase extends BaseEntity {
     /**
      * 故障现象
      */
-    @ExcelProperty(value = "故障现象")
     @IndexField(value = "pContent", fieldType = FieldType.TEXT, strategy = FieldStrategy.NOT_EMPTY,
         analyzer = Analyzer.IK_MAX_WORD, searchAnalyzer = Analyzer.IK_MAX_WORD)
-    @HighLight( preTag = "<font color=\"red\" >", postTag = "</font>")
+    @HighLight(preTag = "<font color=\"red\" >", postTag = "</font>")
     private String faultPhenomenon;
 
+    @ExcelProperty(value = "故障现象")
+    @Column(ignore = true)
+    @IndexField(exist = false)
+    private String pContent;
+
+    @ExcelProperty(value = "故障原因")
+    @Column(ignore = true)
+    @IndexField(exist = false)
+    private String fContent;
+
     /**
      * 故障原因
      */
-    @ExcelProperty(value = "故障原因")
     @IndexField(value = "fContent", fieldType = FieldType.TEXT, strategy = FieldStrategy.NOT_EMPTY,
         analyzer = Analyzer.IK_MAX_WORD, searchAnalyzer = Analyzer.IK_MAX_WORD)
     @HighLight(preTag = "<font color=\"red\" >", postTag = "</font>")
@@ -116,14 +124,37 @@ public class FaultCase extends BaseEntity {
     private String troubleshootingMethodPath;
 
 
-
     /**
      * 浏览次数
      */
     @ExcelProperty(value = "浏览次数")
     @IndexField(fieldType = FieldType.LONG, strategy = FieldStrategy.NOT_EMPTY)
     private Long viewCount;
+    /**
+     * 创建者
+     */
+    @IndexField(fieldType = FieldType.TEXT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @IndexField(fieldType = FieldType.DATE, dateFormat = "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis")
+    private Date createTime;
 
+    /**
+     * 更新者
+     */
+    @IndexField(fieldType = FieldType.TEXT)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @IndexField(fieldType = FieldType.DATE, dateFormat = "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis")
+    private Date updateTime;
     private String orderBy;
 
 

+ 0 - 15
als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/FaultCaseBo.java

@@ -20,91 +20,76 @@ public class FaultCaseBo extends BaseEntity{
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空")
     private Long id;
 
     /**
      * 飞机编号
      */
-    @NotBlank(message = "飞机编号不能为空")
     private String aircraftTypeId;
 
     /**
      * 机型
      */
-    @NotBlank(message = "机型不能为空")
     private String aircraftTypeName;
 
     /**
      * 系统编号
      */
-    @NotBlank(message = "系统编号不能为空")
     private String aircraftSystemId;
 
     /**
      * 系统
      */
-    @NotBlank(message = "系统不能为空")
     private String aircraftSystemName;
 
     /**
      * 分系统编号
      */
-    @NotBlank(message = "分系统编号不能为空")
     private String aircraftSubsystemId;
 
     /**
      * 分系统
      */
-    @NotBlank(message = "分系统不能为空")
     private String aircraftSubsystemName;
 
     /**
      * 作者
      */
-    @NotBlank(message = "作者不能为空")
     private String author;
 
     /**
      * 故障现象
      */
-    @NotBlank(message = "故障现象不能为空")
     private String faultPhenomenon;
 
     /**
      * 故障原因
      */
-    @NotBlank(message = "故障原因不能为空")
     private String faultCause;
 
     /**
      * 故障树
      */
-    @NotBlank(message = "故障树不能为空")
     private String faultTreePath;
 
     /**
      * 故障图
      */
-    @NotBlank(message = "故障图不能为空")
     private String faultPicturePath;
 
     /**
      * 排故方法
      */
-    @NotBlank(message = "排故方法不能为空")
     private String troubleshootingMethodPath;
 
     /**
      * 查看次数
      */
-    @NotBlank(message = "查看次数不能为空")
     private String viewCount;
 
     /**
      * 排序
      */
-    @NotBlank(message = "排序不能为空")
     private String orderBy;
 
 

+ 3 - 21
als-modules/agile-assurance/src/main/java/org/eco/als/service/IFaultCaseService.java

@@ -1,6 +1,8 @@
 package org.eco.als.service;
 
 import java.util.List;
+
+import org.dromara.easyes.core.biz.EsPageInfo;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.als.domain.FaultCase;
 import org.eco.als.domain.vo.FaultCaseVo;
@@ -39,6 +41,7 @@ public interface IFaultCaseService extends IBaseService<FaultCase> {
      * @return 分页故障案例集合
      */
     PageResult<FaultCaseVo> selectPage(FaultCaseBo faultCaseBo);
+    EsPageInfo<FaultCase> selectEsPage(FaultCaseBo faultCaseBo);
 
     /**
      * 新增故障案例
@@ -71,25 +74,4 @@ public interface IFaultCaseService extends IBaseService<FaultCase> {
      * @return 结果:true 删除成功,false 删除失败
      */
     boolean deleteByIds(Long[] ids);
-
-    /**
-     * 异步导入
-     *
-     * @param file          导入的文件
-     * @param updateSupport 是否覆盖
-     * @param user          用户上下文信息
-     */
-    @Async
-    void asyncImportData(MultipartFile file, boolean updateSupport, LoginUser user);
-
-    /**
-     * asyncExport 异步导出
-     *
-     * @param listVo    数据列表
-     * @param sheetName 文件名称
-     * @param user      上下文
-     */
-    @Async
-    void asyncExport(List<FaultCaseVo> listVo, String sheetName, LoginUser user);
-
 }

+ 73 - 68
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultCaseServiceImpl.java

@@ -1,35 +1,37 @@
 package org.eco.als.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.easyes.core.biz.EsPageInfo;
+import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper;
+import org.eco.als.domain.FaultCase;
+import org.eco.als.domain.bo.FaultCaseBo;
+import org.eco.als.domain.vo.FaultCaseImportVo;
+import org.eco.als.domain.vo.FaultCaseVo;
+import org.eco.als.es.mapper.EsFaultCaseMapper;
+import org.eco.als.listener.FaultCaseImportListener;
+import org.eco.als.mapper.FaultCaseMapper;
+import org.eco.als.service.IFaultCaseService;
 import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.utils.MapstructUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.excel.service.IExcelService;
-import org.eco.common.core.utils.bean.BeanUtils;
-import org.eco.common.core.utils.MapstructUtils;
-import org.eco.system.service.IImportExportService;
-import org.eco.common.core.utils.StringUtils;
-import org.eco.system.domain.bo.ImportExportBo;
 import org.eco.common.orm.core.page.PageQuery;
-import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import jakarta.annotation.Resource;
+import org.eco.system.service.IImportExportService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
-import org.eco.als.mapper.FaultCaseMapper;
-import org.eco.als.domain.FaultCase;
-import org.eco.als.domain.bo.FaultCaseBo;
-import org.eco.als.domain.vo.FaultCaseVo;
-import org.eco.als.domain.vo.FaultCaseImportVo;
-import org.eco.als.listener.FaultCaseImportListener;
-import org.eco.als.service.IFaultCaseService;
+import java.util.Arrays;
+import java.util.List;
+
 import static org.eco.als.domain.table.FaultCaseTableDef.FAULT_CASE;
 
 /**
@@ -43,6 +45,8 @@ import static org.eco.als.domain.table.FaultCaseTableDef.FAULT_CASE;
 public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, FaultCase> implements IFaultCaseService {
     @Resource
     private FaultCaseMapper faultCaseMapper;
+    @Resource
+    private EsFaultCaseMapper esFaultCaseMapper;
 
     @Resource
     private IExcelService excelService;
@@ -58,33 +62,33 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
     private QueryWrapper buildQueryWrapper(FaultCaseBo faultCaseBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_CASE.AIRCRAFT_TYPE_ID.eq
-        (faultCaseBo.getAircraftTypeId()));
+            (faultCaseBo.getAircraftTypeId()));
         queryWrapper.and(FAULT_CASE.AIRCRAFT_TYPE_NAME.like
-        (faultCaseBo.getAircraftTypeName()));
+            (faultCaseBo.getAircraftTypeName()));
         queryWrapper.and(FAULT_CASE.AIRCRAFT_SYSTEM_ID.eq
-        (faultCaseBo.getAircraftSystemId()));
+            (faultCaseBo.getAircraftSystemId()));
         queryWrapper.and(FAULT_CASE.AIRCRAFT_SYSTEM_NAME.like
-        (faultCaseBo.getAircraftSystemName()));
+            (faultCaseBo.getAircraftSystemName()));
         queryWrapper.and(FAULT_CASE.AIRCRAFT_SUBSYSTEM_ID.eq
-        (faultCaseBo.getAircraftSubsystemId()));
+            (faultCaseBo.getAircraftSubsystemId()));
         queryWrapper.and(FAULT_CASE.AIRCRAFT_SUBSYSTEM_NAME.like
-        (faultCaseBo.getAircraftSubsystemName()));
+            (faultCaseBo.getAircraftSubsystemName()));
         queryWrapper.and(FAULT_CASE.AUTHOR.eq
-        (faultCaseBo.getAuthor()));
+            (faultCaseBo.getAuthor()));
         queryWrapper.and(FAULT_CASE.FAULT_PHENOMENON.eq
-        (faultCaseBo.getFaultPhenomenon()));
+            (faultCaseBo.getFaultPhenomenon()));
         queryWrapper.and(FAULT_CASE.FAULT_CAUSE.eq
-        (faultCaseBo.getFaultCause()));
+            (faultCaseBo.getFaultCause()));
         queryWrapper.and(FAULT_CASE.FAULT_TREE_PATH.eq
-        (faultCaseBo.getFaultTreePath()));
+            (faultCaseBo.getFaultTreePath()));
         queryWrapper.and(FAULT_CASE.FAULT_PICTURE_PATH.eq
-        (faultCaseBo.getFaultPicturePath()));
+            (faultCaseBo.getFaultPicturePath()));
         queryWrapper.and(FAULT_CASE.TROUBLESHOOTING_METHOD_PATH.eq
-        (faultCaseBo.getTroubleshootingMethodPath()));
+            (faultCaseBo.getTroubleshootingMethodPath()));
         queryWrapper.and(FAULT_CASE.VIEW_COUNT.eq
-        (faultCaseBo.getViewCount()));
+            (faultCaseBo.getViewCount()));
         queryWrapper.and(FAULT_CASE.ORDER_BY.eq
-        (faultCaseBo.getOrderBy()));
+            (faultCaseBo.getOrderBy()));
 
         return queryWrapper;
     }
@@ -97,7 +101,7 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      */
     @Override
     public FaultCaseVo selectById(Long id) {
-            return this.getOneAs(query().where(FAULT_CASE.ID.eq(id)), FaultCaseVo.class);
+        return this.getOneAs(query().where(FAULT_CASE.ID.eq(id)), FaultCaseVo.class);
 
     }
 
@@ -111,7 +115,7 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
     @Override
     public List<FaultCaseVo> selectList(FaultCaseBo faultCaseBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(faultCaseBo);
-            return this.listAs(queryWrapper, FaultCaseVo.class);
+        return this.listAs(queryWrapper, FaultCaseVo.class);
     }
 
     /**
@@ -122,11 +126,36 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      */
     @Override
     public PageResult<FaultCaseVo> selectPage(FaultCaseBo faultCaseBo) {
+
         QueryWrapper queryWrapper = buildQueryWrapper(faultCaseBo);
-            Page<FaultCaseVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultCaseVo.class);
+        Page<FaultCaseVo> page = this.pageAs(PageQuery.build(), queryWrapper, FaultCaseVo.class);
         return PageResult.build(page);
     }
 
+    @Override
+    public EsPageInfo<FaultCase> selectEsPage(FaultCaseBo faultCaseBo) {
+        FaultCase faultCase = MapstructUtils.convert(faultCaseBo, FaultCase.class);
+        LambdaEsQueryWrapper<FaultCase> wrapper = new LambdaEsQueryWrapper<>();
+        assert faultCase != null;
+        wrapper.match(StrUtil.isNotBlank(faultCase.getFaultPhenomenon()), "pContent", faultCaseBo.getFaultPhenomenon(), 5.0f)
+            .or()
+            .match(StrUtil.isNotBlank(faultCase.getFaultPhenomenon()), "fContent", faultCaseBo.getFaultPhenomenon(), 5.0f);
+        if (StrUtil.equals(faultCase.getOrderBy(), "createTimeAsc")) {
+            wrapper.orderByAsc("createTime");
+        } else if (StrUtil.equals(faultCase.getOrderBy(), "createTimeDesc")) {
+            wrapper.orderByDesc("createTime");
+        } else if (StrUtil.equals(faultCase.getOrderBy(), "countAsc")) {
+            wrapper.orderByAsc("viewCount");
+        } else if (StrUtil.equals(faultCase.getOrderBy(), "countDesc")) {
+            wrapper.orderByDesc("viewCount");
+        }
+        if (!esFaultCaseMapper.existsIndex("fault_case_index")) {
+            esFaultCaseMapper.createIndex();
+        }
+        Page page = PageQuery.build();
+        return esFaultCaseMapper.pageQuery(wrapper, (int) page.getPageNumber(), (int) page.getPageSize());
+    }
+
     /**
      * 新增故障案例
      *
@@ -135,9 +164,9 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      */
     @Override
     public boolean insert(FaultCaseBo faultCaseBo) {
-    FaultCase faultCase =MapstructUtils.convert(faultCaseBo, FaultCase. class);
-
-        return this.save(faultCase);//使用全局配置的雪花算法主键生成器生成ID值
+        FaultCase faultCase = MapstructUtils.convert(faultCaseBo, FaultCase.class);
+        this.save(faultCase);//使用全局配置的雪花算法主键生成器生成ID值
+        return esFaultCaseMapper.insert(faultCase) > 0;
     }
 
     /**
@@ -147,12 +176,11 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      * @return 结果:true 操作成功,false 操作失败
      */
     @Override
-    public boolean insertWithPk(FaultCaseBo faultCaseBo)
-    {
+    public boolean insertWithPk(FaultCaseBo faultCaseBo) {
         FaultCase faultCase = MapstructUtils.convert(faultCaseBo, FaultCase.class);
 
 
-            return faultCaseMapper.insertWithPk(faultCase) > 0;//前台传来主键值
+        return faultCaseMapper.insertWithPk(faultCase) > 0;//前台传来主键值
     }
 
     /**
@@ -163,38 +191,14 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
      */
     @Override
     public boolean update(FaultCaseBo faultCaseBo) {
-        FaultCase faultCase =MapstructUtils.convert(faultCaseBo, FaultCase. class);
-        if (ObjectUtil.isNotNull(faultCase) && ObjectUtil.isNotNull(faultCase.getId())){
-            boolean updated = this.updateById(faultCase);
-                return updated;
+        FaultCase faultCase = MapstructUtils.convert(faultCaseBo, FaultCase.class);
+        if (ObjectUtil.isNotNull(faultCase) && ObjectUtil.isNotNull(faultCase.getId())) {
+            esFaultCaseMapper.updateById(faultCase);
+            return this.updateById(faultCase);
         }
         return false;
     }
 
-    @Override
-    public void asyncImportData(MultipartFile file, boolean updateSupport, LoginUser loginUser) {
-        ExcelResultRes result;
-        try {
-            String name = file.getOriginalFilename();
-            result = excelService.importExcel(file.getInputStream(), name, FaultCaseImportVo.class, new FaultCaseImportListener(updateSupport, loginUser));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        boolean flag = importExportService.saveInfo(result, loginUser, "0");
-        if (flag) {
-            log.info("异步导入日志写入成功");
-        }
-    }
-
-    @Override
-    public void asyncExport(List<FaultCaseVo> listVo, String sheetName, LoginUser loginUser) {
-        ExcelResultRes result = excelService.exportExcel(listVo, sheetName, FaultCaseVo.class);
-        boolean flag = importExportService.saveInfo(result, loginUser, "1");
-        if (flag) {
-            log.info("异步导出日志写入成功");
-        }
-    }
-
     /**
      * 批量删除故障案例
      *
@@ -204,6 +208,7 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
     @Transactional
     @Override
     public boolean deleteByIds(Long[] ids) {
+        esFaultCaseMapper.deleteBatchIds(Arrays.asList(ids));
         return this.removeByIds(Arrays.asList(ids));
     }
 

+ 2 - 0
als-start/src/main/java/org/eco/StartApplication.java

@@ -1,5 +1,6 @@
 package org.eco;
 
+import org.dromara.easyes.starter.register.EsMapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -11,6 +12,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  * @author wgk
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"org.eco"})
+@EsMapperScan("org.eco.als.es.mapper")
 public class StartApplication {
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(StartApplication.class);

+ 1 - 1
als-start/src/main/resources/application-dev.yml

@@ -167,7 +167,7 @@ sms:
       sdk-app-id: 您的sdkAppId
 
 easy-es:
-  address: 127.0.0.1:9007
+  address: 127.0.0.1:9200
   banner: false # 默认为true 打印banner 若您不期望打印banner,可配置为false
   username: #es用户名,若无则删去此行配置
   password: #es密码,若无则删去此行配置