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

als-modules/agile-assurance/src/main/java/org/eco/als/controller/QaHistoryController.java

@@ -42,15 +42,13 @@ public class QaHistoryController extends BaseController {
     /**
      * 查询问答历史记录列表
      */
-    @SaCheckPermission("als:qaHistory:list")
     @GetMapping("/list")
     public CommonResult<PageResult<QaHistoryVo>> list(QaHistoryBo qaHistoryBo) {
         return CommonResult.success(qaHistoryService.selectPage(qaHistoryBo));
     }
     /**
-     * 查询问答历史记录列表
+     * 查询问答历史记录列表不分页
      */
-    @SaCheckPermission("als:qaHistory:list")
     @GetMapping("/list/all")
     public CommonResult<List<QaHistoryVo>> listAll(QaHistoryBo qaHistoryBo) {
         return CommonResult.success(qaHistoryService.selectList(qaHistoryBo));
@@ -59,7 +57,6 @@ public class QaHistoryController extends BaseController {
     /**
      * 导出问答历史记录列表
      */
-    @SaCheckPermission("als:qaHistory:export")
     @Log(title = "问答历史记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public CommonResult<Void> export(QaHistoryBo qaHistoryBo) {
@@ -72,7 +69,6 @@ public class QaHistoryController extends BaseController {
         return CommonResult.success();
     }
 
-    @SaCheckPermission("als:qaHistory:import")
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
         ExcelUtil.exportExcel(new ArrayList<>(), "问答历史记录", QaHistoryImportVo.class, response);
@@ -81,8 +77,6 @@ public class QaHistoryController extends BaseController {
     /**
      * 导入问答历史记录列表
      */
-    @Log(title = "问答历史记录", businessType = BusinessType.IMPORT)
-    @SaCheckPermission("als:qaHistory:import")
     @PostMapping("/importData")
     public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) {
         LoginUser loginUser = LoginHelper.getLoginUser();
@@ -93,7 +87,6 @@ public class QaHistoryController extends BaseController {
     /**
      * 获取问答历史记录详细信息
      */
-    @SaCheckPermission("als:qaHistory:query")
     @GetMapping(value = "/{id}")
     public CommonResult<QaHistoryVo> getInfo(@PathVariable Long id) {
         return CommonResult.success(qaHistoryService.selectById(id));
@@ -102,8 +95,6 @@ public class QaHistoryController extends BaseController {
     /**
      * 新增问答历史记录
      */
-    @SaCheckPermission("als:qaHistory:add")
-    @Log(title = "问答历史记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping
     public CommonResult<Void> add(@Validated @RequestBody QaHistoryBo qaHistoryBo) {
@@ -117,8 +108,6 @@ public class QaHistoryController extends BaseController {
     /**
      * 修改问答历史记录
      */
-    @SaCheckPermission("als:qaHistory:edit")
-    @Log(title = "问答历史记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping
     public CommonResult<Void> edit(@Validated @RequestBody QaHistoryBo qaHistoryBo) {
@@ -132,8 +121,6 @@ public class QaHistoryController extends BaseController {
     /**
      * 删除问答历史记录
      */
-    @SaCheckPermission("als:qaHistory:remove")
-    @Log(title = "问答历史记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public CommonResult<Void> remove(@PathVariable Long[] ids) {
         boolean deleted = qaHistoryService.deleteByIds(ids);
@@ -142,4 +129,13 @@ public class QaHistoryController extends BaseController {
         }
         return CommonResult.success();
     }
+
+    /**
+     * 查询问答历史记录列表不分页
+     */
+    @SaCheckPermission("als:qaHistory:list")
+    @GetMapping("/group")
+    public CommonResult<List<QaHistoryVo>> questionList() {
+        return CommonResult.success(qaHistoryService.groupQuestion());
+    }
 }

als-modules/agile-assurance/src/main/java/org/eco/als/service/IQaHistoryService.java

@@ -33,6 +33,12 @@ public interface IQaHistoryService extends IBaseService<QaHistory> {
      * @return 问答历史记录集合
      */
     List<QaHistoryVo> selectList(QaHistoryBo qaHistoryBo);
+    /**
+     * 查询问答历史记录统计
+     *
+     * @return 问答历史记录集合
+     */
+    List<QaHistoryVo> groupQuestion();
 
     /**
      * 分页查询问答历史记录列表

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/QaHistoryServiceImpl.java

@@ -2,6 +2,7 @@ package org.eco.als.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryMethods;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
+import static com.mybatisflex.core.query.QueryMethods.avg;
 import static org.eco.als.domain.table.QaHistoryTableDef.QA_HISTORY;
 
 /**
@@ -99,6 +101,13 @@ public class QaHistoryServiceImpl extends BaseServiceImpl<QaHistoryMapper, QaHis
         return this.listAs(queryWrapper, QaHistoryVo.class);
     }
 
+    @Override
+    public List<QaHistoryVo> groupQuestion() {
+        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
+        queryWrapper.select(QA_HISTORY.QUESTION, QueryMethods.count(QA_HISTORY.QUESTION).as("couns")).groupBy(QA_HISTORY.QUESTION).orderBy("couns", false);
+        return this.listAs(queryWrapper, QaHistoryVo.class);
+    }
+
     /**
      * 分页查询问答历史记录列表
      *

als-start/src/main/resources/db/dm/V1_1_0_7_1216__als-ddl.sql

@@ -0,0 +1,5 @@
+
+alter table "lqbz".T_CARRYING_AVMAT_USE_REGISTER add USED_NUM INT;
+
+
+alter table "lqbz".T_CARRYING_MAINTE_ORGAN add USED_NUM REAL;

als-start/src/main/resources/db/dm/V1_1_0_8_1216__als-dml.sql

@@ -0,0 +1,10 @@
+truncate table "lqbz"."T_ENV_FACTOR";
+
+INSERT INTO "lqbz"."T_ENV_FACTOR"("ENV_FACTOR_ID","ENV","FACTOR","REMARK","IS_DELETED","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","ENV_TYPE","ENV_STATUS") VALUES('093c98ea-2450-424a-837e-8750fb1d5abf','沿海地区',1.21,'',0,null,null,null,null,null,'0');
+INSERT INTO "lqbz"."T_ENV_FACTOR"("ENV_FACTOR_ID","ENV","FACTOR","REMARK","IS_DELETED","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","ENV_TYPE","ENV_STATUS") VALUES('29269c6c-acc4-4541-a743-1f8badd9a01d','高温多雨',1.3,'',0,null,null,null,null,null,'0');
+INSERT INTO "lqbz"."T_ENV_FACTOR"("ENV_FACTOR_ID","ENV","FACTOR","REMARK","IS_DELETED","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","ENV_TYPE","ENV_STATUS") VALUES('37614feb-ebfa-42a2-92a3-dd8eed61c3f9','炎热梅雨',1.4,'',0,null,null,null,null,null,'0');
+INSERT INTO "lqbz"."T_ENV_FACTOR"("ENV_FACTOR_ID","ENV","FACTOR","REMARK","IS_DELETED","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","ENV_TYPE","ENV_STATUS") VALUES('4574749c-fdc0-4650-a38e-08f242c2e8d7','温暖潮湿',1.5,'',0,null,null,null,null,null,'0');
+INSERT INTO "lqbz"."T_ENV_FACTOR"("ENV_FACTOR_ID","ENV","FACTOR","REMARK","IS_DELETED","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","ENV_TYPE","ENV_STATUS") VALUES('92824f0a-9037-4c24-b803-6f3696e32e5f','暖温地区',1.22,'',0,null,null,null,null,null,'0');
+INSERT INTO "lqbz"."T_ENV_FACTOR"("ENV_FACTOR_ID","ENV","FACTOR","REMARK","IS_DELETED","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","ENV_TYPE","ENV_STATUS") VALUES('07b4f1f70b89442ba9897039281b6345','温差大地区',1.9,'',0,null,null,null,null,null,'0');
+INSERT INTO "lqbz"."T_ENV_FACTOR"("ENV_FACTOR_ID","ENV","FACTOR","REMARK","IS_DELETED","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","ENV_TYPE","ENV_STATUS") VALUES('4ffa2aad81d7457e8d35566b55771e11','寒冷地区',1.1,'',0,null,null,null,null,null,'0');
+INSERT INTO "lqbz"."T_ENV_FACTOR"("ENV_FACTOR_ID","ENV","FACTOR","REMARK","IS_DELETED","CREATE_BY","CREATE_TIME","UPDATE_BY","UPDATE_TIME","ENV_TYPE","ENV_STATUS") VALUES('632509aef1b147a3910eb24af345a175','高原寒冷',1.2,'',0,null,null,null,null,null,'0');