文档库新增页排序+标签修改

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java

@@ -8,8 +8,6 @@ package com.jero.common.constant.enums;
 public enum ModuleEnum {
     DOCUMENT_LIBRARY("文档管理","1"),
     OCR_RECORD("OCR识别转换记录表","2"),
-    ONL_CGFORM_TAG("标签项管理","3"),
-    ONL_CGFORM_AREA("展示区域管理","4"),
     ONL_CGFORM_COLLECTION("我的收藏","5"),
     ONL_CGFORM_SUBSCRIBE("我的订阅","6");
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml

@@ -119,12 +119,13 @@
 			</otherwise>
 		</choose>
 	</select>
-
+	<!-- 查询新增表单数据,并且按照展示区域的"排序号"和字段的"展示顺序"排序  -->
 	<select id="getFieldList" resultType="com.jero.generater.modules.online.cgform.entity.OnlCgformField">
 		select * from onl_cgform_field ocf
 		left join onl_cgform_head och on ocf.cgform_head_id = och.id
+		left join onl_cgform_area oca on ocf.show_area=oca.id
 		where table_name =#{tableName} and ocf.is_delete = 0
-		order by order_num asc
+		order by oca.sort asc,order_num asc
 	</select>
 
 </mapper>

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java

@@ -818,10 +818,6 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
             fieldList = onlCgformFieldMapper.getFieldList(TableEnum.BUSS_DOCUMENT_LIBRARY.getTable()+" ");
         }else if(ModuleEnum.OCR_RECORD.getValue().equals(flag)){
             fieldList = onlCgformFieldMapper.getFieldList(TableEnum.OCR_RECORD.getTable());
-        }else if(ModuleEnum.ONL_CGFORM_TAG.getValue().equals(flag)){
-            fieldList = onlCgformFieldMapper.getFieldList(TableEnum.TAG.getTable());
-        }else if(ModuleEnum.ONL_CGFORM_AREA.getValue().equals(flag)){
-            fieldList = onlCgformFieldMapper.getFieldList(TableEnum.TAG_AREA.getTable());
         }else if(ModuleEnum.ONL_CGFORM_COLLECTION.getValue().equals(flag)){
             fieldList = onlCgformFieldMapper.getFieldList(TableEnum.ONL_CGFORM_COLLECTION.getTable());
         }else if(ModuleEnum.ONL_CGFORM_SUBSCRIBE.getValue().equals(flag)){

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java

@@ -151,7 +151,7 @@ public class SysDictItemController {
 	 * @return
 	 */
 	//@RequiresRoles({"admin"})
-	@RequiresPermissions("sys:dict:list")
+	//@RequiresPermissions("sys:dict:list")未改
 	@RequestMapping(value = "/logicDelete", method = RequestMethod.DELETE)
 	@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
 	public Result<SysDictItem> logicDelete(@RequestParam(name="id",required=true) String id) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java

@@ -9,6 +9,7 @@ import com.jero.modules.enums.FixedFieldEnum;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.entity.OnlCgformTag;
+import com.jero.modules.tag.enums.FileTableIdEnum;
 import com.jero.modules.tag.service.IOnlCgformTagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -84,7 +85,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	//@RequiresPermissions("tag:add")
 	public Result<?> add(@Validated @RequestBody OnlCgformTag onlCgformTag) {
 		onlCgformTagService.add(onlCgformTag);
-		onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal");
+		onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
 		return Result.OK("添加成功！");
 	}
 
@@ -103,8 +104,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			return Result.error("固定字段,不可修改");
 		}else {
 			onlCgformTagService.editById(onlCgformTag);
-			//TODO 统一定义枚举或者统一常量形式并且加注释说明，不然ID写的太乱后期不好修改
+			onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
-			onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal");
 			return Result.OK("编辑成功！");
 		}
 	}
