搭建系统环境

pom.xml

@@ -113,6 +113,14 @@
     <build>
         <finalName>djfp</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <description>浦北-党建扶贫系统</description>

src/main/java/com/lsw/Application.java

@@ -131,7 +131,7 @@ public class Application extends JFinalConfig {
         me.addSharedFunction("/WEB-INF/view/admin/common/header.html");
         //js集合
         me.addSharedFunction("/WEB-INF/view/admin/common/js_include.html");
-        //表单操作按钮
+        //表单操作按钮PropKit.get("systemName")
         me.addSharedFunction("/WEB-INF/view/admin/common/op_button.html");
         //角色操作按钮
         me.addSharedFunction("/WEB-INF/view/admin/common/role_menu.html");

src/main/java/com/lsw/controller/admin/system/menu/MenuController.java

@@ -122,4 +122,13 @@ public class MenuController extends BaseController {
         List<Menu> menu_list = menuService.getMenuList();
         renderJson(menu_list);
     }
+
+
+    /**
+     * 树型菜单json数据
+     */
+    public void getTreeJson2() {
+        List<Menu> menu_list = menuService.getMenuList2();
+        renderJson(menu_list);
+    }
 }

src/main/java/com/lsw/controller/admin/system/menu/MenuService.java

@@ -38,6 +38,15 @@ public class MenuService {
         List<Menu> list = dao.find(dao.getSql("menu.getMenuList"));
         return list;
     }
+    /**
+     * 查询菜单资源列表
+     *
+     * @return
+     */
+    public List<Menu> getMenuList2() {
+        List<Menu> list = dao.find(dao.getSql("menu.getMenuList2"));
+        return list;
+    }
 
     /**
      * 通过获取xx/list的url查询菜单进而通过菜单的pid查询该菜单下面的授权按钮

src/main/java/com/lsw/controller/admin/work/apply/ApplyController.java

@@ -1,82 +0,0 @@
-package com.lsw.controller.admin.work.apply;
-
-import com.jfinal.kit.JsonKit;
-import com.jfinal.plugin.activerecord.Db;
-import com.jfinal.plugin.activerecord.Page;
-import com.lsw.base.BaseController;
-import com.lsw.model.Apply;
-import com.lsw.model.Process;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-
-import java.util.List;
-
-/**
- * @author 李书文
- * @description 申请单管理
- */
-public class ApplyController extends BaseController {
-
-    /**
-     * 管理页面
-     */
-    @RequiresPermissions("apply:list")
-    public void list() {
-        render("list.html");
-    }
-
-    /**
-     * 获取角色json数据
-     */
-    public void jsonList() {
-        Page<Apply> pgaeList = Apply.dao.jsonList(getPage(), getRows(), getPara("name"), getSidx(), getSord());
-        for (Apply apply : pgaeList.getList()) {
-            Process process = Process.dao.findFirst("select * from tb_process where pId=? and steps=?", apply.getProcessId(), apply.getSteps());
-            if(process==null){
-                apply.put("now", "结束");
-            }else{
-                apply.put("now", process.getName());
-            }
-        }
-        renderJson(getPage(pgaeList));
-    }
-
-
-    /**
-     * 视图页面
-     */
-    public void view() {
-        String op = getPara("op");
-        setAttr("op", op);
-        if (op.equals("add")) {
-            render("form.html");
-        }
-        if (op.equals("edit")) {
-            Apply apply = Apply.dao.selectById(getParaToInt("id"));
-            List<Process> step_list = Process.dao.find("select * from tb_process where pId=?", apply.getProcessId());
-            setAttr("apply", apply);
-            setAttr("now", getPara("now"));
-            setAttr("step_list", JsonKit.toJson(step_list));
-            render("form.html");
-        }
-    }
-
-
-    /**
-     * 编辑角色
-     */
-    @RequiresPermissions("apply:edit")
-    public void edit() {
-        Apply apply = getModel(Apply.class, "", true);
-        apply.update();
-        renderSuccess();
-    }
-
-    /**
-     * 删除
-     */
-    @RequiresPermissions("apply:delete")
-    public void delete() {
-        Db.update("delete from tb_apply where id in(" + getPara("ids") + ")");
-        renderSuccess();
-    }
-}

src/main/java/com/lsw/controller/admin/work/constant/ConstantController.java

