--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/log/LogController.java

 package com.zrqx.sysuser.bg.controller.log;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.core.commons.model.sysuser.Log;
+import com.zrqx.core.util.excelutil.ExcelUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.bg.service.log.LogService;
 import com.zrqx.sysuser.commons.form.bg.log.LogForm;
+import com.zrqx.sysuser.commons.vo.bg.log.ExcelLogExportVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,4 +51,26 @@ public class LogController {
 	public CallBack<Log> save(@PathVariable Integer oid) {
 		return CallBack.success(logService.selectByPrimaryKey(oid));
 	}
+	
+	@ApiOperation("导出日志Excel")
+	@GetMapping("/export")
+	public CallBack<?> exportLog(LogForm logQuery, HttpServletRequest request,
+			HttpServletResponse response) {
+		// 查询条件 query
+		List<Log> list = logService.exportLog(logQuery);
+		list.forEach(f -> {
+			if(StringUtils.isNotBlank(f.getDescription())) {
+				if(f.getDescription().length()>32766) {	
+					f.setDescription(f.getDescription().substring(0, 32767));
+				}
+			}
+		});
+		try {
+			ExcelUtil.getInstance().exportExcel(list, ExcelLogExportVO.class,
+					"日志信息.xls", response, request);
+		} catch (Exception e) {
+			return CallBack.fail(e.getMessage());
+		}
+		return CallBack.success();
+	}
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/log/LogService.java

 package com.zrqx.sysuser.bg.service.log;
 
+import java.util.List;
+
 import com.zrqx.core.commons.model.sysuser.Log;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
@@ -8,4 +10,6 @@ import com.zrqx.sysuser.commons.form.bg.log.LogForm;
 
 public interface LogService extends BaseService<Log, Integer> {
 	PageInfo<Log> queryByCriteria(LogForm logQuery, PageParam pageParam);
+
+	List<Log> exportLog(LogForm logQuery);
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/log/LogServiceImpl.java

 package com.zrqx.sysuser.bg.service.log;
 
+import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +55,24 @@ public class LogServiceImpl extends BaseServiceImpl<Log, Integer> implements Log
 		return queryExample(pageParam,example);
 	}
 
+	@Override
+	public List<Log> exportLog(LogForm logQuery) {
+		Example example = new Example(Log.class);
+		Criteria createCriteria = example.createCriteria();
+		if (logQuery != null) {
+			if (StringUtils.isNotBlank(logQuery.getCreaterName())) {
+				createCriteria.andLike("createrAccount", "%"+logQuery.getCreaterName()+"%");
+			}
+			if (StringUtils.isNotBlank(logQuery.getBeginTime())) {
+				createCriteria.andGreaterThanOrEqualTo("createTime", logQuery.getBeginTime()+" 00:00:00");
+			}
+			if (StringUtils.isNotBlank(logQuery.getEndTime())) {
+				createCriteria.andLessThanOrEqualTo("createTime", logQuery.getEndTime()+" 23:59:59");
+			}
+		}
+		return logMapper.selectByExample(example);
+	}
+
 	
 	
 }

app/sysuser/src/main/java/com/zrqx/sysuser/commons/vo/bg/log/ExcelLogExportVO.java

+package com.zrqx.sysuser.commons.vo.bg.log;
+
+import com.zrqx.core.util.excelutil.ExcelResources;
+
+import lombok.Data;
+@Data
+public class ExcelLogExportVO {
+
+	@ExcelResources(title="操作人",order=1)
+	private String createrAccount;
+	
+	@ExcelResources(title="IP",order=2)
+	private String ip;
+	
+	@ExcelResources(title="操作时间",order=3)
+	private String createTime;
+	
+	@ExcelResources(title="描述",order=4)
+	private String description;
+}