认证-参数模板-新增编辑后端校验NIO编号

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java

@@ -37,4 +37,8 @@ public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO impleme
 
 	@TableField(exist = false)
     private String userTypes;
+
+    @TableField(exist = false)
+    private String dreForAuth;
+
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -55,13 +55,13 @@
                             AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1'
                         </when>
                         <when test="paramsCollectManifestEO.userTypes == 'dre'">
-                            AND dre = #{paramsCollectManifestEO.dre}
+                            AND dre = #{paramsCollectManifestEO.dreForAuth}
                         </when>
                         <when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
-                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre}) AND state != '1'
+                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state != '1'
                         </when>
                         <when test="paramsCollectManifestEO.userTypes == 'guest'">
-                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre})
+                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth})
                         </when>
                     </choose>
                 </if>

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -225,13 +225,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		if ("sdt".equals(userTypes)) {
 			paramsCollectManifestEO.setSdt(loginUser.getUsername());
 		} else if ("dre".equals(userTypes)) {
-			paramsCollectManifestEO.setDre(loginUser.getUsername());
+			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
 		} else if ("sdt,dre".equals(userTypes)) {
 			paramsCollectManifestEO.setSdt(loginUser.getUsername());
-			paramsCollectManifestEO.setDre(loginUser.getUsername());
+			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
 		} else if ("guest".equals(userTypes)) {
 			paramsCollectManifestEO.setSdt(loginUser.getUsername());
-			paramsCollectManifestEO.setDre(loginUser.getUsername());
+			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
 		}
 		List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -221,7 +221,8 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 		LambdaQueryWrapper<ParamsTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.gt(ParamsTemplateEO::getVersion, 0) // 已发布的
 		.eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion()) // 查询条件：适用地区
-		.like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()); // 查询条件：参数模板
+		.like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()) // 查询条件：参数模板
+		.orderByDesc(ParamsTemplateEO::getCreateTime); // 按创建时间倒叙排序
 		return paramsTemplateEOService.page(page, queryWrapper);
 	}
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java

@@ -132,6 +132,9 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 	@PostMapping(value = "/add")
 //	@RequiresPermissions("params:paramsInfo:add")
 	public Result<?> add(@Validated @RequestBody ParamsInfoEO paramsInfoEO) {
+		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) {
+			return Result.error("认证类别不能为空！");
+		}
 		boolean isSuccess = paramsInfoEOService.add(paramsInfoEO);
 		if (isSuccess) {
 			return Result.OK("添加成功！");
@@ -151,6 +154,9 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 	@PostMapping(value = "/edit")
 	@RequiresPermissions("params:paramsInfo:edit")
 	public Result<?> edit(@Validated @RequestBody ParamsInfoEO paramsInfoEO) {
+		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) {
+			return Result.error("认证类别不能为空！");
+		}
 		boolean isSuccess = paramsInfoEOService.editById(paramsInfoEO);
 		if (isSuccess) {
 			return Result.OK("编辑成功!");

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java

@@ -64,7 +64,7 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
 		LambdaQueryWrapper<ParamsTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName())
 				.eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion())
-				.eq(StringUtils.isNotEmpty(paramsTemplateEO.getState()), ParamsTemplateEO::getState, paramsTemplateEO.getState())
+//				.eq(StringUtils.isNotEmpty(paramsTemplateEO.getState()), ParamsTemplateEO::getState, paramsTemplateEO.getState())
 				.orderByDesc(ParamsTemplateEO::getUpdateTime);
 		Page<ParamsTemplateEO> page = new Page<ParamsTemplateEO>(pageNo, pageSize);
 		IPage<ParamsTemplateEO> pageList = paramsTemplateEOService.page(page, queryWrapper);

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java

@@ -65,10 +65,10 @@ public class ParamsTemplateEO implements Serializable {
     private java.lang.String paramsTemplateName;
 
 	/**状态*/
-	@Excel(name = "状态", width = 15)
+//	@Excel(name = "状态", width = 15)
-    @Dict(dicCode = "params_template_state")
+//    @Dict(dicCode = "params_template_state")
-    @ApiModelProperty(value = "状态")
+//    @ApiModelProperty(value = "状态")
-    private java.lang.String state;
+//    private java.lang.String state;
 
 	/**适用地区*/
 	@Excel(name = "适用地区", width = 15, dicCode = "region")

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml

@@ -9,7 +9,7 @@
         <result column="update_time" property="updateTime" />
         <result column="sys_org_code" property="sysOrgCode" />
         <result column="params_template_name" property="paramsTemplateName" />
-        <result column="state" property="state" />
+<!--        <result column="state" property="state" />-->
         <result column="region" property="region" />
         <result column="description" property="description" />
         <result column="version" property="version" />

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java

@@ -101,6 +101,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			throw new JeroBootException("nio编号格式错误，仅能为字母，数字，横杠(-)");
 		}
 
+		LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber());
+		List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsInfoEOList)) {
+			throw new JeroBootException("NIO编号已存在！");
+		}
+
 		// 批量添加认证类别参数
 		List<CertCategoryParamsInfoEO> certCategoryParamsInfoEOList = paramsInfoEO.getCertCategoryParamsInfoEOList();
 		if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOList)) {
@@ -160,6 +167,15 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		}
 
 		ParamsInfoEO oldParamsInfoEO = getById(paramsInfoId);
+		if (!oldParamsInfoEO.getNioNumber().equals(nioNumber)) {
+			LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber());
+			List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper);
+			if (CollectionUtil.isNotEmpty(paramsInfoEOList)) {
+				throw new JeroBootException("NIO编号已存在！");
+			}
+		}
+
 		String oldNioNumber = oldParamsInfoEO.getNioNumber();
 		// 认证类别参数项 先删除后添加
 		certCategoryParamsInfoEOService.deleteByNioNumberList(Arrays.asList(oldNioNumber), paramsTemplateId);