@@ -1,79 +0,0 @@
-package com.lsw.controller.admin.work.constant;
-
-import com.jfinal.plugin.activerecord.Db;
-import com.jfinal.plugin.activerecord.Page;
-import com.lsw.base.BaseController;
-import com.lsw.model.Constant;
-import com.lsw.model.Role;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-
-import java.util.List;
-
-/**
- * @author 李书文
- * @description 平台常量管理
- */
-public class ConstantController extends BaseController {
-
-    /**
-     * 管理页面
-     */
-    @RequiresPermissions("constant:list")
-    public void list() {
-        List<Constant> constant_list = Constant.dao.find("select * from tb_constant where type=0");
-        setAttr("constant_list", constant_list);
-        render("list.html");
-    }
-
-    /**
-     * 获取角色json数据
-     */
-    public void jsonList() {
-        Page<Constant> pgaeList = Constant.dao.jsonList(getPage(), getRows(), getPara("name"), getPara("type"), getSidx(), getSord());
-        renderJson(getPage(pgaeList));
-    }
-
-    /**
-     * 视图页面
-     */
-    public void view() {
-        String op = getPara("op");
-        List<Constant> constant_list = Constant.dao.find("select * from tb_constant where type=0");
-        if (op.equals("edit")) {
-            Constant constant = Constant.dao.findById(getPara("id"));
-            setAttr("constant", constant);
-        }
-        setAttr("op", op);
-        setAttr("constant_list", constant_list);
-        render(op.equals("add") || op.equals("edit") ? "form.html" : "authorization.html");
-    }
-
-    /**
-     * 添加角色
-     */
-    @RequiresPermissions("constant:add")
-    public void add() {
-        Constant constant = getModel(Constant.class, "", true);
-        constant.save();
-        renderSuccess();
-    }
-
-    /**
-     * 编辑角色
-     */
-    @RequiresPermissions("constant:edit")
-    public void edit() {
-        Constant constant = getModel(Constant.class, "", true);
-        constant.update();
-        renderSuccess();
-    }
-
-    /**
-     * 删除
-     */
-    @RequiresPermissions("constant:delete")
-    public void delete() {
-        Db.update("delete from tb_constant where id in(" + getPara("ids") + ")");
-        renderSuccess();
-    }
-}

src/main/java/com/lsw/controller/admin/work/process/ProcessController.java

@@ -1,119 +0,0 @@
-package com.lsw.controller.admin.work.process;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.jfinal.json.FastJson;
-import com.jfinal.kit.JsonKit;
-import com.jfinal.plugin.activerecord.Db;
-import com.jfinal.plugin.activerecord.Page;
-import com.lsw.base.BaseController;
-import com.lsw.model.Apply;
-import com.lsw.model.Process;
-import com.lsw.model.Role;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-
-import java.util.List;
-
-/**
- * @author 李书文
- * @description 平台常量管理
- */
-public class ProcessController extends BaseController {
-
-    /**
-     * 管理页面
-     */
-    @RequiresPermissions("process:list")
-    public void list() {
-        render("list.html");
-    }
-
-    /**
-     * 获取流程json数据
-     */
-    public void jsonList() {
-        Page<Process> pgaeList = Process.dao.jsonList(getPage(), getRows(), getPara("name"), getSidx(), getSord());
-        for (Process p : pgaeList.getList()) {
-            System.out.println(p.getId());
-            List<Process> lists = Process.dao.find("select * from tb_process where pId=? order by id asc", p.getId());
-            p.put("lists", lists);
-
-        }
-        renderJson(getPage(pgaeList));
-    }
-
-
-    /**
-     * 视图页面
-     */
-    public void view() {
-        String op = getPara("op");
-        setAttr("op", op);
-        if (op.equals("add")) {
-            render("form.html");
-        }
-        if (op.equals("edit")) {
-            Process process = Process.dao.findById(getPara("id"));
-            List<Process> step_list = Process.dao.find("SELECT * FROM tb_process WHERE pId=?", process.getId());
-            setAttr("process", JsonKit.toJson(process));
-            setAttr("step_list", JsonKit.toJson(step_list));
-            render("form.html");
-        }
-        if (op.equals("choice")) {
-            List<Role> role_list = Role.dao.find("select * from sys_role");
-            setAttr("role_list", role_list);
-            render("choice.html");
-        }
-    }
-
-    /**
-     * 添加流程
-     */
-    @RequiresPermissions("process:add")
-    public void add() {
-        Process process = FastJson.getJson().parse(getPara("process"), Process.class);
-        process.save();
-        JSONArray step_list = JSON.parseArray(getPara("step_list"));
-        for (int i = 0; i < step_list.size(); i++) {
-            JSONObject object = step_list.getJSONObject(i);
-            Process p = new Process();
-            p.setPId(process.getId());
-            p.setName(object.getString("name"));
-            p.setSteps(i + 1);
-            p.setApproval(object.getString("approval"));
-            p.save();
-        }
-        renderSuccess();
-    }
-
-    /**
-     * 编辑流程
-     */
-    @RequiresPermissions("process:edit")
-    public void edit() {
-        Process process = FastJson.getJson().parse(getPara("process"), Process.class);
-        process.update();
-        Db.update("delete from tb_process where pId=?", process.getId());
-        JSONArray step_list = JSON.parseArray(getPara("step_list"));
-        for (int i = 0; i < step_list.size(); i++) {
-            JSONObject object = step_list.getJSONObject(i);
-            Process step = new Process();
-            step.setPId(process.getId());
-            step.setName(object.getString("name"));
-            step.setSteps(i + 1);
-            step.setApproval(object.getString("approval"));
-            step.save();
-        }
-        renderSuccess();
-    }
-
-    /**
-     * 删除
-     */
-    @RequiresPermissions("process:delete")
-    public void delete() {
-        Db.update("delete from tb_process where id in(" + getPara("ids") + ")");
-        renderSuccess();
-    }
-}

