WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-参数项收集-同步上报库

Browse Source
This commit is contained in:
liyawei
2022-05-18 18:13:01 +08:00
parent 1276160fa1
commit 7042997838
57 changed files with 2661 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java
+2 -1
View File
@@ -12,7 +12,8 @@ public enum ModuleEnum {
FILE_SPLIT_ITEMS("文档拆分条款","4"),
ONL_CGFORM_COLLECTION("我的收藏","5"),
ONL_CGFORM_SUBSCRIBE("我的订阅","6"),
PARAMS_COLLECT_MANIFEST("参数收集清单","7");
PARAMS_COLLECT_MANIFEST("参数收集清单","7"),
PARAMS_REPORT_DETAIL("上报库参数项","8");
String name;
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java
+2 -1
View File
@@ -14,7 +14,8 @@ public enum TableEnum {
TAG_AREA("onl_cgform_area"),
ONL_CGFORM_COLLECTION("onl_cgform_collection"),
ONL_CGFORM_SUBSCRIBE("onl_cgform_subscribe"),
PARAMS_COLLECT_MANIFEST("params_collect_manifest");
PARAMS_COLLECT_MANIFEST("params_collect_manifest"),
PARAMS_REPORT_DETAIL("params_report_detail");
String table;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java
+2
View File
@@ -828,6 +828,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
fieldList = onlCgformFieldMapper.getFieldList(TableEnum.ONL_CGFORM_SUBSCRIBE.getTable());
} else if (ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue().equals(flag)) {
fieldList = onlCgformFieldMapper.getFieldList(TableEnum.PARAMS_COLLECT_MANIFEST.getTable());
} else if (ModuleEnum.PARAMS_REPORT_DETAIL.getValue().equals(flag)) {
fieldList = onlCgformFieldMapper.getFieldList(TableEnum.PARAMS_REPORT_DETAIL.getTable());
}
return fieldList;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+51
View File
@@ -45,6 +45,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-表头中英文切换")
@ApiOperation(value="参数项收集清单-表头中英文切换", notes="参数项收集清单-表头中英文切换")
@GetMapping(value = "/getHeader")
// @RequiresPermissions("params:collectManifest:list")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
@@ -60,6 +61,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-列表查询")
@ApiOperation(value="参数项收集清单-列表查询", notes="参数项收集清单-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("params:collectManifest:list")
public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
@@ -85,6 +87,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-提交")
@ApiOperation(value="参数项收集清单-提交", notes="参数项收集清单-提交")
@PostMapping(value = "/submit")
// @RequiresPermissions("params:collectManifest:submit")
public Result<?> submit(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.submit(paramsCollectManifestVO.getConfigDataList());
if (isSuccess) {
@@ -103,6 +106,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-添加查询")
@ApiOperation(value="参数项收集清单-添加查询", notes="参数项收集清单-添加查询")
@GetMapping(value = "/paramsInfoList")
// @RequiresPermissions("params:collectManifest:add")
public Result<List<ParamsInfoPublishEO>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber())) {
@@ -125,6 +129,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-添加")
@ApiOperation(value="参数项收集清单-添加", notes="参数项收集清单-添加")
@PostMapping(value = "/add")
// @RequiresPermissions("params:collectManifest:add")
public Result<?> add(@Validated @RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.add(paramsCollectManifestVO);
if (isSuccess) {
@@ -143,6 +148,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-批量删除")
@ApiOperation(value="参数项收集清单-批量删除", notes="参数项收集清单-批量删除")
@PostMapping(value = "/deleteBatch")
// @RequiresPermissions("params:collectManifest:delete")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
boolean isSuccess = paramsCollectManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
@@ -161,6 +167,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-查询工程接口人列表")
@ApiOperation(value="参数项收集清单-查询工程接口人列表", notes="参数项收集清单-查询工程接口人列表")
@GetMapping(value = "/querySdtList")
// @RequiresPermissions("params:collectManifest:sdt")
public Result<List<Map<String,String>>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String,String>> sdtList = paramsCollectManifestEOService.querySdtList(paramsCollectManifestVO);
return Result.OK(sdtList);
@@ -175,6 +182,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-判断当前登录用户类型")
@ApiOperation(value="参数项收集清单-判断当前登录用户类型", notes="参数项收集清单-判断当前登录用户类型")
@GetMapping(value = "/getLoginUserType")
// @RequiresPermissions("params:collectManifest:list")
public Result<?> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO) {
String loginUserType = paramsCollectManifestEOService.getLoginUserTypes(paramsCollectManifestVO);
return Result.OK(loginUserType);
@@ -189,6 +197,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-退回")
@ApiOperation(value="参数项收集清单-退回", notes="参数项收集清单-退回")
@PostMapping(value = "/back")
// @RequiresPermissions("params:collectManifest:back")
public Result<?> back(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.goBack(paramsCollectManifestVO);
if (isSuccess) {
@@ -207,6 +216,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-撤回")
@ApiOperation(value="参数项收集清单-撤回", notes="参数项收集清单-撤回")
@PostMapping(value = "/withdraw")
// @RequiresPermissions("params:collectManifest:withdraw")
public Result<?> withdraw(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.withdraw(paramsCollectManifestVO);
if (isSuccess) {
@@ -225,6 +235,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-设置截止时间")
@ApiOperation(value="参数项收集清单-设置截止时间", notes="参数项收集清单-设置截止时间")
@PostMapping(value = "/updateDeadlineBatch")
// @RequiresPermissions("params:collectManifest:deadline")
public Result<?> updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.updateDeadlineBatch(paramsCollectManifestVO);
if (isSuccess) {
@@ -243,6 +254,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-分配工程接口人")
@ApiOperation(value="参数项收集清单-分配工程接口人", notes="参数项收集清单-分配工程接口人")
@PostMapping(value = "/updateSdt")
// @RequiresPermissions("params:collectManifest:sdt")
public Result<?> updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.updateSdt(paramsCollectManifestVO);
if (isSuccess) {
@@ -261,6 +273,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-分配填写人")
@ApiOperation(value="参数项收集清单-分配填写人", notes="参数项收集清单-分配填写人")
@PostMapping(value = "/updateDreBatch")
// @RequiresPermissions("params:collectManifest:dre")
public Result<?> updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.updateDreBatch(paramsCollectManifestVO);
if (isSuccess) {
@@ -279,6 +292,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-下发收集")
@ApiOperation(value="参数项收集清单-下发收集", notes="参数项收集清单-下发收集")
@PostMapping(value = "/issueCollection")
// @RequiresPermissions("params:collectManifest:issue")
public Result<?> issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.issueCollection(paramsCollectManifestVO);
if (isSuccess) {
@@ -297,6 +311,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-配置下拉选项")
@ApiOperation(value="参数项收集清单-配置下拉选项", notes="参数项收集清单-配置下拉选项")
@PostMapping(value = "/getConfigLableList")
// @RequiresPermissions("params:collectManifest:lock")
public Result<?> getConfigLableList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String, String>> configLableList = paramsCollectManifestEOService.getConfigLabelList(paramsCollectManifestVO);
return Result.OK(configLableList);
@@ -311,6 +326,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-冻结配置")
@ApiOperation(value="参数项收集清单-冻结配置", notes="参数项收集清单-冻结配置")
@PostMapping(value = "/lockConfigColumn")
// @RequiresPermissions("params:collectManifest:lock")
public Result<?> lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO);
if (isSuccess) {
@@ -320,6 +336,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
}
/**
* 冻结配置，引用参数-下拉选项
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-配置下拉选项")
@ApiOperation(value="参数项收集清单-配置下拉选项", notes="参数项收集清单-配置下拉选项")
@PostMapping(value = "/getConfigLableListR")
// @RequiresPermissions("params:collectManifest:refer")
public Result<?> getConfigLableListRefer(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String, String>> configLableList = paramsCollectManifestEOService.getConfigLabelList(paramsCollectManifestVO);
return Result.OK(configLableList);
}
/**
* 引用参数
*
@@ -329,6 +360,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-引用参数")
@ApiOperation(value="参数项收集清单-引用参数", notes="参数项收集清单-引用参数")
@PostMapping(value = "/referParams")
// @RequiresPermissions("params:collectManifest:refer")
public Result<?> referParams(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.referParams(paramsCollectManifestVO);
if (isSuccess) {
@@ -338,6 +370,25 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
}
/**
* 同步上报库
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-同步上报库")
@ApiOperation(value="参数项收集清单-同步上报库", notes="参数项收集清单-同步上报库")
@PostMapping(value = "/syncReport")
// @RequiresPermissions("params:collectManifest:sync")
public Result<?> syncReport(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.syncReport(paramsCollectManifestVO);
if (isSuccess) {
return Result.OK("同步上报库成功！");
} else {
return Result.error("同步上报库失败！");
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java
+2
View File
@@ -47,6 +47,7 @@ public class ParamsCollectManifestHistoryEOController extends JeroController<Par
@AutoLog(value = "历史参数项收集清单-表头中英文切换")
@ApiOperation(value="历史参数项收集清单-表头中英文切换", notes="历史参数项收集清单-表头中英文切换")
@GetMapping(value = "/getHeader")
// @RequiresPermissions("params:manifest:history")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
@@ -62,6 +63,7 @@ public class ParamsCollectManifestHistoryEOController extends JeroController<Par
@AutoLog(value = "历史参数项收集清单-列表查询")
@ApiOperation(value="历史参数项收集清单-列表查询", notes="历史参数项收集清单-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("params:manifest:history")
public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java
+4 -1
View File
@@ -3,9 +3,9 @@ package com.jero.modules.cert.collect.controller;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.cert.collect.vo.ParamsConfigVO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import com.jero.modules.cert.collect.vo.ParamsConfigVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -38,6 +38,7 @@ public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IPa
@AutoLog(value = "参数配置-列表查询")
@ApiOperation(value="参数配置-列表查询", notes="参数配置-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("params:config:list")
public Result<List<ParamsConfigEO>> queryList(@RequestParam(name = "cut") String cut,
@RequestParam(name = "paramsManifestId") String paramsManifestId) {
List<ParamsConfigEO> list = paramsConfigEOService.queryList(paramsManifestId);
@@ -52,6 +53,7 @@ public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IPa
@AutoLog(value = "参数配置-批量添加")
@ApiOperation(value="参数配置-批量添加", notes="参数配置-批量添加")
@PostMapping(value = "/addBatch")
// @RequiresPermissions("params:config:addBatch")
public Result<?> addBatch(@RequestBody ParamsConfigVO paramsConfigVO) {
String paramsManifestId = paramsConfigVO.getParamsManifestId();
if (StringUtils.isBlank(paramsManifestId)) {
@@ -69,6 +71,7 @@ public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IPa
@AutoLog(value = "参数配置-查看单个详情")
@ApiOperation(value="参数配置-查看单个详情", notes="参数配置-查看单个详情")
@GetMapping(value = "/getById")
// @RequiresPermissions("params:config:list")
public Result<ParamsConfigEO> getById(@RequestParam(name = "id") String id) {
ParamsConfigEO paramsConfigEO = paramsConfigEOService.getById(id);
return Result.OK(paramsConfigEO);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+23 -4
View File
@@ -52,6 +52,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-分页列表查询")
@ApiOperation(value="参数清单-分页列表查询", notes="参数清单-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("params:manifest:page")
public Result<?> queryPageList(ParamsManifestEO paramsManifestEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -74,6 +75,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-参数模板列表查询")
@ApiOperation(value="参数清单-参数模板列表查询", notes="参数清单-参数模板列表查询")
@GetMapping(value = "/getParamsTemplateList")
// @RequiresPermissions("params:manifest:add")
public Result<List<ParamsTemplateEO>> getParamsTemplateList(ParamsTemplateEO paramsTemplateEO,
@RequestParam(name="cut") String cut) {
List<ParamsTemplateEO> list = paramsManifestEOService.getNewestPublishList(paramsTemplateEO);
@@ -88,6 +90,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-标题唯一校验")
@ApiOperation(value="参数清单-标题唯一校验", notes="参数清单-标题唯一校验")
@GetMapping(value = "/verifyTitle")
// @RequiresPermissions("params:manifest:add")
public Result<?> verifyTitle(String title, String projectId) {
LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsManifestEO::getTitle, title);
@@ -108,6 +111,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-添加")
@ApiOperation(value="参数清单-添加", notes="参数清单-添加")
@PostMapping(value = "/add")
// @RequiresPermissions("params:manifest:add")
public Result<?> add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
boolean isSuccess = paramsManifestEOService.add(paramsManifestEO);
if (isSuccess) {
@@ -126,6 +130,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-编辑")
@ApiOperation(value="参数清单-编辑", notes="参数清单-编辑")
@PostMapping(value = "/edit")
// @RequiresPermissions("params:manifest:edit")
public Result<?> edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO);
if (isSuccess) {
@@ -144,9 +149,14 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-通过id删除")
@ApiOperation(value="参数清单-通过id删除", notes="参数清单-通过id删除")
@GetMapping(value = "/delete")
// @RequiresPermissions("params:manifest:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paramsManifestEOService.deleteById(id);
return Result.OK("删除成功!");
boolean isSuccess = paramsManifestEOService.deleteById(id);
if (isSuccess) {
return Result.OK("删除成功!");
} else {
return Result.error("删除失败！");
}
}
/**
@@ -158,9 +168,14 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-批量删除")
@ApiOperation(value="参数清单-批量删除", notes="参数清单-批量删除")
@PostMapping(value = "/deleteBatch")
// @RequiresPermissions("params:manifest:deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
paramsManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
boolean isSuccess = paramsManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功!");
} else {
return Result.error("批量删除失败！");
}
}
/**
@@ -172,6 +187,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-变更扩展")
@ApiOperation(value="参数清单-变更扩展", notes="参数清单-变更扩展")
@GetMapping(value = "/changeExtension")
// @RequiresPermissions("params:manifest:change")
public Result<?> changeExtension(@RequestParam(name="id",required=true) String id) {
boolean isSuccess = paramsManifestEOService.changeExtension(id);
if(isSuccess) {
@@ -190,6 +206,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-历史版本")
@ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
@GetMapping(value = "/history")
// @RequiresPermissions("params:manifest:history")
public Result<?> history(@RequestParam(name="title",required=true) String title) {
List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(title);
return Result.OK(historyVersionList);
@@ -204,6 +221,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-查询所有项目的所有参数清单")
@ApiOperation(value="参数清单-查询所有项目的所有参数清单", notes="参数清单-查询所有项目的所有参数清单")
@GetMapping(value = "/getAllManifest")
// @RequiresPermissions("params:manifest:copy")
public Result<?> getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="projectName",required=false) String projectName) {
@@ -221,6 +239,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-复制清单")
@ApiOperation(value="参数清单-复制清单", notes="参数清单-复制清单")
@PostMapping(value = "/copy")
// @RequiresPermissions("params:manifest:copy")
public Result<?> copy(ParamsManifestEO paramsManifestEO,
@RequestParam(name="sourceManifestId",required=true) String sourceManifestId) {
ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, sourceManifestId);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+2 -2
View File
@@ -44,10 +44,10 @@
AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
</if>
<if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
AND duty_territory LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dutyTerritory}),'%')
AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
</if>
<if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
AND params_manifest_id LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsManifestId}),'%')
AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
</if>
<if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
<choose>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
+2 -16
View File
@@ -26,7 +26,6 @@
<result column="dre" property="dre" />
<result column="deadline" property="deadline" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="change_flag" property="changeFlag" />
</resultMap>
<sql id="BaseQuerySql">
<where>
@@ -44,23 +43,10 @@
AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
</if>
<if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
AND duty_territory LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dutyTerritory}),'%')
AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
</if>
<if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
AND params_manifest_id LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsManifestId}),'%')
</if>
<if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
<choose>
<when test="paramsCollectManifestEO.userTypes == 'sdt'">
AND sdt = #{paramsCollectManifestEO.sdt}
</when>
<when test="paramsCollectManifestEO.userTypes == 'dre'">
AND dre = #{paramsCollectManifestEO.dre}
</when>
<when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre})
</when>
</choose>
AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
</if>
</if>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+3
View File
@@ -119,4 +119,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
// 引用参数
boolean referParams(ParamsCollectManifestVO paramsCollectManifestVO);
// 同步上报库
boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+2 -2
View File
@@ -38,7 +38,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
* @param id
* @return
*/
void deleteById(String id);
boolean deleteById(String id);
/**
* 批量删除
@@ -46,7 +46,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+121 -10
View File
@@ -15,6 +15,7 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.entity.ParamsManifestEO;
import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
import com.jero.modules.cert.collect.enums.CollectManifestUserTypeEnum;
import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
@@ -23,10 +24,15 @@ import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import com.jero.modules.cert.collect.service.IParamsManifestEOService;
import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
import com.jero.modules.cert.report.entity.*;
import com.jero.modules.cert.report.service.*;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOService;
import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.ocr.util.LineHumpUtil;
@@ -66,36 +72,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Autowired
private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper;
@Autowired
private OnlCgformFieldServiceImpl onlCgformFieldService;
@Autowired
private IParamsConfigEOService paramsConfigEOService;
@Autowired
private IParamsConfigDataEOService paramsConfigDataEOService;
@Autowired
private ISysDictItemService sysDictItemService;
@Autowired
private IOSSFileService ossFileService;
@Autowired
private IParamsInfoPublishEOService paramsInfoPublishEOService;
@Autowired
private ICertCategoryParamsInfoPublishEOService certCategoryParamsInfoPublishEOService;
@Autowired
private IProjectRelatedPersonnelService projectRelatedPersonnelService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private IFeishuService feishuService;
@Autowired
private ISysAnnouncementService sysAnnouncementService;
@Autowired
private IParamsReportEOService paramsReportEOService;
@Autowired
private IParamsReportDetailEOService paramsReportDetailEOService;
@Autowired
private IParamsReportConfigEOService paramsReportConfigEOService;
@Autowired
private IParamsReportConfigDataEOService paramsReportConfigDataEOService;
@Autowired
private IParamsManifestEOService paramsManifestEOService;
@Autowired
private IReportCertCategoryParamsInfoEOService reportCertCategoryParamsInfoEOService;
@Value(value = "${jero.backUrl}")
@@ -1054,6 +1066,105 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
return paramsConfigDataEOService.updateBatchById(updateConfigDataEOList);
}
@Override
public boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO) {
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
List<String> paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(","));
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
// 根据收集库清单id 的是否上报过
boolean isSync = paramsReportEOService.isSync(paramsManifestId);
String reportId = null;
if (!isSync) {
reportId = UUID.randomUUID().toString().replace("-","");
} else {
ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestId);
reportId = paramsReportEO.getId();
}
// 配置
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
List<ParamsReportConfigEO> addReportConfigEOList = new ArrayList<>();
List<ReportCertCategoryParamsInfoEO> addReportCertCategoryParamsInfoEOList = new ArrayList<>();
if (!isSync) { // 未上报
// 复制配置
for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsReportConfigEO addReportConfigEO = new ParamsReportConfigEO();
BeanUtils.copyProperties(configEO, addReportConfigEO); // 全盘复制,包括id
addReportConfigEO.setParamsManifestId(reportId);
addReportConfigEOList.add(addReportConfigEO);
}
}
// 添加参数项到上报库
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.selectBatchIds(paramsCollectManifestIdList);
List<ParamsReportDetailEO> addReportDetailEOList = new ArrayList<>();
List<ParamsReportConfigDataEO> addReportConfigDataEOList = new ArrayList<>(); // 需要添加的配置数据
Date syncTime = new Date();
for (ParamsCollectManifestEO collectManifestEO : paramsCollectManifestEOList) {
ParamsReportDetailEO addReportDetailEO = new ParamsReportDetailEO();
BeanUtils.copyProperties(collectManifestEO, addReportDetailEO);
String reportDetailId = UUID.randomUUID().toString().replace("-","");
addReportDetailEO.setId(reportDetailId);
addReportDetailEO.setParamsManifestId(reportId);
addReportDetailEO.setSyncTime(syncTime);
addReportDetailEOList.add(addReportDetailEO);
// 添加配置数据
for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO);
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
addReportConfigDataEOList.add(addReportConfigDataEO);
}
}
// 复制认证类别参数
List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList);
for (CertCategoryParamsInfoPublishEO ccpi : certCategoryParamsInfoPublishEOS) {
ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO();
BeanUtils.copyProperties(ccpi, addCcpi); // 全盘复制,包括id
addReportCertCategoryParamsInfoEOList.add(addCcpi);
}
// 添加认证类别参数信息
reportCertCategoryParamsInfoEOService.saveBatch(addReportCertCategoryParamsInfoEOList);
// 添加参数项
paramsReportDetailEOService.saveBatch(addReportDetailEOList);
// 添加配置
paramsReportConfigEOService.saveBatch(addReportConfigEOList);
// 添加配置数据
paramsReportConfigDataEOService.saveBatch(addReportConfigDataEOList);
// 添加上报库
ParamsReportEO addReportEO = new ParamsReportEO();
addReportEO.setId(reportId);
addReportEO.setOldParamsManifestId(paramsManifestId);
addReportEO.setVersion(paramsManifestEO.getVersion());
paramsReportEOService.save(addReportEO);
// 修改收集库参数项状态
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
for (String paramsCollectManifestId : paramsCollectManifestIdList) {
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestId);
updateEO.setState(CollectManifestStateEnum.SYNC_REPORT.getValue()); // 设置状态为：待工程接口人处理
updateEOList.add(updateEO);
}
return updateBatchById(updateEOList);
}
/**
* 实体对象转成Map
* @param obj 实体对象
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+1 -11
View File
@@ -61,17 +61,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
// String userTypes = paramsCollectManifestEO.getUserTypes();
// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
// if ("sdt".equals(userTypes)) {
// paramsCollectManifestEO.setSdt(loginUser.getUsername());
// } else if ("dre".equals(userTypes)) {
// paramsCollectManifestEO.setDre(loginUser.getUsername());
// } else if ("sdt,dre".equals(userTypes)) {
// paramsCollectManifestEO.setSdt(loginUser.getUsername());
// paramsCollectManifestEO.setDre(loginUser.getUsername());
// }
List<ParamsCollectManifestHistoryEO> list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限
List<ParamsCollectManifestHistoryEO> list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列
// 普通数据字典
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+4 -4
View File
@@ -149,7 +149,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
* @return
*/
@Override
public void deleteById(String id) {
public boolean deleteById(String id) {
// 关联删除配置
LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
configEOQueryWrapper.eq(ParamsConfigEO::getParamsManifestId, id);
@@ -165,7 +165,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
}
removeById(id);
return removeById(id);
}
/**
@@ -175,7 +175,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
public boolean deleteByIds(List<String> ids) {
// 关联删除配置
LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
@@ -191,7 +191,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
}
removeByIds(ids);
return removeByIds(ids);
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java
+223
View File
@@ -0,0 +1,223 @@
package com.jero.modules.cert.report.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
import com.jero.modules.cert.report.service.IParamsExportTemplateEOService;
import com.jero.modules.system.util.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Api(tags="参数导出模板表")
@RestController
@RequestMapping("/report/exportTemplate")
@Slf4j
public class ParamsExportTemplateEOController extends JeroController<ParamsExportTemplateEO, IParamsExportTemplateEOService> {
@Autowired
private IParamsExportTemplateEOService paramsExportTemplateEOService;
/**
* 分页列表查询
*
* @param paramsExportTemplateEO
* @param pageNo
* @param pageSize
* @param cut
* @return
*/
@AutoLog(value = "参数导出模板表-分页列表查询")
@ApiOperation(value="参数导出模板表-分页列表查询", notes="参数导出模板表-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("report:exportTemplate:page")
public Result<?> queryPageList(ParamsExportTemplateEO paramsExportTemplateEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="cut") String cut) {
if (StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName())) {
paramsExportTemplateEO.setTemplateName(paramsExportTemplateEO.getTemplateName().replace("%", "\\%"));
}
LambdaQueryWrapper<ParamsExportTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName());
Page<ParamsExportTemplateEO> page = new Page<ParamsExportTemplateEO>(pageNo, pageSize);
IPage<ParamsExportTemplateEO> pageList = paramsExportTemplateEOService.page(page, queryWrapper);
List<ParamsExportTemplateEO> rows = pageList.getRecords();
Map<String, String> stateMap = ExportTemplateStateEnum.toMap(cut);
rows.forEach(exportTemplateEO -> {
exportTemplateEO.setState(stateMap.get(exportTemplateEO.getState()));
});
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "参数导出模板表-列表查询")
@ApiOperation(value="参数导出模板表-列表查询", notes="参数导出模板表-列表查询")
@GetMapping(value = "/list")
public Result<List<ParamsExportTemplateEO>> queryList() {
List<ParamsExportTemplateEO> list = paramsExportTemplateEOService.queryList();
return Result.OK(list);
}
/**
* 模板名称唯一校验
* true-唯一，false-不唯一
* @return
*/
@AutoLog(value = "参数导出模板表-模板名称唯一校验")
@ApiOperation(value="参数导出模板表-模板名称唯一校验", notes="参数导出模板表-模板名称唯一校验")
@GetMapping(value = "/verifyTemplateName")
// @RequiresPermissions("report:exportTemplate:add")
public Result<?> verifyTemplateName(@RequestParam(name="templateName") String templateName) {
boolean isRepeat = paramsExportTemplateEOService.verifyTemplateName(templateName);
return Result.OK(isRepeat);
}
/**
* 添加
*
* @param paramsExportTemplateEO
* @return
*/
@AutoLog(value = "参数导出模板表-添加")
@ApiOperation(value="参数导出模板表-添加", notes="参数导出模板表-添加")
@PostMapping(value = "/add")
// @RequiresPermissions("report:exportTemplate:add")
public Result<?> add(@Validated @RequestBody ParamsExportTemplateEO paramsExportTemplateEO) {
boolean isSuccess = paramsExportTemplateEOService.add(paramsExportTemplateEO);
if (isSuccess) {
return Result.OK("添加成功！");
} else {
return Result.error("添加失败！");
}
}
/**
* 编辑
*
* @param paramsExportTemplateEO
* @return
*/
@AutoLog(value = "参数导出模板表-编辑")
@ApiOperation(value="参数导出模板表-编辑", notes="参数导出模板表-编辑")
@PostMapping(value = "/edit")
// @RequiresPermissions("report:exportTemplate:edit")
public Result<?> edit(@Validated @RequestBody ParamsExportTemplateEO paramsExportTemplateEO) {
boolean isSuccess = paramsExportTemplateEOService.editById(paramsExportTemplateEO);
if (isSuccess) {
return Result.OK("编辑成功！");
} else {
return Result.error("编辑失败！");
}
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "参数导出模板表-通过id删除")
@ApiOperation(value="参数导出模板表-通过id删除", notes="参数导出模板表-通过id删除")
@GetMapping(value = "/delete")
// @RequiresPermissions("report:exportTemplate:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
boolean isSuccess = paramsExportTemplateEOService.deleteById(id);
if (isSuccess) {
return Result.OK("删除成功！");
} else {
return Result.error("删除失败！");
}
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "参数导出模板表-批量删除")
@ApiOperation(value="参数导出模板表-批量删除", notes="参数导出模板表-批量删除")
@PostMapping(value = "/deleteBatch")
// @RequiresPermissions("report:exportTemplate:deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
boolean isSuccess = paramsExportTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功！");
} else {
return Result.error("批量删除失败！");
}
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "参数导出模板表-通过id查询")
@ApiOperation(value="参数导出模板表-通过id查询", notes="参数导出模板表-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.queryById(id);
if(paramsExportTemplateEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(paramsExportTemplateEO);
}
/**
* 导出excel
*
* @param request
* @param paramsExportTemplateEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ParamsExportTemplateEO paramsExportTemplateEO) {
return super.exportXls(request, paramsExportTemplateEO, ParamsExportTemplateEO.class, "参数导出模板表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ParamsExportTemplateEO.class);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+81
View File
@@ -0,0 +1,81 @@
package com.jero.modules.cert.report.controller;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Api(tags="上报库参数项")
@RestController
@RequestMapping("/report/detail")
@Slf4j
public class ParamsReportDetailEOController extends JeroController<ParamsReportDetailEO, IParamsReportDetailEOService> {
@Autowired
private IParamsReportDetailEOService paramsReportDetailEOService;
/**
* 表头中英文切换
*
* @return
*/
@AutoLog(value = "上报库参数项-表头中英文切换")
@ApiOperation(value="上报库参数项-表头中英文切换", notes="上报库参数项-表头中英文切换")
@GetMapping(value = "/getHeader")
// @RequiresPermissions("report:detail:list")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = paramsReportDetailEOService.getHeader(paramsManifestId, flag, cut);
return Result.OK(list);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "上报库参数项-列表查询")
@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("report:detail:list")
public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getSdt())) {
paramsCollectManifestEO.setSdt(paramsCollectManifestEO.getSdt().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
}
List<Map<String, Object>> list = paramsReportDetailEOService.queryList(paramsCollectManifestEO, cut);
return Result.OK(list);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+181
View File
@@ -0,0 +1,181 @@
package com.jero.modules.cert.report.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import com.jero.modules.cert.report.service.IParamsReportEOService;
import com.jero.modules.system.util.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* @Description: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Api(tags="上报库")
@RestController
@RequestMapping("/params/report")
@Slf4j
public class ParamsReportEOController extends JeroController<ParamsReportEO, IParamsReportEOService> {
@Autowired
private IParamsReportEOService paramsReportEOService;
/**
* 分页列表查询
*
* @param paramsReportEO
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "上报库-分页列表查询")
@ApiOperation(value="上报库-分页列表查询", notes="上报库-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("params:report:page")
public Result<?> queryPageList(ParamsReportEO paramsReportEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if (StringUtils.isNotEmpty(paramsReportEO.getProjectName())) {
paramsReportEO.setProjectName(paramsReportEO.getProjectName().replace("%", "\\%"));
}
if (StringUtils.isNotEmpty(paramsReportEO.getTitle())) {
paramsReportEO.setProjectName(paramsReportEO.getTitle().replace("%", "\\%"));
}
IPage page = new Page(pageNo, pageSize);
IPage pageList = paramsReportEOService.pageInfo(page, paramsReportEO);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "上报库-列表查询")
@ApiOperation(value="上报库-列表查询", notes="上报库-列表查询")
@GetMapping(value = "/list")
public Result<List<ParamsReportEO>> queryList() {
List<ParamsReportEO> list = paramsReportEOService.queryList();
return Result.OK(list);
}
/**
* 添加
*
* @param paramsReportEO
* @return
*/
@AutoLog(value = "上报库-添加")
@ApiOperation(value="上报库-添加", notes="上报库-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ParamsReportEO paramsReportEO) {
paramsReportEOService.add(paramsReportEO);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param paramsReportEO
* @return
*/
@AutoLog(value = "上报库-编辑")
@ApiOperation(value="上报库-编辑", notes="上报库-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ParamsReportEO paramsReportEO) {
paramsReportEOService.editById(paramsReportEO);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "上报库-通过id删除")
@ApiOperation(value="上报库-通过id删除", notes="上报库-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paramsReportEOService.deleteById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "上报库-批量删除")
@ApiOperation(value="上报库-批量删除", notes="上报库-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.paramsReportEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "上报库-通过id查询")
@ApiOperation(value="上报库-通过id查询", notes="上报库-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ParamsReportEO paramsReportEO = paramsReportEOService.queryById(id);
if(paramsReportEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(paramsReportEO);
}
/**
* 导出excel
*
* @param request
* @param paramsReportEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ParamsReportEO paramsReportEO) {
return super.exportXls(request, paramsReportEO, ParamsReportEO.class, "上报库");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ParamsReportEO.class);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java
+170
View File
@@ -0,0 +1,170 @@
package com.jero.modules.cert.report.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Api(tags="上报库认证类别参数信息")
@RestController
@RequestMapping("/cert.report/reportCertCategoryParamsInfoEO")
@Slf4j
public class ReportCertCategoryParamsInfoEOController extends JeroController<ReportCertCategoryParamsInfoEO, IReportCertCategoryParamsInfoEOService> {
@Autowired
private IReportCertCategoryParamsInfoEOService reportCertCategoryParamsInfoEOService;
/**
* 分页列表查询
*
* @param reportCertCategoryParamsInfoEO
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-分页列表查询")
@ApiOperation(value="上报库认证类别参数信息-分页列表查询", notes="上报库认证类别参数信息-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ReportCertCategoryParamsInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(reportCertCategoryParamsInfoEO, req.getParameterMap());
Page<ReportCertCategoryParamsInfoEO> page = new Page<ReportCertCategoryParamsInfoEO>(pageNo, pageSize);
IPage<ReportCertCategoryParamsInfoEO> pageList = reportCertCategoryParamsInfoEOService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-列表查询")
@ApiOperation(value="上报库认证类别参数信息-列表查询", notes="上报库认证类别参数信息-列表查询")
@GetMapping(value = "/list")
public Result<List<ReportCertCategoryParamsInfoEO>> queryList() {
List<ReportCertCategoryParamsInfoEO> list = reportCertCategoryParamsInfoEOService.queryList();
return Result.OK(list);
}
/**
* 添加
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-添加")
@ApiOperation(value="上报库认证类别参数信息-添加", notes="上报库认证类别参数信息-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
reportCertCategoryParamsInfoEOService.add(reportCertCategoryParamsInfoEO);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-编辑")
@ApiOperation(value="上报库认证类别参数信息-编辑", notes="上报库认证类别参数信息-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
reportCertCategoryParamsInfoEOService.editById(reportCertCategoryParamsInfoEO);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-通过id删除")
@ApiOperation(value="上报库认证类别参数信息-通过id删除", notes="上报库认证类别参数信息-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
reportCertCategoryParamsInfoEOService.deleteById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-批量删除")
@ApiOperation(value="上报库认证类别参数信息-批量删除", notes="上报库认证类别参数信息-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.reportCertCategoryParamsInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-通过id查询")
@ApiOperation(value="上报库认证类别参数信息-通过id查询", notes="上报库认证类别参数信息-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO = reportCertCategoryParamsInfoEOService.queryById(id);
if(reportCertCategoryParamsInfoEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(reportCertCategoryParamsInfoEO);
}
/**
* 导出excel
*
* @param request
* @param reportCertCategoryParamsInfoEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
return super.exportXls(request, reportCertCategoryParamsInfoEO, ReportCertCategoryParamsInfoEO.class, "上报库认证类别参数信息");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ReportCertCategoryParamsInfoEO.class);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java
+81
View File
@@ -0,0 +1,81 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_export_template")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_export_template对象", description="参数导出模板表")
public class ParamsExportTemplateEO implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "最新变更时间")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**模板名称*/
@Excel(name = "模板名称", width = 15)
@ApiModelProperty(value = "模板名称")
private String templateName;
/**状态*/
@Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态")
private String state;
/**内容说明*/
@Excel(name = "内容说明", width = 15)
@ApiModelProperty(value = "内容说明")
private String description;
/**附件上传*/
@Excel(name = "附件上传", width = 15)
@ApiModelProperty(value = "附件上传")
private String fileConnectId;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java
+27
View File
@@ -0,0 +1,27 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* @Description: 上报库参数配置数据
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_report_config_data")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report_config_data对象", description="上报库参数配置数据")
public class ParamsReportConfigDataEO extends ParamsConfigDataEO implements Serializable {
private static final long serialVersionUID = 1L;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java
+27
View File
@@ -0,0 +1,27 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* @Description: 上报库参数配置
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_report_config")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report_config对象", description="上报库参数配置")
public class ParamsReportConfigEO extends ParamsConfigEO implements Serializable {
private static final long serialVersionUID = 1L;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java
+38
View File
@@ -0,0 +1,38 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_report_detail")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report_detail对象", description="上报库参数项")
public class ParamsReportDetailEO extends ParamsCollectManifestEO implements Serializable {
// private static final long serialVersionUID = 1L;
/**同步时间*/
@Excel(name = "同步时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "同步时间")
private java.util.Date syncTime;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
+78
View File
@@ -0,0 +1,78 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_report")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report对象", description="上报库")
public class ParamsReportEO implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**收集库参数清单id*/
@Excel(name = "收集库参数清单id", width = 15)
@ApiModelProperty(value = "收集库参数清单id")
private String oldParamsManifestId;
@ApiModelProperty(value = "版本")
private Integer version;
@TableField(exist = false)
@ApiModelProperty(value = "项目名称")
private String projectName;
@TableField(exist = false)
@ApiModelProperty(value = "清单标题")
private String title;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
+27
View File
@@ -0,0 +1,27 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("report_cert_category_params_info")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="report_cert_category_params_info对象", description="上报库认证类别参数信息")
public class ReportCertCategoryParamsInfoEO extends CertCategoryParamsInfoEO implements Serializable {
private static final long serialVersionUID = 1L;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java
+64
View File
@@ -0,0 +1,64 @@
package com.jero.modules.cert.report.enums;
import com.jero.common.constant.enums.CutEnum;
import java.util.HashMap;
import java.util.Map;
/**
* @Author: liyawei
* @Description:
* @Date: Created in 11:29 2022/5/18
*/
public enum ExportTemplateStateEnum {
ENABLE("启用","0","enable"),
DISABLE("禁用","1","disable");
String name;
String value;
String enName;
ExportTemplateStateEnum(String name, String value, String enName) {
this.name = name;
this.value = value;
this.enName = enName;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public static Map<String,String> toMap(String cut){
Map<String,String> map = new HashMap<>();
if (CutEnum.CN.getValue().equals(cut)) {
for (ExportTemplateStateEnum exportTemplateStateEnum : ExportTemplateStateEnum.values()) {
map.put(exportTemplateStateEnum.getValue(), exportTemplateStateEnum.getName());
}
} else if (CutEnum.EN.getValue().equals(cut)) {
for (ExportTemplateStateEnum exportTemplateStateEnum : ExportTemplateStateEnum.values()) {
map.put(exportTemplateStateEnum.getValue(), exportTemplateStateEnum.getEnName());
}
}
return map;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsExportTemplateEOMapper extends BaseMapper<ParamsExportTemplateEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
/**
* @Description: 上报库参数配置数据
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsReportConfigDataEOMapper extends BaseMapper<ParamsReportConfigDataEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
/**
* @Description: 上报库参数配置
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsReportConfigEOMapper extends BaseMapper<ParamsReportConfigEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetailEO> {
List<ParamsReportDetailEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java
+18
View File
@@ -0,0 +1,18 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsReportEOMapper extends BaseMapper<ParamsReportEO> {
IPage pageInfo(@Param("page") IPage page, @Param("paramsReportEO") ParamsReportEO paramsReportEO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ReportCertCategoryParamsInfoEOMapper extends BaseMapper<ReportCertCategoryParamsInfoEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsExportTemplateEOMapper">
<resultMap id="ParamsExportTemplateEOResultMap" type="com.jero.modules.cert.report.entity.ParamsExportTemplateEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="template_name" property="templateName" />
<result column="state" property="state" />
<result column="description" property="description" />
<result column="file_connect_id" property="fileConnectId" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportConfigDataEOMapper">
<resultMap id="ParamsReportConfigDataEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportConfigDataEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="text_data" property="textData" />
<result column="pull_data" property="pullData" />
<result column="file_connect_id" property="fileConnectId" />
<result column="params_config_id" property="paramsConfigId" />
<result column="params_collect_manifest_id" property="paramsCollectManifestId" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportConfigEOMapper">
<resultMap id="ParamsReportConfigEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportConfigEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="config_name" property="configName" />
<result column="car_type" property="carType" />
<result column="version" property="version" />
<result column="battery" property="battery" />
<result column="motor" property="motor" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="is_lock" property="isLock" />
<result column="display_seq" property="displaySeq" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+64
View File
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper">
<resultMap id="ParamsReportDetailEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportDetailEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="cert_category" property="certCategory" />
<result column="nio_number" property="nioNumber" />
<result column="is_must" property="isMust" />
<result column="params_name" property="paramsName" />
<result column="technology_territory" property="technologyTerritory" />
<result column="params_batch" property="paramsBatch" />
<result column="duty_territory" property="dutyTerritory" />
<result column="description" property="description" />
<result column="control_type" property="controlType" />
<result column="control_values" property="controlValues" />
<result column="control_verify" property="controlVerify" />
<result column="file_template" property="fileTemplate" />
<result column="params_template_id" property="paramsTemplateId" />
<result column="state" property="state" />
<result column="sdt" property="sdt" />
<result column="dre" property="dre" />
<result column="deadline" property="deadline" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="sync_time" property="syncTime" />
</resultMap>
<sql id="BaseQuerySql">
<where>
<if test="paramsCollectManifestEO != null">
<if test="paramsCollectManifestEO.nioNumber !=null and paramsCollectManifestEO.nioNumber !=''">
AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%')
</if>
<if test="paramsCollectManifestEO.paramsName !=null and paramsCollectManifestEO.paramsName !=''">
AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%')
</if>
<if test="paramsCollectManifestEO.certCategory !=null and paramsCollectManifestEO.certCategory !=''">
AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%')
</if>
<if test="paramsCollectManifestEO.sdt !=null and paramsCollectManifestEO.sdt !=''">
AND sdt LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.sdt}),'%')
</if>
<if test="paramsCollectManifestEO.dre !=null and paramsCollectManifestEO.dre !=''">
AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
</if>
<if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
</if>
</if>
</where>
</sql>
<select id="listInfo" resultMap="ParamsReportDetailEOResultMap">
select *
from params_report_detail
<include refid="BaseQuerySql"/>
order by create_time asc
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+49
View File
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportEOMapper">
<resultMap id="ParamsReportEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="title" property="title" />
<result column="version" property="version" />
<result column="project_name" property="projectName" />
<result column="old_params_manifest_id" property="oldParamsManifestId" />
</resultMap>
<sql id="BaseColumnList">
pr.id as id,
pr.old_params_manifest_id as old_params_manifest_id,
pr.version as version,
pm.title as title,
pni.project_name as project_name
</sql>
<sql id="BaseQuerySql">
<where>
<if test="paramsReportEO != null">
<if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.paramsManifestTitle}),'%')
</if>
<if test="paramsReportEO.projectName !=null and paramsReportEO.projectName !=''">
AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportEO.projectName}),'%')
</if>
</if>
</where>
</sql>
<select id="pageInfo" resultMap="ParamsReportEOResultMap">
select tmp_tb.* from(
select <include refid="BaseColumnList"/>
from params_report pr
left join params_manifest as pm on pm.id = pr.old_params_manifest_id
left join project_library_base as plb on plb.id = pm.project_id
left join project_name_info as pni on plb.project_name_id = pni.id
) tmp_tb
<include refid="BaseQuerySql"/>
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ReportCertCategoryParamsInfoEOMapper">
<resultMap id="ReportCertCategoryParamsInfoEOResultMap" type="com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="params_number" property="paramsNumber" />
<result column="params_name" property="paramsName" />
<result column="description" property="description" />
<result column="nio_number" property="nioNumber" />
<result column="cert_category" property="certCategory" />
<result column="params_template_id" property="paramsTemplateId" />
<result column="version" property="version" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java
+63
View File
@@ -0,0 +1,63 @@
package com.jero.modules.cert.report.service;
import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsExportTemplateEOService extends IService<ParamsExportTemplateEO> {
/**
* 保存
*
* @param paramsExportTemplateEO
* @return
*/
boolean add(ParamsExportTemplateEO paramsExportTemplateEO);
/**
* 更新
*
* @param paramsExportTemplateEO
* @return
*/
boolean editById(ParamsExportTemplateEO paramsExportTemplateEO);
/**
* 通过id删除
*
* @param id
* @return
*/
boolean deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ParamsExportTemplateEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<ParamsExportTemplateEO> queryList();
boolean verifyTemplateName(String templateName);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
+22
View File
@@ -0,0 +1,22 @@
package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
/**
* @Description: 上报库参数配置数据
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsReportConfigDataEOService extends IService<ParamsReportConfigDataEO> {
/**
* 通过id查询
*
* @param paramsConfigId
* @param paramsCollectManifestId
* @return
*/
ParamsReportConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java
+16
View File
@@ -0,0 +1,16 @@
package com.jero.modules.cert.report.service;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 上报库参数配置
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsReportConfigEOService extends IService<ParamsReportConfigEO> {
List<ParamsReportConfigEO> queryList(String paramsManifestId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+34
View File
@@ -0,0 +1,34 @@
package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import java.util.List;
import java.util.Map;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsReportDetailEOService extends IService<ParamsReportDetailEO> {
/**
* 列表查询
* @param paramsCollectManifestEO
* @param cut
* @return
*/
List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut);
/**
* 列表表头中英文切换
* @param paramsManifestId
* @param flag
* @param cut
* @return
*/
List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java
+70
View File
@@ -0,0 +1,70 @@
package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import java.util.List;
/**
* @Description: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsReportEOService extends IService<ParamsReportEO> {
/**
* 保存
*
* @param paramsReportEO
* @return
*/
void add(ParamsReportEO paramsReportEO);
/**
* 更新
*
* @param paramsReportEO
* @return
*/
void editById(ParamsReportEO paramsReportEO);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ParamsReportEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<ParamsReportEO> queryList();
IPage pageInfo(IPage page, ParamsReportEO paramsReportEO);
boolean isSync(String oldParamsManifestId);
ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java
+61
View File
@@ -0,0 +1,61 @@
package com.jero.modules.cert.report.service;
import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IReportCertCategoryParamsInfoEOService extends IService<ReportCertCategoryParamsInfoEO> {
/**
* 保存
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
void add(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO);
/**
* 更新
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
void editById(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ReportCertCategoryParamsInfoEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<ReportCertCategoryParamsInfoEO> queryList();
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
+145
View File
@@ -0,0 +1,145 @@
package com.jero.modules.cert.report.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
import com.jero.modules.cert.report.mapper.ParamsExportTemplateEOMapper;
import com.jero.modules.cert.report.service.IParamsExportTemplateEOService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsExportTemplateEOServiceImpl extends ServiceImpl<ParamsExportTemplateEOMapper, ParamsExportTemplateEO> implements IParamsExportTemplateEOService {
@Autowired
private IOSSFileService ossFileService;
/**
* 保存
*
* @param paramsExportTemplateEO
* @return
*/
@Override
public boolean add(ParamsExportTemplateEO paramsExportTemplateEO) {
// 处理附件模板 修改文件表关联信息connect_id 一个文件
if (StringUtils.isNotBlank(paramsExportTemplateEO.getFileConnectId())) {
String fileId = paramsExportTemplateEO.getFileConnectId();
OSSFile targetOSSFile = ossFileService.getById(fileId);
if (ObjectUtil.isNotEmpty(targetOSSFile)) {
String connectId = UUID.randomUUID().toString().replace("-", "");
OSSFile ossFile = new OSSFile();
ossFile.setId(fileId);
ossFile.setConnectId(connectId);
ossFileService.updateById(ossFile);
paramsExportTemplateEO.setFileConnectId(connectId);
} else {
paramsExportTemplateEO.setFileConnectId(null);
}
}
Date now = new Date();
paramsExportTemplateEO.setCreateTime(now);
paramsExportTemplateEO.setUpdateTime(now);
return save(paramsExportTemplateEO);
}
/**
* 更新
*
* @param paramsExportTemplateEO
* @return
*/
@Override
public boolean editById(ParamsExportTemplateEO paramsExportTemplateEO) {
// 处理附件模板 若附件模板被修改，修改文件表关联信息connect_id 一个文件
if (StringUtils.isNotBlank(paramsExportTemplateEO.getFileConnectId())) {
String fileId = paramsExportTemplateEO.getFileConnectId();
OSSFile targetOSSFile = ossFileService.getById(fileId);
if (ObjectUtil.isNotEmpty(targetOSSFile)) { // 附件模板被修改，传的fileId
String connectId = UUID.randomUUID().toString().replace("-", "");
OSSFile ossFile = new OSSFile();
ossFile.setId(fileId);
ossFile.setConnectId(connectId);
ossFileService.updateById(ossFile);
paramsExportTemplateEO.setFileConnectId(connectId);
}
}
Date now = new Date();
paramsExportTemplateEO.setUpdateTime(now);
return updateById(paramsExportTemplateEO);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public boolean deleteById(String id) {
return removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public boolean deleteByIds(List<String> ids) {
// TODO 关联删除文件信息
return removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public ParamsExportTemplateEO queryById(String id) {
// TODO 关联删除文件信息
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsExportTemplateEO> queryList() {
return list();
}
@Override
public boolean verifyTemplateName(String templateName) {
LambdaQueryWrapper<ParamsExportTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsExportTemplateEO::getTemplateName, templateName);
int repeatNum = count(queryWrapper);
if (repeatNum > 0) {
return false;
} else {
return true;
}
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
+34
View File
@@ -0,0 +1,34 @@
package com.jero.modules.cert.report.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
import com.jero.modules.cert.report.mapper.ParamsReportConfigDataEOMapper;
import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
import org.springframework.stereotype.Service;
/**
* @Description: 上报库参数配置数据
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl<ParamsReportConfigDataEOMapper, ParamsReportConfigDataEO> implements IParamsReportConfigDataEOService {
/**
* 通过id查询
*
* @param paramsConfigId
* @param paramsCollectManifestId
* @return
*/
@Override
public ParamsReportConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportConfigDataEO::getParamsConfigId, paramsConfigId);
queryWrapper.eq(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
getOne(queryWrapper);
return getOne(queryWrapper);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java
+34
View File
@@ -0,0 +1,34 @@
package com.jero.modules.cert.report.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
import com.jero.modules.cert.report.mapper.ParamsReportConfigEOMapper;
import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 上报库参数配置
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsReportConfigEOServiceImpl extends ServiceImpl<ParamsReportConfigEOMapper, ParamsReportConfigEO> implements IParamsReportConfigEOService {
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsReportConfigEO> queryList(String paramsManifestId) {
LambdaQueryWrapper<ParamsReportConfigEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportConfigEO::getParamsManifestId, paramsManifestId);
queryWrapper.orderByAsc(ParamsReportConfigEO::getDisplaySeq);
List<ParamsReportConfigEO> list = list(queryWrapper);
return list;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+410
View File
@@ -0,0 +1,410 @@
package com.jero.modules.cert.report.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.cert.collect.entity.*;
import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper;
import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.service.ISysDictItemService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDetailEOMapper, ParamsReportDetailEO> implements IParamsReportDetailEOService {
@Autowired
private ParamsReportDetailEOMapper paramsReportDetailEOMapper;
@Autowired
private OnlCgformFieldServiceImpl onlCgformFieldService;
@Autowired
private IParamsReportConfigEOService paramsReportConfigEOService;
@Autowired
private IParamsReportConfigDataEOService paramsReportConfigDataEOService;
@Autowired
private ISysDictItemService sysDictItemService;
/**
* 列表查询
*
* @return
*/
@Override
public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列
// 普通数据字典
List<SysDictItem> dictItemList = new ArrayList<>();
List<String> dictCodeList = new ArrayList<>();
dictCodeList.add("duty_territory");
dictCodeList.add("cert_category");
for (String dictCode : dictCodeList) {
List<SysDictItem> dictItems = sysDictItemService.selectItemsByDictCode(dictCode);
dictItemList.addAll(dictItems);
}
List<Map<String, Object>> listMap = new ArrayList<>();
list.forEach(collectManifestEO -> { // 参数收集清单
// 处理数据字典字段 中英文切换 认证类型，责任领域
List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
String certCategoryName = "";
String dutyTerritoryName = "";
if (CutEnum.CN.getValue().equals(cut)) {
certCategoryName = dictItemList.stream()
.filter(e -> certCategory.contains(e.getItemValue()))
.map(SysDictItem::getItemText)
.collect(Collectors.joining(","));
dutyTerritoryName = dictItemList.stream()
.filter(e -> dutyTerritory.contains(e.getItemValue()))
.map(SysDictItem::getItemText)
.collect(Collectors.joining(","));
} else if (CutEnum.EN.getValue().equals(cut)) {
certCategoryName = dictItemList.stream()
.filter(e -> certCategory.contains(e.getItemValue()))
.map(SysDictItem::getEnName)
.collect(Collectors.joining(","));
dutyTerritoryName = dictItemList.stream()
.filter(e -> dutyTerritory.contains(e.getItemValue()))
.map(SysDictItem::getEnName)
.collect(Collectors.joining(","));
}
// String certCategoryName = sysDictService.queryDictItemByValue("cert_category", collectManifestEO.getCertCategory(), cut);
collectManifestEO.setCertCategory(certCategoryName);
// String dutyTerritoryName = sysDictService.queryDictItemByValue("duty_territory", collectManifestEO.getDutyTerritory(), cut);
collectManifestEO.setDutyTerritory(dutyTerritoryName);
// 处理状态字段
Map<String, String> collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
String stateName = collectManifestStateMap.get(collectManifestEO.getState());
collectManifestEO.setState(stateName);
Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
String controlType = collectManifestEO.getControlType();
String paramsCollectManifestId = collectManifestEO.getId();
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
Map<String, Object> configMap = new HashMap<>();
String paramsConfigId = paramsConfigEO.getId();
ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
configMap.put("controlType", controlType);
configMap.put("list", paramsConfigDataVOList);
manifestMap.put(paramsConfigEO.getId(), configMap);
});
}
listMap.add(manifestMap);
});
return listMap;
}
/**
* 重新组装配置数据 用于返回前端
* @param controlType
* @param paramsConfigDataEO
* @param paramsCollectManifestEO
* @return
*/
private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) {
List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
configDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(configDataVO);
} else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)) {
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(configDataVO);
} else if (ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) {
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(configDataVO);
} else if (ControlTypeEnum.FILE.getValue().equals(controlType)) {
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(configDataVO);
} else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)) {
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(textConfigDataVO);
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullConfigDataVO);
} else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) {
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(textConfigDataVO);
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullMoreConfigDataVO);
} else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) {
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(textConfigDataVO);
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(fileConfigDataVO);
} else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) {
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullConfigDataVO);
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(fileConfigDataVO);
} else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) {
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullMoreConfigDataVO);
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(fileConfigDataVO);
} else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(textConfigDataVO);
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullConfigDataVO);
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(fileConfigDataVO);
}
return paramsConfigDataVOList;
}
private List<Map<String, String>> getControlValueMapList(String controlValue) {
List<Map<String, String>> controlValueMapList = new ArrayList<>();
if (StringUtils.isNotEmpty(controlValue)) {
controlValue = controlValue.replace("，", ",");
String[] controlValueStr = controlValue.split(",");
for (int i = 0; i < controlValueStr.length; i++) {
Map<String, String> controlValueMap = new HashMap<>();
controlValueMap.put("lable", controlValueStr[i]);
controlValueMap.put("value", controlValueStr[i]);
controlValueMapList.add(controlValueMap);
}
}
return controlValueMapList;
}
/**
* 列表表头中英文切换
*
* @return
*/
@Override
public List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut) {
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag); // flag--->8
if (fieldList.size() != 0) {
//过滤列表字段(is_show_list-->列表是否显示0否 1是)
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
}
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId);
List<Map<String, Object>> listConfig = new LinkedList<>();
for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
Map<String, Object> map = new HashMap<>();
map.put("db_field_name", paramsConfigEO.getId());
map.put("db_field_txt", paramsConfigEO.getConfigName());
map.put("type", true); //配置列 标识
listConfig.add(map);
}
List<Map<String, Object>> list = new LinkedList<>();
int indexOfDescription = 1; // 参数说明的位置
for (int i = 0; i < fieldList.size(); i++) {
OnlCgformField onlCgformField = fieldList.get(i);
Map<String, Object> map = new HashMap<>();
String dbFieldName = onlCgformField.getDbFieldName();
if ("description".equals(dbFieldName)) {
indexOfDescription = i;
}
if ("sdt".equals(dbFieldName)) {
map.put("click", true);
}
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
if(CutEnum.CN.getValue().equals(cut)){
map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
}else{
map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
}
list.add(map);
}
list.addAll(indexOfDescription+1, listConfig);
return list;
}
/**
* 实体对象转成Map
* @param obj 实体对象
* @return
*/
private Map<String, Object> objectToMap(Object obj) {
Map<String, Object> map = new HashMap<>();
if (obj == null) {
return map;
}
Class clazz = obj.getClass();
Field[] fields = clazz.getDeclaredFields();
try {
for (Field field : fields) {
field.setAccessible(true);
map.put(field.getName(), field.get(obj));
}
} catch (Exception e) {
e.printStackTrace();
}
return map;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
+121
View File
@@ -0,0 +1,121 @@
package com.jero.modules.cert.report.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import com.jero.modules.cert.report.mapper.ParamsReportEOMapper;
import com.jero.modules.cert.report.service.IParamsReportEOService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @Description: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsReportEOServiceImpl extends ServiceImpl<ParamsReportEOMapper, ParamsReportEO> implements IParamsReportEOService {
@Autowired
private ParamsReportEOMapper paramsReportEOMapper;
/**
* 保存
*
* @param paramsReportEO
* @return
*/
@Override
public void add(ParamsReportEO paramsReportEO) {
Date now = new Date();
paramsReportEO.setCreateTime(now);
paramsReportEO.setUpdateTime(now);
save(paramsReportEO);
}
/**
* 更新
*
* @param paramsReportEO
* @return
*/
@Override
public void editById(ParamsReportEO paramsReportEO) {
Date now = new Date();
paramsReportEO.setUpdateTime(now);
saveOrUpdate(paramsReportEO);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public ParamsReportEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsReportEO> queryList() {
return list();
}
@Override
public IPage pageInfo(IPage page, ParamsReportEO paramsReportEO) {
return paramsReportEOMapper.pageInfo(page, paramsReportEO);
}
@Override
public boolean isSync(String oldParamsManifestId) {
LambdaQueryWrapper<ParamsReportEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId);
int num = count(queryWrapper);
if (num > 0) {
return true; // 上报过
} else {
return false; // 没上报过
}
}
@Override
public ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId) {
LambdaQueryWrapper<ParamsReportEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId);
return getOne(queryWrapper);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java
+90
View File
@@ -0,0 +1,90 @@
package com.jero.modules.cert.report.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
import com.jero.modules.cert.report.mapper.ReportCertCategoryParamsInfoEOMapper;
import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ReportCertCategoryParamsInfoEOServiceImpl extends ServiceImpl<ReportCertCategoryParamsInfoEOMapper, ReportCertCategoryParamsInfoEO> implements IReportCertCategoryParamsInfoEOService {
/**
* 保存
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
@Override
public void add(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
Date now = new Date();
reportCertCategoryParamsInfoEO.setCreateTime(now);
reportCertCategoryParamsInfoEO.setUpdateTime(now);
save(reportCertCategoryParamsInfoEO);
}
/**
* 更新
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
@Override
public void editById(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
Date now = new Date();
reportCertCategoryParamsInfoEO.setUpdateTime(now);
saveOrUpdate(reportCertCategoryParamsInfoEO);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public ReportCertCategoryParamsInfoEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ReportCertCategoryParamsInfoEO> queryList() {
return list();
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+10 -8
View File
@@ -170,11 +170,12 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
@GetMapping(value = "/delete")
@RequiresPermissions("params:paramsInfo:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
if (StringUtils.isBlank(id)) {
return Result.error("删除数据不能为空");
boolean isSuccess = paramsInfoEOService.deleteById(id);
if (isSuccess) {
return Result.OK("删除成功!");
} else {
return Result.error("删除失败！");
}
paramsInfoEOService.deleteById(id);
return Result.OK("删除成功!");
}
/**
@@ -188,11 +189,12 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
@PostMapping(value = "/deleteBatch")
@RequiresPermissions("params:paramsInfo:deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if (StringUtils.isBlank(ids)) {
return Result.error("删除数据不能为空");
boolean isSuccess = paramsInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功!");
} else {
return Result.error("批量删除失败！");
}
this.paramsInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
+22 -12
View File
@@ -95,8 +95,12 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@PostMapping(value = "/add")
@RequiresPermissions("params:template:add")
public Result<?> add(@Validated @RequestBody ParamsTemplateEO paramsTemplateEO) {
paramsTemplateEOService.add(paramsTemplateEO);
return Result.OK("添加成功！");
boolean isSuccess = paramsTemplateEOService.add(paramsTemplateEO);
if (isSuccess) {
return Result.OK("添加成功！");
} else {
return Result.error("添加失败！");
}
}
/**
@@ -110,8 +114,12 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@PutMapping(value = "/edit")
@RequiresPermissions("params:template:edit")
public Result<?> edit(@Validated @RequestBody ParamsTemplateEO paramsTemplateEO) {
paramsTemplateEOService.editById(paramsTemplateEO);
return Result.OK("编辑成功!");
boolean isSuccess = paramsTemplateEOService.editById(paramsTemplateEO);
if (isSuccess) {
return Result.OK("编辑成功!");
} else {
return Result.error("编辑失败！");
}
}
/**
@@ -125,11 +133,12 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@GetMapping(value = "/delete")
@RequiresPermissions("params:template:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
if (StringUtils.isBlank(id)) {
return Result.error("删除数据不能为空");
boolean isSuccess = paramsTemplateEOService.deleteById(id);
if (isSuccess) {
return Result.OK("删除成功!");
} else {
return Result.error("删除失败！");
}
paramsTemplateEOService.deleteById(id);
return Result.OK("删除成功!");
}
/**
@@ -143,11 +152,12 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@PostMapping(value = "/deleteBatch")
@RequiresPermissions("params:template:deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if (StringUtils.isBlank(ids)) {
return Result.error("删除数据不能为空");
boolean isSuccess = paramsTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功!");
} else {
return Result.error("批量删除失败！");
}
this.paramsTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java
+4 -1
View File
@@ -1,7 +1,8 @@
package com.jero.modules.cert.template.service;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import java.util.List;
/**
@@ -58,4 +59,6 @@ public interface ICertCategoryParamsInfoPublishEOService extends IService<CertCa
* @return
*/
List<CertCategoryParamsInfoPublishEO> queryList();
List<CertCategoryParamsInfoPublishEO> queryListByVersionAndNio(String paramsTemplateId, Integer version, List<String> nioNumberList);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java
+2 -2
View File
@@ -44,7 +44,7 @@ public interface IParamsInfoEOService extends IService<ParamsInfoEO> {
* @param id
* @return
*/
void deleteById(String id);
boolean deleteById(String id);
/**
* 批量删除
@@ -52,7 +52,7 @@ public interface IParamsInfoEOService extends IService<ParamsInfoEO> {
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java
+4 -4
View File
@@ -19,7 +19,7 @@ public interface IParamsTemplateEOService extends IService<ParamsTemplateEO> {
* @param paramsTemplateEO
* @return
*/
void add(ParamsTemplateEO paramsTemplateEO);
boolean add(ParamsTemplateEO paramsTemplateEO);
/**
* 更新
@@ -27,7 +27,7 @@ public interface IParamsTemplateEOService extends IService<ParamsTemplateEO> {
* @param paramsTemplateEO
* @return
*/
void editById(ParamsTemplateEO paramsTemplateEO);
boolean editById(ParamsTemplateEO paramsTemplateEO);
/**
* 通过id删除
@@ -35,7 +35,7 @@ public interface IParamsTemplateEOService extends IService<ParamsTemplateEO> {
* @param id
* @return
*/
void deleteById(String id);
boolean deleteById(String id);
/**
* 批量删除
@@ -43,7 +43,7 @@ public interface IParamsTemplateEOService extends IService<ParamsTemplateEO> {
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java
+11
View File
@@ -1,5 +1,6 @@
package com.jero.modules.cert.template.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import com.jero.modules.cert.template.mapper.CertCategoryParamsInfoPublishEOMapper;
@@ -87,4 +88,14 @@ public class CertCategoryParamsInfoPublishEOServiceImpl extends ServiceImpl<Cert
public List<CertCategoryParamsInfoPublishEO> queryList() {
return list();
}
@Override
public List<CertCategoryParamsInfoPublishEO> queryListByVersionAndNio(String paramsTemplateId, Integer version, List<String> nioNumberList) {
LambdaQueryWrapper<CertCategoryParamsInfoPublishEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CertCategoryParamsInfoPublishEO::getParamsTemplateId, paramsTemplateId);
queryWrapper.eq(CertCategoryParamsInfoPublishEO::getVersion, version);
queryWrapper.in(CertCategoryParamsInfoPublishEO::getNioNumber, nioNumberList);
return list(queryWrapper);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+4 -4
View File
@@ -208,14 +208,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
* @return
*/
@Override
public void deleteById(String id) {
public boolean deleteById(String id) {
// 关联删除认证类别参数项
ParamsInfoEO paramsInfoEO = getById(id);
String nioNumber = paramsInfoEO.getNioNumber();
String paramsTemplateId = paramsInfoEO.getParamsTemplateId();
certCategoryParamsInfoEOService.deleteByNioNumberList(Arrays.asList(nioNumber), paramsTemplateId);
// TODO 关联删除附件模板文件信息和文件
removeById(id);
return removeById(id);
}
/**
@@ -225,7 +225,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
public boolean deleteByIds(List<String> ids) {
LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsInfoEO::getId, ids);
List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper);
@@ -237,7 +237,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// TODO 关联删除附件模板文件信息和文件
}
removeByIds(ids);
return removeByIds(ids);
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
+8 -8
View File
@@ -42,14 +42,14 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl<ParamsTemplateEOMap
* @return
*/
@Override
public void add(ParamsTemplateEO paramsTemplateEO) {
public boolean add(ParamsTemplateEO paramsTemplateEO) {
paramsTemplateEO.setId(UUID.randomUUID().toString().replace("-",""));
Date now = new Date();
// 设置默认版本0
paramsTemplateEO.setVersion(0);
paramsTemplateEO.setCreateTime(now);
paramsTemplateEO.setUpdateTime(now);
save(paramsTemplateEO);
return save(paramsTemplateEO);
}
/**
@@ -59,10 +59,10 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl<ParamsTemplateEOMap
* @return
*/
@Override
public void editById(ParamsTemplateEO paramsTemplateEO) {
public boolean editById(ParamsTemplateEO paramsTemplateEO) {
Date now = new Date();
paramsTemplateEO.setUpdateTime(now);
updateById(paramsTemplateEO);
return updateById(paramsTemplateEO);
// saveOrUpdate(paramsTemplateEO);
}
@@ -73,11 +73,11 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl<ParamsTemplateEOMap
* @return
*/
@Override
public void deleteById(String id) {
public boolean deleteById(String id) {
// 关联删除参数项
certCategoryParamsInfoEOService.deleteByParamsTemplateIds(id);
paramsInfoEOService.deleteByParamsTemplateIds(id);
removeById(id);
return removeById(id);
}
/**
@@ -87,11 +87,11 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl<ParamsTemplateEOMap
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
public boolean deleteByIds(List<String> ids) {
// 关联删除参数项
certCategoryParamsInfoEOService.deleteByParamsTemplateIds(StringUtils.join(ids, ","));
paramsInfoEOService.deleteByParamsTemplateIds(StringUtils.join(ids, ","));
removeByIds(ids);
return removeByIds(ids);
}
/**