@@ -127,8 +127,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 				result.error500("固定字段,不可删除");
 			} else {
 				onlCgformTagService.deleteById(id);
-				//TODO 统一定义枚举或者统一常量形式并且加注释说明，不然ID写的太乱后期不好修改
+				onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
-				onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal");
 				result.OK("删除成功！");
 			}
 		}
@@ -148,11 +147,10 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		OnlCgformTag onlCgformTag = onlCgformTagService.queryById(ids);
 		if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) {
-			return Result.error("固定字段,不可删除");
+			return Result.error("包含固定字段,不可删除");
 		}else {
 			this.onlCgformTagService.deleteByIds(Arrays.asList(ids.split(",")));
-			//TODO 统一定义枚举或者统一常量形式并且加注释说明，不然ID写的太乱后期不好修改
+			onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
-			onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal");
 			return Result.OK("批量删除成功！");
 		}
 	}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/enums/FileTableIdEnum.java

@@ -0,0 +1,30 @@
+package com.jero.modules.tag.enums;
+
+public enum FileTableIdEnum {
+    FILE_TABLE_ID("文档库表id","48308196e7b04761b533dc31bc899707"),
+    ;
+
+    String name;
+    String value;
+
+    FileTableIdEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    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;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java

@@ -119,7 +119,6 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 		QueryWrapper<OnlCgformArea> queryWrapper = new QueryWrapper<>();
 		if (CutEnum.CN.getValue().equals(cut)) {
 			queryWrapper.select("id","show_area").orderByAsc("sort");
-			System.out.println("QueryWrapper数据:"+queryWrapper);
 			return list(queryWrapper);
 		}else{
 			queryWrapper.select("id","en_name").orderByAsc("sort");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java

@@ -8,13 +8,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
+import com.jero.modules.document.enums.FieldTypeEnum;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.entity.OnlCgformTag;
 import com.jero.modules.tag.mapper.OnlCgformTagMapper;
 import com.jero.modules.tag.service.IOnlCgformTagService;
 import com.jero.modules.utils.HanYuPinYinUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,21 +58,24 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 			onlCgformTag.setDbIsNull(1);
 			onlCgformTag.setDbPointLength(0);
 			onlCgformTag.setIsReadOnly(0);
+			Date now = new Date();
+			onlCgformTag.setCreateTime(now);
+			onlCgformTag.setUpdateTime(now);
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			onlCgformTag.setCreateBy(sysUser.getRealname());
+			onlCgformTag.setUpdateBy(sysUser.getRealname());
 			String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt());
 			onlCgformTag.setDbFieldName(pinYin.replace(" ","_"));
 			onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_"));
-			//TODO  使用枚举形式，不能直接使用字符串定义，看不出代表什么含义
+			//设置标签存入数据库的字段类型
-			if(onlCgformTag.getFieldShowType()=="2"){
+			if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.TEXT_NUMBER)){
 				onlCgformTag.setDbType("int");
-			}else if(onlCgformTag.getFieldShowType()=="5" && onlCgformTag.getFieldShowType()=="6"){
+			}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_SINGLE) && onlCgformTag.equals(FieldTypeEnum.DATE_MORE)){
 				onlCgformTag.setDbType("Date");
 			}else{
 				onlCgformTag.setDbType("String");
 			}
 		}
-		Date now = new Date();
-		onlCgformTag.setCreateTime(now);
-		onlCgformTag.setUpdateTime(now);
 		save(onlCgformTag);
 	}
 
@@ -81,10 +87,13 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	 */
 	@Override
 	public void editById(OnlCgformTag onlCgformTag) {
-		Date now = new Date();
+
 		String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt());
 		onlCgformTag.setDbFieldName(pinYin.replace(" ","_"));
+		Date now = new Date();
 		onlCgformTag.setUpdateTime(now);
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		onlCgformTag.setUpdateBy(sysUser.getRealname());
 		saveOrUpdate(onlCgformTag);
 	}