src/main/java/com/lsw/controller/front/ApplyController.java

@@ -1,92 +0,0 @@
-package com.lsw.controller.front;
-
-import com.jfinal.kit.JsonKit;
-import com.jfinal.plugin.activerecord.Record;
-import com.lsw.base.BaseController;
-import com.lsw.model.Apply;
-import com.lsw.model.Process;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class ApplyController extends BaseController {
-
-
-    public void process_list() {
-        List<Process> process_list = Process.dao.find("select * from tb_process where pId=0");
-        renderJson(process_list);
-
-    }
-
-    public void apply_save() {
-        Apply apply = getModel(Apply.class, "", true);
-        apply.setMDate(new Date());
-        apply.setSteps(1);
-        apply.save();
-        renderSuccess();
-    }
-
-    /**
-     * 申请单
-     */
-    public void apply_list() {
-        List<Apply> apply_list = Apply.dao.jsonList(getParaToInt("userId"), getPara("name"));
-        for (Apply apply : apply_list) {
-            Process process = Process.dao.findFirst("select * from tb_process where pId=? and steps=?", apply.getProcessId(), apply.getSteps());
-            if (process == null) {
-                apply.put("now", "结束");
-            } else {
-                apply.put("now", process.getName());
-            }
-        }
-        renderJson(apply_list);
-    }
-
-    /**
-     * 待办
-     */
-    public void backlog_list() {
-        List<Apply> apply_list = Apply.dao.jsonList();
-        List<Apply> backlog_list = new ArrayList<>();
-        String roleId = getPara("roleId");
-        for (Apply apply : apply_list) {
-            Process process = Process.dao.findFirst("select * from tb_process where pId=? and steps=?", apply.getProcessId(), apply.getSteps());
-            if (process == null) {
-                apply.put("now", "结束");
-            } else {
-                apply.put("now", process.getName());
-            }
-            List<Process> process_list = Process.dao.find("select * from tb_process where pId=?", apply.getProcessId());
-            for (Process p : process_list) {
-                if (p.getApproval().contains(roleId)) {
-                    backlog_list.add(apply);
-                }
-            }
-        }
-        renderJson(backlog_list);
-    }
-
-    public void audit() {
-        Apply apply = getModel(Apply.class, "", true);
-        List<Process> step_list = Process.dao.find("select * from tb_process where pId=?", apply.getProcessId());
-        if(apply.getSteps()>step_list.size()){
-            apply.setState(1);
-        }
-        apply.update();
-        renderSuccess();
-    }
-
-    public void apply_detail() {
-        String roleId = getPara("roleId");
-        List<Process> step_list = Process.dao.find("select * from tb_process where pId=?", getPara("processId"));
-        Record record=new Record();
-        for(Process p:step_list) {
-            if (p.getApproval().contains(roleId)) {
-                record.set("step",p.getSteps());
-            }
-        }
-        record.set("step_list",step_list);
-        renderJson(record);
-    }
-}

src/main/java/com/lsw/model/Apply.java

