提交修改

modules/boe-module-savelog/src/main/java/com/xboe/module/autolog/dao/SysLogActionDao.java

@@ -0,0 +1,45 @@
+package com.xboe.module.autolog.dao;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+
+import com.xboe.common.OrderCondition;
+import com.xboe.common.PageList;
+import com.xboe.core.orm.BaseDao;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.core.orm.IFieldFilter;
+import com.xboe.core.orm.LikeMatchMode;
+import com.xboe.module.autolog.entity.SysLogAction;
+
+@Repository
+public class SysLogActionDao extends BaseDao<SysLogAction> {
+
+    /**
+     * 分页查询
+     *
+     * @param pageIndex
+     * @param pageSize
+     * @param entity
+     * @param order
+     * @return
+     */
+//    public PageList<SysLogAction> query(int pageIndex, int pageSize, SysLogActionVo entity, OrderCondition order) {
+//        List<IFieldFilter> filters = new ArrayList<>();
+//        if (entity != null) {
+//            if (StringUtils.isNotBlank(entity.getName())) {
+//                filters.add(FieldFilters.like("name", LikeMatchMode.ANYWHERE, entity.getName()));
+//            }
+//
+//            if (entity.getActTimeStart() != null && entity.getActTimeEnd() != null) {
+//                LocalDateTime start = entity.getActTimeStart().atTime(0, 0, 0);
+//                LocalDateTime end = entity.getActTimeEnd().atTime(23, 59, 59);
+//                filters.add(FieldFilters.between("actTime", start, end));
+//            }
+//        }
+//        return this.getGenericDao().findPage(pageIndex, pageSize, getEntityClass(), filters, order);
+//    }
+}

modules/boe-module-savelog/src/main/java/com/xboe/module/autolog/entity/SysLogAction.java

@@ -0,0 +1,59 @@
+package com.xboe.module.autolog.entity;
+
+import java.time.LocalDateTime;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xboe.core.SysConstant;
+import com.xboe.core.orm.IdEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 系统操作日志表
+ */
+@Data
+@EqualsAndHashCode(callSuper=true)
+@Entity
+@Table(name = SysConstant.TABLE_PRE+"log_action")
+public class SysLogAction extends IdEntity{
+
+
+	private static final long serialVersionUID = 1L;
+
+	/**账号id*/
+	@Column(name = "aid", nullable = false,length=20)
+	private String aid;
+	
+	
+	/**姓名*/
+	@Column(name = "name", nullable = true,length=30)
+	private String name;
+	
+	/**模块*/
+	@Column(name = "module", nullable = true,length=50)
+	private String module;
+	
+	/**操作的功能模块*/
+	@Column(name = "act_name", nullable = true,length=100)
+	private String actName;
+	
+	/**操作类型*/
+	@Column(name = "act_type", nullable = true,length=50)
+	private String actType;
+	
+	/**操作内容*/
+	@Column(name = "act_content", nullable = true,length=200)
+	private String actContent;
+	
+	/**
+	 * 操作时间
+	 */
+	@Column(name = "act_time", nullable = true)
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime actTime;
+}

modules/boe-module-savelog/src/main/java/com/xboe/module/autolog/service/impl/ActionAutoLogSaveImpl.java

@@ -0,0 +1,22 @@
+package com.xboe.module.autolog.service.impl;
+
+import javax.transaction.Transactional;
+
+import org.springframework.stereotype.Service;
+
+import com.xboe.core.log.IAutoLogSave;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+public class ActionAutoLogSaveImpl implements IAutoLogSave{
+
+	@Override
+	@Transactional
+	public void save(String module, String actName, String actContent, String aid, String name) {
+		
+		log.error("未实现操作日志保存接口");
+	}
+
+}

modules/boe-module-savelog/src/main/java/com/xboe/module/idconfig/service/IIPMappingService.java

@@ -1,14 +0,0 @@
-package com.xboe.module.idconfig.service;
-
-import java.util.List;
-
-import com.xboe.module.idconfig.entity.IPMapping;
-
-public interface IIPMappingService {
-
-	IPMapping findByIP(String ip);
-	
-	void save(IPMapping ipm);
-	
-	List<IPMapping> getAll();
-}