Browse Source

1.文件柜功能相关实体类
2.内网公告功能相关实体类

yanliming 1 year ago
parent
commit
2a812a1cbf
24 changed files with 1930 additions and 0 deletions
  1. 18 0
      common/src/main/java/com/jpsoft/railroad/modules/base/dao/NetworkNoticeDAO.java
  2. 18 0
      common/src/main/java/com/jpsoft/railroad/modules/base/dao/NetworkNoticeRalationDAO.java
  3. 18 0
      common/src/main/java/com/jpsoft/railroad/modules/base/dao/OaFileInfoDAO.java
  4. 18 0
      common/src/main/java/com/jpsoft/railroad/modules/base/dao/OaFileRegUserInfoDAO.java
  5. 55 0
      common/src/main/java/com/jpsoft/railroad/modules/base/entity/NetworkNotice.java
  6. 50 0
      common/src/main/java/com/jpsoft/railroad/modules/base/entity/NetworkNoticeRalation.java
  7. 55 0
      common/src/main/java/com/jpsoft/railroad/modules/base/entity/OaFileInfo.java
  8. 50 0
      common/src/main/java/com/jpsoft/railroad/modules/base/entity/OaFileRegUserInfo.java
  9. 17 0
      common/src/main/java/com/jpsoft/railroad/modules/base/service/NetworkNoticeRalationService.java
  10. 17 0
      common/src/main/java/com/jpsoft/railroad/modules/base/service/NetworkNoticeService.java
  11. 16 0
      common/src/main/java/com/jpsoft/railroad/modules/base/service/OaFileInfoService.java
  12. 17 0
      common/src/main/java/com/jpsoft/railroad/modules/base/service/OaFileRegUserInfoService.java
  13. 70 0
      common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/NetworkNoticeRalationServiceImpl.java
  14. 70 0
      common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/NetworkNoticeServiceImpl.java
  15. 70 0
      common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/OaFileInfoServiceImpl.java
  16. 70 0
      common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/OaFileRegUserInfoServiceImpl.java
  17. 100 0
      common/src/main/resources/mapper/base/NetworkNotice.xml
  18. 95 0
      common/src/main/resources/mapper/base/NetworkNoticeRalation.xml
  19. 102 0
      common/src/main/resources/mapper/base/OaFileInfo.xml
  20. 96 0
      common/src/main/resources/mapper/base/OaFileRegUserInfo.xml
  21. 227 0
      web/src/main/java/com/jpsoft/railroad/modules/base/controller/NetworkNoticeController.java
  22. 227 0
      web/src/main/java/com/jpsoft/railroad/modules/base/controller/NetworkNoticeRalationController.java
  23. 227 0
      web/src/main/java/com/jpsoft/railroad/modules/base/controller/OaFileInfoController.java
  24. 227 0
      web/src/main/java/com/jpsoft/railroad/modules/base/controller/OaFileRegUserInfoController.java