@@ -1,63 +0,0 @@
-package com.lsw.model;
-
-import com.jfinal.kit.StrKit;
-import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.base.BaseApply;
-
-import java.util.List;
-
-/**
- * Generated by JFinal.
- */
-@SuppressWarnings("serial")
-public class Apply extends BaseApply<Apply> {
-    public static final Apply dao = new Apply().dao();
-
-    public Page<Apply> jsonList(int page, int row, String name, String sidx, String sord) {
-        String select = "SELECT a.*,p.name AS processName,u.realName";
-        StringBuilder sb = new StringBuilder();
-        sb.append(" FROM tb_apply a");
-        sb.append(" LEFT JOIN tb_process p ON p.id=a.processId");
-        sb.append(" LEFT JOIN sys_user u ON u.id=a.userId");
-        sb.append(" WHERE 1=1");
-        if (StrKit.notBlank(name)) {
-            sb.append(" AND a.name like '%" + name + "%'");
-        }
-        sb.append(" ORDER BY a." + sidx + " " + sord);
-        return dao.paginate(page, row, select, sb.toString());
-    }
-
-    public List<Apply> jsonList(int userId,String name) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(" SELECT a.*,p.name AS processName,u.realName");
-        sb.append(" FROM tb_apply a");
-        sb.append(" LEFT JOIN tb_process p ON p.id=a.processId");
-        sb.append(" LEFT JOIN sys_user u ON u.id=a.userId");
-        sb.append(" WHERE 1=1");
-        if (StrKit.notBlank(name)) {
-            sb.append(" AND a.name like '%" + name + "%'");
-        }
-        sb.append(" AND u.id="+userId);
-        sb.append(" ORDER BY a.mDate desc");
-        return dao.find(sb.toString());
-    }
-    public List<Apply> jsonList() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(" SELECT a.*,p.name AS processName,u.realName");
-        sb.append(" FROM tb_apply a");
-        sb.append(" LEFT JOIN tb_process p ON p.id=a.processId");
-        sb.append(" LEFT JOIN sys_user u ON u.id=a.userId");
-        sb.append(" ORDER BY a.id DESC");
-        return dao.find(sb.toString());
-    }
-
-    public Apply selectById(int id) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(" SELECT a.*,p.name AS processName,u.realName");
-        sb.append(" FROM tb_apply a");
-        sb.append(" LEFT JOIN tb_process p ON p.id=a.processId");
-        sb.append(" LEFT JOIN sys_user u ON u.id=a.userId");
-        sb.append(" WHERE a.id=?");
-        return dao.findFirst(sb.toString(), id);
-    }
-}

src/main/java/com/lsw/model/Constant.java

@@ -1,29 +0,0 @@
-package com.lsw.model;
-
-import com.jfinal.kit.StrKit;
-import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.base.BaseConstant;
-
-/**
- * Generated by JFinal.
- */
-@SuppressWarnings("serial")
-public class Constant extends BaseConstant<Constant> {
-    public static final Constant dao = new Constant().dao();
-
-    public Page<Constant> jsonList(int page, int row, String name, String type, String sidx, String sord) {
-        String select = "SELECT id,name,type,CASE WHEN c.pId>0 THEN'常量' ELSE '类型' END AS pId";
-        StringBuilder sb = new StringBuilder();
-        sb.append(" FROM tb_constant c");
-        sb.append(" WHERE 1=1");
-        if (StrKit.notBlank(name)) {
-            sb.append(" AND c.name like '%" + name + "%'");
-        }
-        //选择类型
-        if (StrKit.notBlank(type)) {
-            sb.append(" AND c.pId='" + type + "'");
-        }
-        sb.append(" ORDER BY c." + sidx + " " + sord);
-        return dao.paginate(page, row, select, sb.toString());
-    }
-}

src/main/java/com/lsw/model/Process.java

@@ -1,26 +0,0 @@
-package com.lsw.model;
-
-import com.jfinal.kit.StrKit;
-import com.jfinal.plugin.activerecord.Page;
-import com.lsw.model.base.BaseProcess;
-
-/**
- * Generated by JFinal.
- */
-@SuppressWarnings("serial")
-public class Process extends BaseProcess<Process> {
-	public static final Process dao = new Process().dao();
-
-	public Page<Process> jsonList(int page, int row, String name,String sidx, String sord) {
-		String select = "SELECT p.*";
-		StringBuilder sb = new StringBuilder();
-		sb.append(" FROM tb_process p");
-		sb.append(" WHERE 1=1");
-		if (StrKit.notBlank(name)) {
-			sb.append(" AND p.name like '%" + name + "%'");
-		}
-		sb.append(" AND p.pId=0");
-		sb.append(" ORDER BY p." + sidx + " " + sord);
-		return dao.paginate(page, row, select, sb.toString());
-	}
-}

