diff --git a/pom.xml b/pom.xml
index 7f5b2cfd..bd13167a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -948,7 +948,18 @@
HslCommunication
3.3.0
+
+ com.nimbusds
+ nimbus-jose-jwt
+ 6.0
+
+
+
+ org.codehaus.groovy
+ groovy
+ ${groovy.version}
+
diff --git a/src/main/java/com/jeecg/demo/controller/JeecgFormDemoController.java b/src/main/java/com/jeecg/demo/controller/JeecgFormDemoController.java
new file mode 100644
index 00000000..7fbe87ab
--- /dev/null
+++ b/src/main/java/com/jeecg/demo/controller/JeecgFormDemoController.java
@@ -0,0 +1,215 @@
+package com.jeecg.demo.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.jeecgframework.core.common.controller.BaseController;
+import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery;
+import org.jeecgframework.core.common.model.json.AjaxJson;
+import org.jeecgframework.core.common.model.json.ComboTree;
+import org.jeecgframework.core.util.JSONHelper;
+import org.jeecgframework.tag.vo.easyui.ComboTreeModel;
+import org.jeecgframework.web.system.pojo.base.TSDepart;
+import org.jeecgframework.web.system.service.SystemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.jeecg.demo.dao.JeecgMinidaoDao;
+
+import net.sf.json.JSONArray;
+
+/**
+ * @author jeecg
+ * @ClassName: JeecgFormDemoController
+ * @Description: TODO(演示例子处理类)
+ */
+@Controller
+@RequestMapping("/jeecgFormDemoController")
+public class JeecgFormDemoController extends BaseController {
+ private static final Logger logger = Logger.getLogger(JeecgFormDemoController.class);
+
+ @Autowired
+ private SystemService systemService;
+
+ @Autowired
+ private JeecgMinidaoDao jeecgMinidaoDao;
+
+ @RequestMapping(params = "uitag")
+ public ModelAndView uitag(HttpServletRequest request) {
+ return new ModelAndView("com/jeecg/demo/form_uitag");
+ }
+
+ @RequestMapping(params = "formValidDemo")
+ public ModelAndView formValidDemo(HttpServletRequest request) {
+ return new ModelAndView("com/jeecg/demo/form_valid");
+ }
+
+ @RequestMapping(params = "testsubmit=1", method = {RequestMethod.GET, RequestMethod.POST})
+ public ModelAndView testsubmit(HttpServletRequest request) {
+ logger.info("请求成功byebye");
+ return new ModelAndView("com/jeecg/demo/form_valid");
+ }
+
+ @RequestMapping(params = "nature")
+ public ModelAndView easyDemo(HttpServletRequest request) {
+ logger.info("demo-nature");
+ //ztree同步加载
+ JSONArray jsonArray = JSONArray.fromObject(getZtreeData());
+ request.setAttribute("regions", jsonArray.toString().replaceAll("pid", "pId"));
+ return new ModelAndView("com/jeecg/demo/form_nature");
+ }
+
+ @RequestMapping(params = "ueditor")
+ public ModelAndView ueditor(HttpServletRequest request) {
+ logger.info("ueditor");
+ return new ModelAndView("com/jeecg/demo/ueditor");
+ }
+
+
+ /**
+ * 下拉联动数据---省市区
+ */
+ @RequestMapping(params = "regionSelect", method = RequestMethod.GET)
+ @ResponseBody
+ public List> cityselect(HttpServletRequest req) throws Exception {
+ logger.info("----省市区联动-----");
+ String pid = req.getParameter("pid");
+ //List> list=jeecgMinidaoDao.getProCity(pid);
+ return jeecgMinidaoDao.getProCity(pid);
+ }
+
+ /**
+ * Ztree
+ * 获取所有的省市区数据
+ *
+ * @return
+ */
+ public List> getZtreeData() {
+ return jeecgMinidaoDao.getAllRegions();
+ }
+
+ /**
+ * 父级DEMO下拉菜单
+ */
+ @RequestMapping(params = "getComboTreeData")
+ @ResponseBody
+ public List getComboTreeData(HttpServletRequest request, ComboTree comboTree) {
+ CriteriaQuery cq = new CriteriaQuery(TSDepart.class);
+ if (comboTree.getId() != null) {
+ cq.eq("TSPDepart.id", comboTree.getId());
+ }
+ if (comboTree.getId() == null) {
+ cq.isNull("TSPDepart");
+ }
+ cq.add();
+ List demoList = systemService.getListByCriteriaQuery(cq, false);
+// List comboTrees = new ArrayList();
+ ComboTreeModel comboTreeModel = new ComboTreeModel("id", "departname", "TSDeparts");
+ List comboTrees = systemService.ComboTree(demoList, comboTreeModel, null, false);
+ return comboTrees;
+ }
+
+ /**
+ * 加载ztree
+ *
+ * @param response
+ * @param request
+ * @return
+ */
+ @RequestMapping(params = "getTreeData", method = {RequestMethod.GET, RequestMethod.POST})
+ @ResponseBody
+ public AjaxJson getTreeData(TSDepart depatr, HttpServletResponse response, HttpServletRequest request) {
+ AjaxJson j = new AjaxJson();
+ try {
+// List depatrList = new ArrayList();
+ StringBuffer hql = new StringBuffer(" from TSDepart t");
+ //hql.append(" and (parent.id is null or parent.id='')");
+ List depatrList = this.systemService.findHql(hql.toString());
+ List> dataList = new ArrayList>();
+ Map map = null;
+ for (TSDepart tsdepart : depatrList) {
+ String sqls = null;
+ Object[] paramss = null;
+ map = new HashMap();
+ map.put("id", tsdepart.getId());
+ map.put("name", tsdepart.getDepartname());
+ if (tsdepart.getTSPDepart() != null) {
+ map.put("pId", tsdepart.getTSPDepart().getId());
+ map.put("open", false);
+ } else {
+ map.put("pId", "1");
+ map.put("open", false);
+ }
+ sqls = "select count(1) from t_s_depart t where t.parentdepartid = ?";
+ paramss = new Object[]{tsdepart.getId()};
+ long counts = this.systemService.getCountForJdbcParam(sqls, paramss);
+ if (counts > 0) {
+ dataList.add(map);
+ } else {
+ TSDepart de = this.systemService.get(TSDepart.class, tsdepart.getId());
+ if (de != null) {
+ map.put("id", de.getId());
+ map.put("name", de.getDepartname());
+ if (tsdepart.getTSPDepart() != null) {
+ map.put("pId", tsdepart.getTSPDepart().getId());
+ map.put("open", false);
+ } else {
+ map.put("pId", "1");
+ map.put("open", false);
+ }
+ dataList.add(map);
+ } else {
+ map.put("open", false);
+ dataList.add(map);
+ }
+ }
+ }
+ j.setObj(dataList);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return j;
+ }
+
+
+ /**
+ * 自动完成请求返回数据
+ *
+ * @param request
+ * @param response
+ */
+ @RequestMapping(params = "getAutocompleteData", method = {RequestMethod.GET, RequestMethod.POST})
+ public void getAutocompleteData(HttpServletRequest request, HttpServletResponse response) {
+ String searchVal = request.getParameter("searchVal");
+ String hql = "from TSUser where userName like '%" + searchVal + "%'";
+ List autoList = systemService.findHql(hql);
+ try {
+ response.setContentType("application/json;charset=UTF-8");
+ response.setHeader("Pragma", "No-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ response.setDateHeader("Expires", 0);
+ response.getWriter().write(JSONHelper.listtojson(new String[]{"userName"}, 1, autoList));
+ response.getWriter().flush();
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ } finally {
+ try {
+ response.getWriter().close();
+ } catch (IOException e) {
+ }
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/jeecg/demo/controller/JeecgListDemoController.java b/src/main/java/com/jeecg/demo/controller/JeecgListDemoController.java
new file mode 100644
index 00000000..6d1b7ed9
--- /dev/null
+++ b/src/main/java/com/jeecg/demo/controller/JeecgListDemoController.java
@@ -0,0 +1,612 @@
+package com.jeecg.demo.controller;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Logger;
+import org.jeecgframework.core.common.controller.BaseController;
+import org.jeecgframework.core.common.exception.BusinessException;
+import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery;
+import org.jeecgframework.core.common.model.json.AjaxJson;
+import org.jeecgframework.core.common.model.json.DataGrid;
+import org.jeecgframework.core.constant.Globals;
+import org.jeecgframework.core.util.DateUtils;
+import org.jeecgframework.core.util.ExceptionUtil;
+import org.jeecgframework.core.util.MyBeanUtils;
+import org.jeecgframework.core.util.ResourceUtil;
+import org.jeecgframework.core.util.StringUtil;
+import org.jeecgframework.p3.core.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants;
+import org.jeecgframework.tag.core.easyui.TagUtil;
+import org.jeecgframework.web.system.pojo.base.TSDepart;
+import org.jeecgframework.web.system.pojo.base.TSLog;
+import org.jeecgframework.web.system.service.SystemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.github.abel533.echarts.Option;
+import com.github.abel533.echarts.axis.CategoryAxis;
+import com.github.abel533.echarts.axis.ValueAxis;
+import com.github.abel533.echarts.code.Trigger;
+import com.github.abel533.echarts.data.PieData;
+import com.github.abel533.echarts.series.Bar;
+import com.github.abel533.echarts.series.Pie;
+import com.jeecg.demo.dao.JeecgMinidaoDao;
+import com.jeecg.demo.entity.JeecgDemoEntity;
+import com.jeecg.demo.entity.JeecgDemoPage;
+import com.jeecg.demo.entity.JeecgLogReport;
+import com.jeecg.demo.service.JeecgDemoServiceI;
+
+/**
+ * @Title: Controller
+ * @Description: jeecg_demo
+ * @author onlineGenerator
+ * @date 2017-03-22 20:11:23
+ * @version V1.0
+ *
+ */
+@Controller
+@RequestMapping("/jeecgListDemoController")
+public class JeecgListDemoController extends BaseController {
+ /**
+ * Logger for this class
+ */
+ private static final Logger logger = Logger.getLogger(JeecgListDemoController.class);
+
+ @Autowired
+ private JeecgDemoServiceI jeecgDemoService;
+ @Autowired
+ private SystemService systemService;
+
+ @Autowired
+ private JeecgMinidaoDao jeecgMinidaoDao;
+
+
+
+ /**
+ * 采用minidao查询数据
+ * @param request
+ * @return
+ */
+ //JeecgListDemoController.do?minidaoListDemo
+ @RequestMapping(params = "minidaoListDemo")
+ public ModelAndView minidaoListDemo(HttpServletRequest request) {
+ return new ModelAndView("com/jeecg/demo/taglist_minidao");
+ }
+
+ /**
+ * 行编辑列表
+ */
+ //JeecgListDemoController.do?rowListDemo
+ @RequestMapping(params = "rowListDemo")
+ public ModelAndView rowListDemo(HttpServletRequest request) {
+ return new ModelAndView("com/jeecg/demo/list_rowedtior");
+ }
+
+ /**
+ * jeecg_demo列表 页面跳转
+ *
+ * @return
+ */
+ @RequestMapping(params = "list")
+ public ModelAndView list(HttpServletRequest request) {
+ return new ModelAndView("com/jeecg/demo/jeecgDemoList");
+ }
+
+ /**
+ * 自定义查询条件
+ */
+ //JeecgListDemoController.do?mysearchListDemo
+ @RequestMapping(params = "mysearchListDemo")
+ public ModelAndView mysearchListDemo(HttpServletRequest request) {
+ return new ModelAndView("com/jeecg/demo/taglist_mysearch");
+ }
+
+
+ @RequestMapping(params = "minidaoDatagrid")
+ public void minidaoDatagrid(JeecgDemoEntity jeecgDemo,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
+ /**
+ * 注意：minidao会遵循springjdbc规则，会自动把数据库以下划线的字段，转化为驼峰写法
+ * 例如数据库表字段：{USER_NAME}
+ * 转化实体对应字段：{userName}
+ */
+ List list = jeecgMinidaoDao.getAllEntities(jeecgDemo, dataGrid.getPage(), dataGrid.getRows());
+ Integer count = jeecgMinidaoDao.getCount();
+ dataGrid.setTotal(count);
+ dataGrid.setResults(list);
+ String total_salary = String.valueOf(jeecgMinidaoDao.getSumSalary());
+ /*
+ * 说明：格式为 字段名:值(可选，不写该值时为分页数据的合计) 多个合计 以 , 分割
+ */
+ dataGrid.setFooter("salary:"+(total_salary.equalsIgnoreCase("null")?"0.0":total_salary)+",age,email:合计");
+ TagUtil.datagrid(response, dataGrid);
+ }
+
+
+ /**
+ * easyui AJAX请求数据
+ *
+ * @param request
+ * @param response
+ * @param dataGrid
+ */
+
+ @RequestMapping(params = "datagrid")
+ public void datagrid(JeecgDemoEntity jeecgDemo,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
+ CriteriaQuery cq = new CriteriaQuery(JeecgDemoEntity.class, dataGrid);
+ //查询条件组装器
+ org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, jeecgDemo, request.getParameterMap());
+ try{
+ //自定义追加查询条件
+ }catch (Exception e) {
+ throw new BusinessException(e.getMessage());
+ }
+ cq.add();
+ this.jeecgDemoService.getDataGridReturn(cq, true);
+ //String total_salary = String.valueOf(jeecgMinidaoDao.getSumSalary());
+ /*
+ * 说明：格式为 字段名:值(可选，不写该值时为分页数据的合计) 多个合计 以 , 分割
+ */
+ //dataGrid.setFooter("salary:"+(total_salary.equalsIgnoreCase("null")?"0.0":total_salary)+",age,email:合计");
+ List list=dataGrid.getResults();
+ Map> extMap = new HashMap>();
+ for(JeecgDemoEntity temp:list){
+ //此为针对原来的行数据，拓展的新字段
+ Map m = new HashMap();
+ m.put("extField",this.jeecgMinidaoDao.getOrgCode(temp.getDepId()));
+ extMap.put(temp.getId(), m);
+ }
+ //dataGrid.setFooter("extField,salary,age,name:合计");
+ TagUtil.datagrid(response, dataGrid,extMap);
+ dataGrid.setFooter("salary,age,name:合计");
+ TagUtil.datagrid(response, dataGrid);
+ }
+
+ @RequestMapping(params = "addTab")
+ public ModelAndView addTab(HttpServletRequest request) {
+ //String type = oConvertUtils.getString(request.getParameter("type"));
+ return new ModelAndView("com/jeecg/demo/demoTab");
+
+ }
+
+ @RequestMapping(params = "goCheck")
+ public ModelAndView goCheck( HttpServletRequest request) {
+ logger.info("----审核-----");
+ String id=request.getParameter("id");
+ if (StringUtil.isNotEmpty(id)) {
+ JeecgDemoEntity jeecgDemo = jeecgDemoService.getEntity(JeecgDemoEntity.class, id);
+ request.setAttribute("jeecgDemoPage", jeecgDemo);
+ }
+ return new ModelAndView("com/jeecg/demo/jeecgDemo-check");
+
+ }
+
+ @RequestMapping(params = "doCheck")
+ @ResponseBody
+ public AjaxJson doCheck(String content,String id,String status) {
+ logger.info("-------审核意见:"+content);//demo简单作打印,实际项目可酌情处理
+ String message = null;
+ AjaxJson j = new AjaxJson();
+ JeecgDemoEntity jeecgDemo = systemService.getEntity(JeecgDemoEntity.class, id);
+ message = "审核成功";
+ try{
+ jeecgDemo.setStatus(status);
+ this.jeecgDemoService.updateEntitie(jeecgDemo);
+ systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
+ }catch(Exception e){
+ e.printStackTrace();
+ message = "审核失败";
+ throw new BusinessException(e.getMessage());
+ }
+ j.setMsg(message);
+ return j;
+ }
+ @RequestMapping(params = "addWithbtn")
+ public ModelAndView addWithbtn(HttpServletRequest request) {
+ return new ModelAndView("com/jeecg/demo/jeecgDemo-add-btn");
+
+ }
+
+ /**
+ * JeecgDemo 打印预览跳转
+ * @param jeecgDemo
+ * @param req
+ * @return
+ */
+ @RequestMapping(params = "print")
+ public ModelAndView print(JeecgDemoEntity jeecgDemo, HttpServletRequest req) {
+ // 获取部门信息
+ List departList = systemService.getList(TSDepart.class);
+ req.setAttribute("departList", departList);
+
+ if (StringUtil.isNotEmpty(jeecgDemo.getId())) {
+ jeecgDemo = jeecgDemoService.getEntity(JeecgDemoEntity.class, jeecgDemo.getId());
+ req.setAttribute("jgDemo", jeecgDemo);
+ if ("0".equals(jeecgDemo.getSex())) {
+ req.setAttribute("sex", "男");
+ }
+ if ("1".equals(jeecgDemo.getSex())) {
+ req.setAttribute("sex", "女");
+ }
+ }
+ return new ModelAndView("com/jeecg/demo/jeecgDemo-print");
+ }
+
+ /**
+ * 删除jeecg_demo
+ *
+ * @return
+ */
+ @RequestMapping(params = "doDel")
+ @ResponseBody
+ public AjaxJson doDel(JeecgDemoEntity jeecgDemo, HttpServletRequest request) {
+ String message = null;
+ AjaxJson j = new AjaxJson();
+ jeecgDemo = systemService.getEntity(JeecgDemoEntity.class, jeecgDemo.getId());
+ message = "删除成功";
+ try{
+ jeecgDemoService.delete(jeecgDemo);
+ systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
+ }catch(Exception e){
+ e.printStackTrace();
+ message = "删除失败";
+ throw new BusinessException(e.getMessage());
+ }
+ j.setMsg(message);
+ return j;
+ }
+
+ /**
+ * 批量删除jeecg_demo
+ *
+ * @return
+ */
+ @RequestMapping(params = "doBatchDel")
+ @ResponseBody
+ public AjaxJson doBatchDel(String ids,HttpServletRequest request){
+ String message = null;
+ AjaxJson j = new AjaxJson();
+ message = "删除成功";
+ try{
+ for(String id:ids.split(",")){
+ JeecgDemoEntity jeecgDemo = systemService.getEntity(JeecgDemoEntity.class,
+ id
+ );
+ jeecgDemoService.delete(jeecgDemo);
+ systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ message = "删除失败";
+ throw new BusinessException(e.getMessage());
+ }
+ j.setMsg(message);
+ return j;
+ }
+
+
+ /**
+ * 添加jeecg_demo
+ *
+ * @param jeecgDemo
+ * @return
+ */
+ @RequestMapping(params = "doAdd")
+ @ResponseBody
+ public AjaxJson doAdd(JeecgDemoEntity jeecgDemo, HttpServletRequest request) {
+ String message = null;
+ AjaxJson j = new AjaxJson();
+ message = "添加成功";
+ try{
+ jeecgDemoService.save(jeecgDemo);
+ systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO);
+ }catch(Exception e){
+ e.printStackTrace();
+ message = "添加失败";
+ throw new BusinessException(e.getMessage());
+ }
+ j.setMsg(message);
+ return j;
+ }
+
+ /**
+ * 更新jeecg_demo
+ *
+ * @param jeecgDemo
+ * @return
+ */
+ @RequestMapping(params = "doUpdate")
+ @ResponseBody
+ public AjaxJson doUpdate(JeecgDemoEntity jeecgDemo, HttpServletRequest request) {
+ String message = null;
+ AjaxJson j = new AjaxJson();
+ message = "更新成功";
+ JeecgDemoEntity t = jeecgDemoService.get(JeecgDemoEntity.class, jeecgDemo.getId());
+ try {
+ MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t);
+ jeecgDemoService.saveOrUpdate(t);
+ systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ message = "更新失败";
+ throw new BusinessException(e.getMessage());
+ }
+ j.setMsg(message);
+ return j;
+ }
+
+
+ /**
+ * jeecg_demo新增页面跳转
+ *
+ * @return
+ */
+ @RequestMapping(params = "goAdd")
+ public ModelAndView goAdd(JeecgDemoEntity jeecgDemo, HttpServletRequest req) {
+ if (StringUtil.isNotEmpty(jeecgDemo.getId())) {
+ jeecgDemo = jeecgDemoService.getEntity(JeecgDemoEntity.class, jeecgDemo.getId());
+ req.setAttribute("jeecgDemoPage", jeecgDemo);
+ }
+ return new ModelAndView("com/jeecg/demo/jeecgDemo-add");
+ }
+ /**
+ * jeecg_demo编辑页面跳转
+ *
+ * @return
+ */
+ @RequestMapping(params = "goUpdate")
+ public ModelAndView goUpdate(JeecgDemoEntity jeecgDemo, HttpServletRequest req) {
+ if (StringUtil.isNotEmpty(jeecgDemo.getId())) {
+ jeecgDemo = jeecgDemoService.getEntity(JeecgDemoEntity.class, jeecgDemo.getId());
+ req.setAttribute("jeecgDemoPage", jeecgDemo);
+ }
+ return new ModelAndView("com/jeecg/demo/jeecgDemo-update");
+ }
+
+ /**
+ * 导入功能跳转
+ *
+ * @return
+ */
+ @RequestMapping(params = "upload")
+ public ModelAndView upload(HttpServletRequest req) {
+ req.setAttribute("controller_name","JeecgListDemoController");
+ return new ModelAndView("common/upload/pub_excel_upload");
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param response
+ */
+ @RequestMapping(params = "exportXls")
+ public String exportXls(JeecgDemoEntity jeecgDemo,HttpServletRequest request,HttpServletResponse response
+ , DataGrid dataGrid,ModelMap modelMap) {
+ CriteriaQuery cq = new CriteriaQuery(JeecgDemoEntity.class, dataGrid);
+ org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, jeecgDemo, request.getParameterMap());
+ List jeecgDemos = this.jeecgDemoService.getListByCriteriaQuery(cq,false);
+ modelMap.put(NormalExcelConstants.FILE_NAME,"jeecg_demo");
+ modelMap.put(NormalExcelConstants.CLASS,JeecgDemoEntity.class);
+ modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("jeecg_demo列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(),"导出信息"));
+ modelMap.put(NormalExcelConstants.DATA_LIST,jeecgDemos);
+ return NormalExcelConstants.JEECG_EXCEL_VIEW;
+ }
+ /**
+ * 导出excel 使模板
+ *
+ * @param request
+ * @param response
+ */
+ @RequestMapping(params = "exportXlsByT")
+ public String exportXlsByT(JeecgDemoEntity jeecgDemo,HttpServletRequest request,HttpServletResponse response
+ , DataGrid dataGrid,ModelMap modelMap) {
+ modelMap.put(NormalExcelConstants.FILE_NAME,"jeecg_demo");
+ modelMap.put(NormalExcelConstants.CLASS,JeecgDemoEntity.class);
+ modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("jeecg_demo列表", "导出人:"+ResourceUtil.getSessionUserName().getRealName(),
+ "导出信息"));
+ modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList());
+ return NormalExcelConstants.JEECG_EXCEL_VIEW;
+ }
+
+ @SuppressWarnings("unchecked")
+ @RequestMapping(params = "importExcel", method = RequestMethod.POST)
+ @ResponseBody
+ public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) {
+ AjaxJson j = new AjaxJson();
+
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map fileMap = multipartRequest.getFileMap();
+ for (Map.Entry entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();// 获取上传文件对象
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setNeedSave(true);
+ try {
+ List listJeecgDemoEntitys = ExcelImportUtil.importExcel(file.getInputStream(),JeecgDemoEntity.class,params);
+ for (JeecgDemoEntity jeecgDemo : listJeecgDemoEntitys) {
+ jeecgDemoService.save(jeecgDemo);
+ }
+ j.setMsg("文件导入成功！");
+ } catch (Exception e) {
+ j.setMsg("文件导入失败！");
+ logger.error(ExceptionUtil.getExceptionMessage(e));
+ }finally{
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return j;
+ }
+
+ @RequestMapping(method = RequestMethod.GET)
+ @ResponseBody
+ public List list() {
+ List listJeecgDemos=jeecgDemoService.getList(JeecgDemoEntity.class);
+ return listJeecgDemos;
+ }
+
+ /**
+ * 保存新增/更新的行数据
+ * @param page
+ * @return
+ */
+ @RequestMapping(params = "saveRows")
+ @ResponseBody
+ public AjaxJson saveRows(JeecgDemoPage page){
+ String message = null;
+ List demos=page.getDemos();
+ AjaxJson j = new AjaxJson();
+ if(CollectionUtils.isNotEmpty(demos)){
+ for(JeecgDemoEntity jeecgDemo:demos){
+ if (StringUtil.isNotEmpty(jeecgDemo.getId())) {
+ JeecgDemoEntity t =jeecgDemoService.get(JeecgDemoEntity.class, jeecgDemo.getId());
+ try {
+ message = "JeecgDemo例子: " + jeecgDemo.getName() + "被更新成功";
+ MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t);
+ jeecgDemoService.saveOrUpdate(t);
+ systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ try {
+ message = "JeecgDemo例子: " + jeecgDemo.getName() + "被添加成功";
+ //jeecgDemo.setStatus("0");
+ jeecgDemoService.save(jeecgDemo);
+ systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
+ }
+ return j;
+ }
+
+ //jeecgListDemoController.do?log
+ @RequestMapping(params = "log")
+ public ModelAndView log() {
+ return new ModelAndView("com/jeecg/demo/logList");
+ }
+
+ //jeecgListDemoController.do?logDatagrid
+ @RequestMapping(params = "logDatagrid")
+ public void logDatagrid(HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
+ CriteriaQuery cq = new CriteriaQuery(TSLog.class, dataGrid);
+
+ //日志级别查询条件
+ String loglevel = request.getParameter("loglevel");
+ if (loglevel != null && !"0".equals(loglevel)) {
+ cq.eq("loglevel", org.jeecgframework.core.util.oConvertUtils.getShort(loglevel));
+ cq.add();
+ }
+ //时间范围查询条件
+ String operatetime_begin = request.getParameter("operatetime_begin");
+ String operatetime_end = request.getParameter("operatetime_end");
+ if(oConvertUtils.isNotEmpty(operatetime_begin)){
+ try {
+ cq.ge("operatetime", DateUtils.parseDate(operatetime_begin, "yyyy-MM-dd hh:mm:ss"));
+ } catch (ParseException e) {
+ logger.error(e);
+ }
+ cq.add();
+ }
+ if(oConvertUtils.isNotEmpty(operatetime_end)){
+ try {
+ cq.le("operatetime", DateUtils.parseDate(operatetime_end, "yyyy-MM-dd hh:mm:ss"));
+ } catch (ParseException e) {
+ logger.error(e);
+ }
+ cq.add();
+ }
+ this.systemService.getDataGridReturn(cq, true);
+ TagUtil.datagrid(response, dataGrid);
+ }
+
+ @RequestMapping(params = "goOnlyData")
+ public ModelAndView goOnlyData(HttpServletRequest req,JeecgLogReport log) {
+ return new ModelAndView("com/jeecg/demo/logrp-onlyData");
+ }
+
+ @RequestMapping(params = "logrpDatagrid")
+ public void logrpDatagrid(HttpServletResponse response,JeecgLogReport log, DataGrid dataGrid) {
+ //CriteriaQuery cq = new CriteriaQuery(JeecgLogReport.class, dataGrid);
+ List list=this.jeecgMinidaoDao.getLogReportData(log);
+ dataGrid.setResults(list);
+ TagUtil.datagrid(response, dataGrid);
+ }
+
+ @RequestMapping(params = "goChart")
+ public ModelAndView goChart(HttpServletRequest req,JeecgLogReport log) {
+ List> list=this.jeecgMinidaoDao.getLogChartData(log);
+ net.sf.json.JSONArray arr=net.sf.json.JSONArray.fromObject(list);
+ req.setAttribute("logs",arr);
+ return new ModelAndView("com/jeecg/demo/logrp-chart");
+ }
+ @RequestMapping(params = "goEchart")
+ public ModelAndView goEchart(HttpServletRequest req,JeecgLogReport log) {
+ return new ModelAndView("com/jeecg/demo/echart");
+ }
+ @RequestMapping(params = "doEchart",method ={RequestMethod.GET, RequestMethod.POST})
+ @ResponseBody
+ public AjaxJson doEchart(HttpServletRequest req,JeecgLogReport log) {
+ //创建Option
+ Option option = new Option();
+ option.title("日志").tooltip(Trigger.axis).legend("登录次数");
+ //横轴为值轴
+ option.xAxis(new ValueAxis().boundaryGap(0d, 0.01));
+ //创建类目轴
+ CategoryAxis category = new CategoryAxis();
+ //柱状数据
+ Bar bar = new Bar("登录次数");
+ //饼图数据
+ Pie pie = new Pie("登录次数");
+ //循环数据
+ List> list=this.jeecgMinidaoDao.getLogChartData(log);
+
+ for (Map objectMap : list) {
+ //设置类目
+ category.data(objectMap.get("name"));
+ //类目对应的柱状图
+ bar.data(objectMap.get("value"));
+ //饼图数据
+ System.out.println("value************"+objectMap.get("value"));
+ pie.data(new PieData(objectMap.get("name").toString(), objectMap.get("value")));
+ }
+ //设置类目轴
+ option.yAxis(category);
+ //饼图的圆心和半径
+ pie.center(900,380).radius(100);
+ //设置数据
+ option.series(bar, pie);
+
+
+ AjaxJson j = new AjaxJson();
+ j.setObj(option);
+ System.out.println(j.toString());
+ return j;
+ }
+}
diff --git a/src/main/java/com/jeecg/demo/dao/JeecgMinidaoDao.java b/src/main/java/com/jeecg/demo/dao/JeecgMinidaoDao.java
new file mode 100644
index 00000000..64c2f331
--- /dev/null
+++ b/src/main/java/com/jeecg/demo/dao/JeecgMinidaoDao.java
@@ -0,0 +1,91 @@
+package com.jeecg.demo.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zzjee.ba.entity.BaGoodsCategoryEntity;
+import com.zzjee.ba.vo.BaGoodsCategoryVoo;
+import org.jeecgframework.minidao.annotation.Arguments;
+import org.jeecgframework.minidao.annotation.MiniDao;
+import org.jeecgframework.minidao.annotation.ResultType;
+import org.jeecgframework.minidao.annotation.Sql;
+
+import com.jeecg.demo.entity.JeecgDemoEntity;
+import com.jeecg.demo.entity.JeecgLogReport;
+
+/**
+ * Minidao例子
+ *
+ */
+@MiniDao
+public interface JeecgMinidaoDao {
+
+ /**
+ * @Description
+ * @Author xushanchang
+ * @Date 2021/7/411:08
+ * @Param
+ * @return
+ **/
+ @Arguments("pid")
+ @Sql("select ID,NAME,PID from t_s_region where pid=:pid order by name_en")
+ List> getProCity(String pid);
+
+ @Sql("select ID,NAME,PID from t_s_region order by name_en")
+ List> getAllRegions();
+
+ @Sql("select ID,category_name as categoryName,PID,category_level categoryLevel from ba_goods_category ")
+ List getAllBaGoodsCategorys();
+
+ @Arguments("pid")
+ @Sql("select ID,category_name as categoryName,PID from ba_goods_category where pid=:pid")
+ List getAllBaGoodsCategorys(String pid);
+
+ @Arguments({"jeecgDemo", "page", "rows"})
+ @ResultType(JeecgDemoEntity.class)
+ public List getAllEntities(JeecgDemoEntity jeecgDemo, int page, int rows);
+
+ @Arguments({"baGoodsCategory", "page", "rows"})
+ @ResultType(BaGoodsCategoryEntity.class)
+ public List getAllEntities(BaGoodsCategoryEntity baGoodsCategory, int page, int rows);
+
+ @Sql("SELECT count(*) FROM jeecg_demo")
+ Integer getCount();
+
+ @Sql("SELECT SUM(salary) FROM jeecg_demo")
+ Integer getSumSalary();
+
+ @Arguments("id")
+ @ResultType(String.class)
+ @Sql("SELECT org_code FROM t_s_depart where id=:id")
+ public java.lang.String getOrgCode(String id);
+
+ /*@Arguments({"jeecgMinidao", "page", "rows"})
+ public List