+ 18 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/dao/NetworkNoticeDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.railroad.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.railroad.modules.base.entity.NetworkNotice;
+import java.util.Map;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+
+@Repository
+public interface NetworkNoticeDAO {
+	int insert(NetworkNotice entity);
+	int update(NetworkNotice entity);
+	int exist(String id);
+	NetworkNotice get(String id);
+	int delete(String id);
+	List<NetworkNotice> list();
+	List<NetworkNotice> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 18 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/dao/NetworkNoticeRalationDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.railroad.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.railroad.modules.base.entity.NetworkNoticeRalation;
+import java.util.Map;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+
+@Repository
+public interface NetworkNoticeRalationDAO {
+	int insert(NetworkNoticeRalation entity);
+	int update(NetworkNoticeRalation entity);
+	int exist(String id);
+	NetworkNoticeRalation get(String id);
+	int delete(String id);
+	List<NetworkNoticeRalation> list();
+	List<NetworkNoticeRalation> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 18 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/dao/OaFileInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.railroad.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.railroad.modules.base.entity.OaFileInfo;
+import java.util.Map;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+
+@Repository
+public interface OaFileInfoDAO {
+	int insert(OaFileInfo entity);
+	int update(OaFileInfo entity);
+	int exist(String id);
+	OaFileInfo get(String id);
+	int delete(String id);
+	List<OaFileInfo> list();
+	List<OaFileInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 18 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/dao/OaFileRegUserInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.railroad.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.railroad.modules.base.entity.OaFileRegUserInfo;
+import java.util.Map;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+
+@Repository
+public interface OaFileRegUserInfoDAO {
+	int insert(OaFileRegUserInfo entity);
+	int update(OaFileRegUserInfo entity);
+	int exist(String id);
+	OaFileRegUserInfo get(String id);
+	int delete(String id);
+	List<OaFileRegUserInfo> list();
+	List<OaFileRegUserInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 55 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/entity/NetworkNotice.java

@@ -0,0 +1,55 @@
+package com.jpsoft.railroad.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_network_notice的实体类
+ */
+@Data
+@ApiModel(value = "base_network_notice的实体类")
+public class NetworkNotice {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "文件名称")
+	private String name;
+	
+				@ApiModelProperty(value = "文件地址")
+	private String url;
+	
+				@ApiModelProperty(value = "文件类型")
+	private String type;
+	
+					@ApiModelProperty(value = "上传时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date uploadTime;
+	
+			@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+			@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+					@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	
+		}

+ 50 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/entity/NetworkNoticeRalation.java

@@ -0,0 +1,50 @@
+package com.jpsoft.railroad.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_network_notice_ralation的实体类
+ */
+@Data
+@ApiModel(value = "base_network_notice_ralation的实体类")
+public class NetworkNoticeRalation {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "文件ID")
+	private String fileId;
+	
+				@ApiModelProperty(value = "查看人类型(1:人员,2:部门)")
+	private String type;
+	
+				@ApiModelProperty(value = "人员或者部门ID")
+	private String businessId;
+	
+				@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+			@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+					@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	
+		}

+ 55 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/entity/OaFileInfo.java

@@ -0,0 +1,55 @@
+package com.jpsoft.railroad.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_oa_file_info的实体类
+ */
+@Data
+@ApiModel(value = "base_oa_file_info的实体类")
+public class OaFileInfo {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "文件名称")
+	private String name;
+	
+				@ApiModelProperty(value = "文件地址")
+	private String url;
+	
+				@ApiModelProperty(value = "文件类型")
+	private String type;
+
+	@ApiModelProperty(value = "上传时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date uploadTime;
+	
+				@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+			@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+					@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	
+		}

+ 50 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/entity/OaFileRegUserInfo.java

@@ -0,0 +1,50 @@
+package com.jpsoft.railroad.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_oa_file_reg_user_info的实体类
+ */
+@Data
+@ApiModel(value = "base_oa_file_reg_user_info的实体类")
+public class OaFileRegUserInfo {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "文件ID")
+	private String fileId;
+	
+				@ApiModelProperty(value = "查看人类型(1:人员,2:部门)")
+	private String type;
+	
+				@ApiModelProperty(value = "人员或者部门ID")
+	private String businessId;
+	
+				@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+			@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+					@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	
+		}

+ 17 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/service/NetworkNoticeRalationService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.railroad.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.railroad.modules.base.entity.NetworkNoticeRalation;
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+
+public interface NetworkNoticeRalationService {
+	NetworkNoticeRalation get(String id);
+	boolean exist(String id);
+	int insert(NetworkNoticeRalation model);
+	int update(NetworkNoticeRalation model);
+	int delete(String id);
+	List<NetworkNoticeRalation> list();
+	Page<NetworkNoticeRalation> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 17 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/service/NetworkNoticeService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.railroad.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.railroad.modules.base.entity.NetworkNotice;
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+
+public interface NetworkNoticeService {
+	NetworkNotice get(String id);
+	boolean exist(String id);
+	int insert(NetworkNotice model);
+	int update(NetworkNotice model);
+	int delete(String id);
+	List<NetworkNotice> list();
+	Page<NetworkNotice> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 16 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/service/OaFileInfoService.java

@@ -0,0 +1,16 @@
+package com.jpsoft.railroad.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.railroad.modules.base.entity.OaFileInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+public interface OaFileInfoService {
+	OaFileInfo get(String id);
+	boolean exist(String id);
+	int insert(OaFileInfo model);
+	int update(OaFileInfo model);
+	int delete(String id);
+	List<OaFileInfo> list();
+	Page<OaFileInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 17 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/service/OaFileRegUserInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.railroad.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.railroad.modules.base.entity.OaFileRegUserInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+
+public interface OaFileRegUserInfoService {
+	OaFileRegUserInfo get(String id);
+	boolean exist(String id);
+	int insert(OaFileRegUserInfo model);
+	int update(OaFileRegUserInfo model);
+	int delete(String id);
+	List<OaFileRegUserInfo> list();
+	Page<OaFileRegUserInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 70 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/NetworkNoticeRalationServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.railroad.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.railroad.modules.base.dao.NetworkNoticeRalationDAO;
+import com.jpsoft.railroad.modules.base.entity.NetworkNoticeRalation;
+import com.jpsoft.railroad.modules.base.service.NetworkNoticeRalationService;
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="networkNoticeRalationService")
+public class NetworkNoticeRalationServiceImpl implements NetworkNoticeRalationService {
+	@Resource(name="networkNoticeRalationDAO")
+	private NetworkNoticeRalationDAO networkNoticeRalationDAO;
+
+	@Override
+	public NetworkNoticeRalation get(String id) {
+		// TODO Auto-generated method stub
+		return networkNoticeRalationDAO.get(id);
+	}
+
+	@Override
+	public int insert(NetworkNoticeRalation model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return networkNoticeRalationDAO.insert(model);
+	}
+
+	@Override
+	public int update(NetworkNoticeRalation model) {
+		// TODO Auto-generated method stub
+		return networkNoticeRalationDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return networkNoticeRalationDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = networkNoticeRalationDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<NetworkNoticeRalation> list() {
+		// TODO Auto-generated method stub
+		return networkNoticeRalationDAO.list();
+	}
+		
+	@Override
+	public Page<NetworkNoticeRalation> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<NetworkNoticeRalation> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            networkNoticeRalationDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 70 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/NetworkNoticeServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.railroad.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.railroad.modules.base.dao.NetworkNoticeDAO;
+import com.jpsoft.railroad.modules.base.entity.NetworkNotice;
+import com.jpsoft.railroad.modules.base.service.NetworkNoticeService;
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="networkNoticeService")
+public class NetworkNoticeServiceImpl implements NetworkNoticeService {
+	@Resource(name="networkNoticeDAO")
+	private NetworkNoticeDAO networkNoticeDAO;
+
+	@Override
+	public NetworkNotice get(String id) {
+		// TODO Auto-generated method stub
+		return networkNoticeDAO.get(id);
+	}
+
+	@Override
+	public int insert(NetworkNotice model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return networkNoticeDAO.insert(model);
+	}
+
+	@Override
+	public int update(NetworkNotice model) {
+		// TODO Auto-generated method stub
+		return networkNoticeDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return networkNoticeDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = networkNoticeDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<NetworkNotice> list() {
+		// TODO Auto-generated method stub
+		return networkNoticeDAO.list();
+	}
+		
+	@Override
+	public Page<NetworkNotice> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<NetworkNotice> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            networkNoticeDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 70 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/OaFileInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.railroad.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.railroad.modules.base.dao.OaFileInfoDAO;
+import com.jpsoft.railroad.modules.base.entity.OaFileInfo;
+import com.jpsoft.railroad.modules.base.service.OaFileInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="oaFileInfoService")
+public class OaFileInfoServiceImpl implements OaFileInfoService {
+	@Resource(name="oaFileInfoDAO")
+	private OaFileInfoDAO oaFileInfoDAO;
+
+	@Override
+	public OaFileInfo get(String id) {
+		// TODO Auto-generated method stub
+		return oaFileInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(OaFileInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return oaFileInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(OaFileInfo model) {
+		// TODO Auto-generated method stub
+		return oaFileInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return oaFileInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = oaFileInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<OaFileInfo> list() {
+		// TODO Auto-generated method stub
+		return oaFileInfoDAO.list();
+	}
+		
+	@Override
+	public Page<OaFileInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<OaFileInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            oaFileInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 70 - 0
common/src/main/java/com/jpsoft/railroad/modules/base/service/impl/OaFileRegUserInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.railroad.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.railroad.modules.base.dao.OaFileRegUserInfoDAO;
+import com.jpsoft.railroad.modules.base.entity.OaFileRegUserInfo;
+import com.jpsoft.railroad.modules.base.service.OaFileRegUserInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="oaFileRegUserInfoService")
+public class OaFileRegUserInfoServiceImpl implements OaFileRegUserInfoService {
+	@Resource(name="oaFileRegUserInfoDAO")
+	private OaFileRegUserInfoDAO oaFileRegUserInfoDAO;
+
+	@Override
+	public OaFileRegUserInfo get(String id) {
+		// TODO Auto-generated method stub
+		return oaFileRegUserInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(OaFileRegUserInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return oaFileRegUserInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(OaFileRegUserInfo model) {
+		// TODO Auto-generated method stub
+		return oaFileRegUserInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return oaFileRegUserInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = oaFileRegUserInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<OaFileRegUserInfo> list() {
+		// TODO Auto-generated method stub
+		return oaFileRegUserInfoDAO.list();
+	}
+		
+	@Override
+	public Page<OaFileRegUserInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<OaFileRegUserInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            oaFileRegUserInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 100 - 0
common/src/main/resources/mapper/base/NetworkNotice.xml

@@ -0,0 +1,100 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.railroad.modules.base.dao.NetworkNoticeDAO">
+	<resultMap id="NetworkNoticeMap" type="com.jpsoft.railroad.modules.base.entity.NetworkNotice">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="url" column="url_" />
+			<result property="type" column="type_" />
+			<result property="uploadTime" column="upload_time" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.railroad.modules.base.entity.NetworkNotice">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_network_notice
+	    (id_,name_,url_,type_,upload_time,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{url,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
+,#{uploadTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_network_notice where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.railroad.modules.base.entity.NetworkNotice">
+		update base_network_notice
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="url!=null">
+		url_=#{url,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
+		</if>
+				<if test="uploadTime!=null">
+		upload_time=#{uploadTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="NetworkNoticeMap">
+		select * from base_network_notice where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_network_notice where id_=#{0}
+	</select>
+	<select id="list" resultMap="NetworkNoticeMap">
+		select * from base_network_notice
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="NetworkNoticeMap">
+		<![CDATA[
+			select * from base_network_notice
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 95 - 0
common/src/main/resources/mapper/base/NetworkNoticeRalation.xml

@@ -0,0 +1,95 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.railroad.modules.base.dao.NetworkNoticeRalationDAO">
+	<resultMap id="NetworkNoticeRalationMap" type="com.jpsoft.railroad.modules.base.entity.NetworkNoticeRalation">
+		<id property="id" column="id_" />
+			<result property="fileId" column="file_id" />
+			<result property="type" column="type_" />
+			<result property="businessId" column="business_id" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.railroad.modules.base.entity.NetworkNoticeRalation">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_network_notice_ralation
+	    (id_,file_id,type_,business_id,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{fileId,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
+,#{businessId,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_network_notice_ralation where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.railroad.modules.base.entity.NetworkNoticeRalation">
+		update base_network_notice_ralation
+		<set>
+				<if test="fileId!=null">
+		file_id=#{fileId,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
+		</if>
+				<if test="businessId!=null">
+		business_id=#{businessId,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="NetworkNoticeRalationMap">
+		select * from base_network_notice_ralation where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_network_notice_ralation where id_=#{0}
+	</select>
+	<select id="list" resultMap="NetworkNoticeRalationMap">
+		select * from base_network_notice_ralation
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="NetworkNoticeRalationMap">
+		<![CDATA[
+			select * from base_network_notice_ralation
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 102 - 0
common/src/main/resources/mapper/base/OaFileInfo.xml

@@ -0,0 +1,102 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.railroad.modules.base.dao.OaFileInfoDAO">
+	<resultMap id="OaFileInfoMap" type="com.jpsoft.railroad.modules.base.entity.OaFileInfo">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="url" column="url_" />
+			<result property="type" column="type_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="uploadTime" column="upload_time" />
+
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.railroad.modules.base.entity.OaFileInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_oa_file_info
+	    (id_,name_,url_,type_,create_by,create_time,update_by,update_time,del_flag,upload_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{url,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{uploadTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_oa_file_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.railroad.modules.base.entity.OaFileInfo">
+		update base_oa_file_info
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="url!=null">
+		url_=#{url,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+			<if test="uploadTime!=null">
+				upload_time=#{uploadTime,jdbcType= TIMESTAMP },
+			</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="OaFileInfoMap">
+		select * from base_oa_file_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_oa_file_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="OaFileInfoMap">
+		select * from base_oa_file_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="OaFileInfoMap">
+		<![CDATA[
+			select * from base_oa_file_info
+		]]>
+		<where>
+			del_flag = false
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 96 - 0
common/src/main/resources/mapper/base/OaFileRegUserInfo.xml

@@ -0,0 +1,96 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.railroad.modules.base.dao.OaFileRegUserInfoDAO">
+	<resultMap id="OaFileRegUserInfoMap" type="com.jpsoft.railroad.modules.base.entity.OaFileRegUserInfo">
+		<id property="id" column="id_" />
+			<result property="fileId" column="file_id" />
+			<result property="type" column="type_" />
+			<result property="businessId" column="business_id" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.railroad.modules.base.entity.OaFileRegUserInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_oa_file_reg_user_info
+	    (id_,file_id,type_,business_id,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{fileId,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
+,#{businessId,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_oa_file_reg_user_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.railroad.modules.base.entity.OaFileRegUserInfo">
+		update base_oa_file_reg_user_info
+		<set>
+				<if test="fileId!=null">
+		file_id=#{fileId,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
+		</if>
+				<if test="businessId!=null">
+		business_id=#{businessId,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="OaFileRegUserInfoMap">
+		select * from base_oa_file_reg_user_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_oa_file_reg_user_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="OaFileRegUserInfoMap">
+		select * from base_oa_file_reg_user_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="OaFileRegUserInfoMap">
+		<![CDATA[
+			select * from base_oa_file_reg_user_info
+		]]>
+		<where>
+			del_flag = false
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 227 - 0
web/src/main/java/com/jpsoft/railroad/modules/base/controller/NetworkNoticeController.java

@@ -0,0 +1,227 @@
+package com.jpsoft.railroad.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.utils.PojoUtils;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.jpsoft.railroad.modules.common.dto.MessageResult;
+import com.jpsoft.railroad.modules.base.entity.NetworkNotice;
+import com.jpsoft.railroad.modules.base.service.NetworkNoticeService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/networkNotice")
+public class NetworkNoticeController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private NetworkNoticeService networkNoticeService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<NetworkNotice> create(){
+        MessageResult<NetworkNotice> msgResult = new MessageResult<>();
+
+        NetworkNotice networkNotice = new NetworkNotice();
+
+        msgResult.setData(networkNotice);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<NetworkNotice> add(@RequestBody NetworkNotice networkNotice,@RequestAttribute String subject){
+        MessageResult<NetworkNotice> msgResult = new MessageResult<>();
+
+        try {
+            networkNotice.setId(UUID.randomUUID().toString());
+			networkNotice.setDelFlag(false);
+            networkNotice.setCreateBy(subject);
+            networkNotice.setCreateTime(new Date());
+
+            int affectCount = networkNoticeService.insert(networkNotice);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(networkNotice);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<NetworkNotice> edit(@PathVariable("id") String id){
+        MessageResult<NetworkNotice> msgResult = new MessageResult<>();
+
+        try {
+            NetworkNotice networkNotice = networkNoticeService.get(id);
+
+            if (networkNotice != null) {
+                msgResult.setResult(true);
+                msgResult.setData(networkNotice);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<NetworkNotice> update(@RequestBody NetworkNotice networkNotice,@RequestAttribute String subject){
+        MessageResult<NetworkNotice> msgResult = new MessageResult<>();
+
+        try {
+		    networkNotice.setUpdateBy(subject);
+            networkNotice.setUpdateTime(new Date());
+		
+            int affectCount = networkNoticeService.update(networkNotice);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(networkNotice);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<NetworkNotice> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<NetworkNotice> msgResult = new MessageResult<>();
+
+        try {
+			
+			NetworkNotice networkNotice = networkNoticeService.get(id);
+            networkNotice.setDelFlag(true);
+            networkNotice.setUpdateBy(subject);
+            networkNotice.setUpdateTime(new Date());
+			
+			int affectCount = networkNoticeService.update(networkNotice);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                NetworkNotice networkNotice = networkNoticeService.get(id);
+                networkNotice.setDelFlag(true);
+                networkNotice.setUpdateBy(subject);
+                networkNotice.setUpdateTime(new Date());
+
+                affectCount += networkNoticeService.update(networkNotice);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<NetworkNotice> page = networkNoticeService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 227 - 0
web/src/main/java/com/jpsoft/railroad/modules/base/controller/NetworkNoticeRalationController.java

@@ -0,0 +1,227 @@
+package com.jpsoft.railroad.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.utils.PojoUtils;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.jpsoft.railroad.modules.common.dto.MessageResult;
+import com.jpsoft.railroad.modules.base.entity.NetworkNoticeRalation;
+import com.jpsoft.railroad.modules.base.service.NetworkNoticeRalationService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/networkNoticeRalation")
+public class NetworkNoticeRalationController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private NetworkNoticeRalationService networkNoticeRalationService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<NetworkNoticeRalation> create(){
+        MessageResult<NetworkNoticeRalation> msgResult = new MessageResult<>();
+
+        NetworkNoticeRalation networkNoticeRalation = new NetworkNoticeRalation();
+
+        msgResult.setData(networkNoticeRalation);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<NetworkNoticeRalation> add(@RequestBody NetworkNoticeRalation networkNoticeRalation,@RequestAttribute String subject){
+        MessageResult<NetworkNoticeRalation> msgResult = new MessageResult<>();
+
+        try {
+            networkNoticeRalation.setId(UUID.randomUUID().toString());
+			networkNoticeRalation.setDelFlag(false);
+            networkNoticeRalation.setCreateBy(subject);
+            networkNoticeRalation.setCreateTime(new Date());
+
+            int affectCount = networkNoticeRalationService.insert(networkNoticeRalation);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(networkNoticeRalation);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<NetworkNoticeRalation> edit(@PathVariable("id") String id){
+        MessageResult<NetworkNoticeRalation> msgResult = new MessageResult<>();
+
+        try {
+            NetworkNoticeRalation networkNoticeRalation = networkNoticeRalationService.get(id);
+
+            if (networkNoticeRalation != null) {
+                msgResult.setResult(true);
+                msgResult.setData(networkNoticeRalation);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<NetworkNoticeRalation> update(@RequestBody NetworkNoticeRalation networkNoticeRalation,@RequestAttribute String subject){
+        MessageResult<NetworkNoticeRalation> msgResult = new MessageResult<>();
+
+        try {
+		    networkNoticeRalation.setUpdateBy(subject);
+            networkNoticeRalation.setUpdateTime(new Date());
+		
+            int affectCount = networkNoticeRalationService.update(networkNoticeRalation);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(networkNoticeRalation);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<NetworkNoticeRalation> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<NetworkNoticeRalation> msgResult = new MessageResult<>();
+
+        try {
+			
+			NetworkNoticeRalation networkNoticeRalation = networkNoticeRalationService.get(id);
+            networkNoticeRalation.setDelFlag(true);
+            networkNoticeRalation.setUpdateBy(subject);
+            networkNoticeRalation.setUpdateTime(new Date());
+			
+			int affectCount = networkNoticeRalationService.update(networkNoticeRalation);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                NetworkNoticeRalation networkNoticeRalation = networkNoticeRalationService.get(id);
+                networkNoticeRalation.setDelFlag(true);
+                networkNoticeRalation.setUpdateBy(subject);
+                networkNoticeRalation.setUpdateTime(new Date());
+
+                affectCount += networkNoticeRalationService.update(networkNoticeRalation);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<NetworkNoticeRalation> page = networkNoticeRalationService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 227 - 0
web/src/main/java/com/jpsoft/railroad/modules/base/controller/OaFileInfoController.java

@@ -0,0 +1,227 @@
+package com.jpsoft.railroad.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.utils.PojoUtils;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.jpsoft.railroad.modules.common.dto.MessageResult;
+import com.jpsoft.railroad.modules.base.entity.OaFileInfo;
+import com.jpsoft.railroad.modules.base.service.OaFileInfoService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/oaFileInfo")
+public class OaFileInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private OaFileInfoService oaFileInfoService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<OaFileInfo> create(){
+        MessageResult<OaFileInfo> msgResult = new MessageResult<>();
+
+        OaFileInfo oaFileInfo = new OaFileInfo();
+
+        msgResult.setData(oaFileInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<OaFileInfo> add(@RequestBody OaFileInfo oaFileInfo,@RequestAttribute String subject){
+        MessageResult<OaFileInfo> msgResult = new MessageResult<>();
+
+        try {
+            oaFileInfo.setId(UUID.randomUUID().toString());
+			oaFileInfo.setDelFlag(false);
+            oaFileInfo.setCreateBy(subject);
+            oaFileInfo.setCreateTime(new Date());
+
+            int affectCount = oaFileInfoService.insert(oaFileInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(oaFileInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<OaFileInfo> edit(@PathVariable("id") String id){
+        MessageResult<OaFileInfo> msgResult = new MessageResult<>();
+
+        try {
+            OaFileInfo oaFileInfo = oaFileInfoService.get(id);
+
+            if (oaFileInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(oaFileInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<OaFileInfo> update(@RequestBody OaFileInfo oaFileInfo,@RequestAttribute String subject){
+        MessageResult<OaFileInfo> msgResult = new MessageResult<>();
+
+        try {
+		    oaFileInfo.setUpdateBy(subject);
+            oaFileInfo.setUpdateTime(new Date());
+		
+            int affectCount = oaFileInfoService.update(oaFileInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(oaFileInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<OaFileInfo> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<OaFileInfo> msgResult = new MessageResult<>();
+
+        try {
+			
+			OaFileInfo oaFileInfo = oaFileInfoService.get(id);
+            oaFileInfo.setDelFlag(true);
+            oaFileInfo.setUpdateBy(subject);
+            oaFileInfo.setUpdateTime(new Date());
+			
+			int affectCount = oaFileInfoService.update(oaFileInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                OaFileInfo oaFileInfo = oaFileInfoService.get(id);
+                oaFileInfo.setDelFlag(true);
+                oaFileInfo.setUpdateBy(subject);
+                oaFileInfo.setUpdateTime(new Date());
+
+                affectCount += oaFileInfoService.update(oaFileInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<OaFileInfo> page = oaFileInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 227 - 0
web/src/main/java/com/jpsoft/railroad/modules/base/controller/OaFileRegUserInfoController.java

@@ -0,0 +1,227 @@
+package com.jpsoft.railroad.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.railroad.modules.common.utils.PojoUtils;
+import com.jpsoft.railroad.modules.common.dto.Sort;
+import com.jpsoft.railroad.modules.common.dto.MessageResult;
+import com.jpsoft.railroad.modules.base.entity.OaFileRegUserInfo;
+import com.jpsoft.railroad.modules.base.service.OaFileRegUserInfoService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/oaFileRegUserInfo")
+public class OaFileRegUserInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private OaFileRegUserInfoService oaFileRegUserInfoService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<OaFileRegUserInfo> create(){
+        MessageResult<OaFileRegUserInfo> msgResult = new MessageResult<>();
+
+        OaFileRegUserInfo oaFileRegUserInfo = new OaFileRegUserInfo();
+
+        msgResult.setData(oaFileRegUserInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<OaFileRegUserInfo> add(@RequestBody OaFileRegUserInfo oaFileRegUserInfo,@RequestAttribute String subject){
+        MessageResult<OaFileRegUserInfo> msgResult = new MessageResult<>();
+
+        try {
+            oaFileRegUserInfo.setId(UUID.randomUUID().toString());
+			oaFileRegUserInfo.setDelFlag(false);
+            oaFileRegUserInfo.setCreateBy(subject);
+            oaFileRegUserInfo.setCreateTime(new Date());
+
+            int affectCount = oaFileRegUserInfoService.insert(oaFileRegUserInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(oaFileRegUserInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<OaFileRegUserInfo> edit(@PathVariable("id") String id){
+        MessageResult<OaFileRegUserInfo> msgResult = new MessageResult<>();
+
+        try {
+            OaFileRegUserInfo oaFileRegUserInfo = oaFileRegUserInfoService.get(id);
+
+            if (oaFileRegUserInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(oaFileRegUserInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<OaFileRegUserInfo> update(@RequestBody OaFileRegUserInfo oaFileRegUserInfo,@RequestAttribute String subject){
+        MessageResult<OaFileRegUserInfo> msgResult = new MessageResult<>();
+
+        try {
+		    oaFileRegUserInfo.setUpdateBy(subject);
+            oaFileRegUserInfo.setUpdateTime(new Date());
+		
+            int affectCount = oaFileRegUserInfoService.update(oaFileRegUserInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(oaFileRegUserInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<OaFileRegUserInfo> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<OaFileRegUserInfo> msgResult = new MessageResult<>();
+
+        try {
+			
+			OaFileRegUserInfo oaFileRegUserInfo = oaFileRegUserInfoService.get(id);
+            oaFileRegUserInfo.setDelFlag(true);
+            oaFileRegUserInfo.setUpdateBy(subject);
+            oaFileRegUserInfo.setUpdateTime(new Date());
+			
+			int affectCount = oaFileRegUserInfoService.update(oaFileRegUserInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                OaFileRegUserInfo oaFileRegUserInfo = oaFileRegUserInfoService.get(id);
+                oaFileRegUserInfo.setDelFlag(true);
+                oaFileRegUserInfo.setUpdateBy(subject);
+                oaFileRegUserInfo.setUpdateTime(new Date());
+
+                affectCount += oaFileRegUserInfoService.update(oaFileRegUserInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<OaFileRegUserInfo> page = oaFileRegUserInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}