src/main/java/com/lsw/model/_MappingKit.java

@@ -27,9 +27,6 @@ public class _MappingKit {
 		arp.addMapping("sys_role", "id", Role.class);
 		arp.addMapping("sys_user", "id", User.class);
 		arp.addMapping("sys_user_role", "id", UserRole.class);
-		arp.addMapping("tb_apply", "id", Apply.class);
-		arp.addMapping("tb_constant", "id", Constant.class);
-		arp.addMapping("tb_process", "id", Process.class);
 		arp.addMapping("tb_token", "id", Token.class);
 	}
 }

src/main/java/com/lsw/model/base/BaseApply.java

@@ -1,84 +0,0 @@
-package com.lsw.model.base;
-
-import com.jfinal.plugin.activerecord.Model;
-import com.jfinal.plugin.activerecord.IBean;
-
-/**
- * Generated by JFinal, do not modify this file.
- */
-@SuppressWarnings("serial")
-public abstract class BaseApply<M extends BaseApply<M>> extends Model<M> implements IBean {
-
-	public void setId(java.lang.Integer id) {
-		set("id", id);
-	}
-
-	public java.lang.Integer getId() {
-		return getInt("id");
-	}
-
-	public void setName(java.lang.String name) {
-		set("name", name);
-	}
-
-	public java.lang.String getName() {
-		return getStr("name");
-	}
-
-	public void setUserId(java.lang.Integer userId) {
-		set("userId", userId);
-	}
-
-	public java.lang.Integer getUserId() {
-		return getInt("userId");
-	}
-
-	public void setProcessId(java.lang.Integer processId) {
-		set("processId", processId);
-	}
-
-	public java.lang.Integer getProcessId() {
-		return getInt("processId");
-	}
-
-	public void setSteps(java.lang.Integer steps) {
-		set("steps", steps);
-	}
-
-	public java.lang.Integer getSteps() {
-		return getInt("steps");
-	}
-
-	public void setState(java.lang.Integer state) {
-		set("state", state);
-	}
-
-	public java.lang.Integer getState() {
-		return getInt("state");
-	}
-
-	public void setMContent(java.lang.String mContent) {
-		set("mContent", mContent);
-	}
-
-	public java.lang.String getMContent() {
-		return getStr("mContent");
-	}
-
-	public void setAccessory(java.lang.String accessory) {
-		set("accessory", accessory);
-	}
-
-	public java.lang.String getAccessory() {
-		return getStr("accessory");
-	}
-
-	public void setMDate(java.util.Date mDate) {
-		set("mDate", mDate);
-	}
-
-	public java.util.Date getMDate() {
-		return get("mDate");
-	}
-
-}

src/main/java/com/lsw/model/base/BaseConstant.java

@@ -1,44 +0,0 @@
-package com.lsw.model.base;
-
-import com.jfinal.plugin.activerecord.Model;
-import com.jfinal.plugin.activerecord.IBean;
-
-/**
- * Generated by JFinal, do not modify this file.
- */
-@SuppressWarnings("serial")
-public abstract class BaseConstant<M extends BaseConstant<M>> extends Model<M> implements IBean {
-
-	public void setId(java.lang.Integer id) {
-		set("id", id);
-	}
-
-	public java.lang.Integer getId() {
-		return getInt("id");
-	}
-
-	public void setName(java.lang.String name) {
-		set("name", name);
-	}
-
-	public java.lang.String getName() {
-		return getStr("name");
-	}
-
-	public void setPId(java.lang.Integer pId) {
-		set("pId", pId);
-	}
-
-	public java.lang.Integer getPId() {
-		return getInt("pId");
-	}
-
-	public void setType(java.lang.Integer type) {
-		set("type", type);
-	}
-
-	public java.lang.Integer getType() {
-		return getInt("type");
-	}
-
-}

src/main/java/com/lsw/model/base/BaseProcess.java

@@ -1,76 +0,0 @@
-package com.lsw.model.base;
-
-import com.jfinal.plugin.activerecord.Model;
-import com.jfinal.plugin.activerecord.IBean;
-
-/**
- * Generated by JFinal, do not modify this file.
- */
-@SuppressWarnings("serial")
-public abstract class BaseProcess<M extends BaseProcess<M>> extends Model<M> implements IBean {
-
-	public void setId(java.lang.Integer id) {
-		set("id", id);
-	}
-
-	public java.lang.Integer getId() {
-		return getInt("id");
-	}
-
-	public void setName(java.lang.String name) {
-		set("name", name);
-	}
-
-	public java.lang.String getName() {
-		return getStr("name");
-	}
-
-	public void setState(java.lang.Integer state) {
-		set("state", state);
-	}
-
-	public java.lang.Integer getState() {
-		return getInt("state");
-	}
-
-	public void setSteps(java.lang.Integer steps) {
-		set("steps", steps);
-	}
-
-	public java.lang.Integer getSteps() {
-		return getInt("steps");
-	}
-
-	public void setPId(java.lang.Integer pId) {
-		set("pId", pId);
-	}
-
-	public java.lang.Integer getPId() {
-		return getInt("pId");
-	}
-
-	public void setStartTime(java.util.Date startTime) {
-		set("startTime", startTime);
-	}
-
-	public java.util.Date getStartTime() {
-		return get("startTime");
-	}
-
-	public void setEndTime(java.util.Date endTime) {
-		set("endTime", endTime);
-	}
-
-	public java.util.Date getEndTime() {
-		return get("endTime");
-	}
-
-	public void setApproval(java.lang.String approval) {
-		set("approval", approval);
-	}
-
-	public java.lang.String getApproval() {
-		return getStr("approval");
-	}
-
-}

src/main/java/com/lsw/route/AdminRoute.java

@@ -11,9 +11,6 @@ import com.lsw.controller.admin.system.menu.MenuController;
 import com.lsw.controller.admin.system.role.RoleController;
 import com.lsw.controller.admin.system.upload.UploadController;
 import com.lsw.controller.admin.system.user.UserController;
-import com.lsw.controller.admin.work.apply.ApplyController;
-import com.lsw.controller.admin.work.constant.ConstantController;
-import com.lsw.controller.admin.work.process.ProcessController;
 import com.lsw.interceptor.LogInterceptor;
 import com.lsw.interceptor.RoleMenuInterceptor;
 
@@ -37,9 +34,6 @@ public class AdminRoute extends Routes {
         add("/admin/file", FileController.class, "/system/file/"); // 文件管理
 
         /***************************************业务相关*****************************************/
-        add("/admin/work/constant", ConstantController.class, "/work/constant"); // 平台常量
-        add("/admin/work/process", ProcessController.class, "/work/process"); // 流程
-        add("/admin/work/apply", ApplyController.class, "/work/apply"); // 申请单管理
     }
 
 }

src/main/java/com/lsw/route/FrontRoute.java

@@ -1,7 +1,6 @@
 package com.lsw.route;
 
 import com.jfinal.config.Routes;
-import com.lsw.controller.front.ApplyController;
 import com.lsw.controller.front.ShareController;
 import com.lsw.controller.front.user.AppUserController;
 
@@ -10,7 +9,6 @@ public class FrontRoute extends Routes {
     public void config() {
         setBaseViewPath("/WEB-INF/view/front");
         add("/share", ShareController.class, "/share/"); // 分享页
-        add("/app/apply", ApplyController.class); // 分享页
         add("/app/user", AppUserController.class); // appuser
 
     }

src/main/resources/conf/jdbc_config.properties

@@ -1,20 +1,20 @@
-#\u6570\u636E\u5E93\u8FDE\u63A5\u914D\u7F6E
+#系统数据库配置
 user=root
 password=root
 devMode=true
 host=http://localhost:7979
 #jdbcUrl=jdbc\:mysql\://193.112.10.136\:3306/frcz?characterEncoding\=utf8&zeroDateTimeBehavior\=convertToNull
-jdbcUrl=jdbc\:mysql\://127.0.0.1\:3306/wash_car?characterEncoding\=utf8&zeroDateTimeBehavior\=convertToNull
-
+jdbcUrl=jdbc\:mysql\://127.0.0.1\:3306/djfp?characterEncoding\=utf8&zeroDateTimeBehavior\=convertToNull
 
+#ip配置
 ip=localhost:7979
 
-#\u53D1\u9001\u90AE\u4EF6\u914D\u7F6E
+#邮箱配置
 emailServer=smtp.126.com
 fromEmail=lishuwen79@126.com
 emailPass=lishuwen79
 
-#\u5FAE\u4FE1\u516C\u4F17\u53F7\u914D\u7F6E
+#微信公众号配置
 appId=wx63ae4e3c82614c48
 appSecret=70db205fb6453240c7fd9d2d1f9aa1f3
 encryptMessage=false

src/main/resources/sql/sys/menu.sql

@@ -10,6 +10,14 @@ LEFT JOIN sys_menu m2 ON m2.pId=m.id
 ORDER BY m.viewSort ASC
 #end
 
+##查询所有菜单资源列表
+#sql("getMenuList2")
+SELECT DISTINCT m.id,m.menuName as name,m.open,m.pId FROM sys_menu m
+LEFT JOIN sys_menu m2 ON m2.pId=m.id
+WHERE m.resourcesType=0
+ORDER BY m.viewSort ASC
+#end
+
 ##查询角色授权的菜单资源列表
 #sql("getMenuRoleList")
 SELECT mr.menuId,mr.roleId FROM sys_menu_role mr

src/main/webapp/WEB-INF/view/admin/common/index_right.html

@@ -2,7 +2,7 @@
     <div class="row border-bottom">
         <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
             <div class="navbar-header"> <a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a> 
-             <div style="font-size: 23px;font-weight: bold;margin-left: 81px;margin-top: 11px;">智能化电力迁移改造工程管理系统</div>
+             <div style="font-size: 23px;font-weight: bold;margin-left: 81px;margin-top: 11px;">党建扶贫系统</div>
             </div>
             <ul class="nav navbar-top-links navbar-right">
                <!-- <li class="dropdown"><a class="J_menuItem" id="email"> <i class="fa fa-edit"></i>写邮件</a>-->
@@ -30,4 +30,7 @@
     <div class="row J_mainContent" id="content-main">
         <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="#(path)/admin/welcome" frameborder="0" data-id="index_v1.html" seamless></iframe>
     </div>
+    <div class="footer" style="background-color: aliceblue">
+        <span class="tg" style="font-weight: bold;">当前角色: #(user.roleName)</span>
+    </div>
 </div>

src/main/webapp/WEB-INF/view/admin/system/department/list.html

@@ -9,6 +9,7 @@
             <input type="text" id="name" placeholder="输入关键字" class="form-control">
             <span class="input-group-btn"><button type="button" id="search" class="btn btn-primary">搜索</button></span>
         </div>
+        <a class="pull-right refresh" href="javascript:location.replace(location.href);"><i class="fa fa-history"></i>&nbsp;刷新</a>
     </div>
     <div class="mbox">
         <div class="row">

src/main/webapp/WEB-INF/view/admin/system/file/list.html

@@ -8,6 +8,7 @@
     .Wdate {width: 130px !important;}
     .fa-angle-right {float: right;}
     .w {font-weight: bold;font-size:15px;}
+    .refresh{margin-top: 0px;}
 </style>
 <body>
 <div class="con">
@@ -34,6 +35,7 @@
             <input type="text" id="name" placeholder="输入关键字" class="form-control">
             <span class="input-group-btn"><button type="button" id="search" class="btn btn-primary">搜索</button></span>
         </div>
+        <a class="pull-right refresh" href="javascript:location.replace(location.href);"><i class="fa fa-history"></i>&nbsp;刷新</a>
     </div>
     <div class="mbox r">
         <div class="sm2" style="box-shadow: rgb(204, 204, 204) 0px 1px 6px;">

src/main/webapp/WEB-INF/view/admin/system/index/login.html

@@ -18,7 +18,7 @@
 <body>
 <div class="lg">
     <form id="loginForm">
-        <div class="title">智能化电力迁移改造工程管理系统</div>
+        <div class="title">党建扶贫系统</div>
         <div class="form-group">
             <i class="fa fa-user"></i>
             <input type="text" class="form-control" placeholder="账号" name="account">

src/main/webapp/WEB-INF/view/admin/system/letter/list.html

@@ -9,6 +9,7 @@
             <input type="text" id="name" placeholder="输入标题名称" class="form-control">
             <span class="input-group-btn"><button type="button" id="search" class="btn btn-primary">搜索</button></span>
         </div>
+        <a class="pull-right refresh" href="javascript:location.replace(location.href);"><i class="fa fa-history"></i>&nbsp;刷新</a>
     </div>
     <div class="mbox">
         <table id="jqGrid"></table>

src/main/webapp/WEB-INF/view/admin/system/log/login/list.html

@@ -1,5 +1,8 @@
 #set(title="登录日志")
 #@header()
+<style>
+    .refresh{margin-top: 0px;}
+</style>
 <body>
 <div class="con">
     <form class="form-inline toolbar">
@@ -17,6 +20,7 @@
                <button type="reset" class="btn btn-default">重置</button>
             </span>
         </div>
+        <a class="pull-right refresh" href="javascript:location.replace(location.href);"><i class="fa fa-history"></i>&nbsp;刷新</a>
     </form>
     <div class="mbox">
         <table id="jqGrid"></table>

src/main/webapp/WEB-INF/view/admin/system/log/operation/list.html

@@ -1,5 +1,8 @@
 #set(title="操作日志")
 #@header()
+<style>
+    .refresh{margin-top: 0px;}
+</style>
 <body>
 <div class="con">
     <form class="form-inline toolbar">
@@ -17,6 +20,7 @@
                  <button type="reset" class="btn btn-default">重置</button>
             </span>
         </div>
+        <a class="pull-right refresh" href="javascript:location.replace(location.href);"><i class="fa fa-history"></i>&nbsp;刷新</a>
     </form>
     <div class="mbox">
         <table id="jqGrid"></table>

src/main/webapp/WEB-INF/view/admin/system/menu/form.html

@@ -60,6 +60,7 @@
     $("#add").click(function () {
         valida.form();
         if (valida.valid()) {
+            if($('#selected').val()==''){$('#pId').val('0')}
             sendAjax("#(path)/admin/menu/#(op)", $("#addForm").serialize(), function (data) {
                 cancelLoding();
                 if (data.result == true) {

src/main/webapp/WEB-INF/view/admin/system/menu/list.html

@@ -9,6 +9,7 @@
             <input type="text" id="name" placeholder="输入菜单名称" class="form-control">
             <span class="input-group-btn"><button type="button" id="search" class="btn btn-primary">搜索</button></span>
         </div>
+        <a class="pull-right refresh" href="javascript:location.replace(location.href);"><i class="fa fa-history"></i>&nbsp;刷新</a>
     </div>
     <div class="mbox">
         <div class="r">

src/main/webapp/WEB-INF/view/admin/system/menu/select.html

@@ -22,7 +22,7 @@
                 }
             }
         };
-        sendAjax("#(path)/admin/menu/getTreeJson", null, function (data) {
+        sendAjax("#(path)/admin/menu/getTreeJson2", null, function (data) {
             var t = $("#treeDemo");
             $.fn.zTree.init(t, setting, data);
             cancelLoding();

src/main/webapp/WEB-INF/view/admin/system/role/list.html

@@ -9,6 +9,7 @@
             <input type="text" id="name" placeholder="输入角色名称" class="form-control">
             <span class="input-group-btn"><button type="button" id="search" class="btn btn-primary">搜索</button></span>
         </div>
+        <a class="pull-right refresh" href="javascript:location.replace(location.href);"><i class="fa fa-history"></i>&nbsp;刷新</a>
     </div>
     <div class="mbox">
         <table id="jqGrid"></table>

src/main/webapp/WEB-INF/view/admin/system/user/list.html

@@ -18,6 +18,7 @@
             <input type="text" placeholder="输入关键字" class="form-control">
             <span class="input-group-btn"><button type="button" id="search" class="btn btn-primary">搜索</button></span>
         </div>
+        <a class="pull-right refresh" href="javascript:location.replace(location.href);"><i class="fa fa-history"></i>&nbsp;刷新</a>
     </div>
     <div class="mbox">
         <div class="r">

src/main/webapp/static/ui/css/style.min.css

@@ -30,6 +30,11 @@ label.error{position:absolute;right:18px;top:21px;color:#ef392b;font-weight:norm
 .object ul li{position: relative; float: left;border: 1px dashed darkgray;border-radius: 5px;padding: 10px 14px;cursor:pointer;margin: 8px;}
 .object ul li.active{border: 1px dashed red;color: red}
 .object ul li a{position: absolute;top:0;right: 0;background-color: red;padding:0px 5px 0px 5px;margin: -7px;color: white;border-radius: 50%;}
+.refresh{margin-top:-30px;    background-color: #23c6c8;
+    color: white;
+    border-radius: 5px;
+    margin-right: 8px;
+    padding: 6px;}
 /**步骤条**/
 
 .steps {