11

src/main/java/com/ekexiu/project/bridge/servlet/VerifyCodeServlet.java

@@ -1,23 +1,18 @@
package com.ekexiu.project.bridge.servlet;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.Random;
import javax.imageio.ImageIO;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.awt.*;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.Random;
public class VerifyCodeServlet extends HttpServlet {
	/**
@@ -133,8 +128,8 @@ public class VerifyCodeServlet extends HttpServlet {
			len = Integer.parseInt(request.getParameter("l"));
		} catch (Exception e) {
		}
		if (width < 4 || width > 10) {
			width = DEFAULT_VERIFY_LEN;
		if (len < 4 || len > 10) {
			len = DEFAULT_VERIFY_LEN;
		}
		String flag = request.getParameter("flag");
		if (flag == null || flag.length() == 0) {

src/main/java/com/ekexiu/project/bridge/system/dao/BirdgeDao.java

@@ -0,0 +1,46 @@
package com.ekexiu.project.bridge.system.dao;
import com.ekexiu.project.bridge.resource.po.Bridge;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2018/8/8.
 */
@DAO
public interface BirdgeDao {
    @Insert
    int insert(Connection con, Bridge bridge)throws SQLException;
    @UpdateWith
    @From(Bridge.class)
    @SetSentence("active = false")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @Update
    int update(Connection con, Bridge bridge) throws SQLException;
    @SelectOne
    @Nullable
    Bridge query(Connection con, String id) throws SQLException;
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<Bridge> pageQuery(Connection con, @Nullable @Like String name, @Nullable String code, int pageSize, int pageNo) throws SQLException;
}

src/main/java/com/ekexiu/project/bridge/system/dao/BridgeServerDao.java

@@ -0,0 +1,46 @@
package com.ekexiu.project.bridge.system.dao;
import com.ekexiu.project.bridge.resource.po.BridgeServer;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2018/8/8.
 */
@DAO
public interface BridgeServerDao {
    @Insert
    int insert(Connection con, BridgeServer bridgeServer) throws SQLException;
    @UpdateWith
    @From(BridgeServer.class)
    @SetSentence("active = '0'")
    int logicDelete(Connection con, @Set String modifier, String id)throws SQLException;
    @Update
    int update(Connection con, BridgeServer bridgeServer) throws SQLException;
    @SelectOne
    @Nullable
    BridgeServer query(Connection con, String id) throws SQLException;
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<BridgeServer> pqgeQuery(Connection con);
}

src/main/java/com/ekexiu/project/bridge/system/dao/CollectDeviceDao.java

@@ -0,0 +1,43 @@
package com.ekexiu.project.bridge.system.dao;
import com.ekexiu.project.bridge.resource.po.CollectDevice;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2018/8/8.
 */
@DAO
public interface CollectDeviceDao {
    @Insert
    int insert(Connection con, CollectDevice collectDevice) throws SQLException;
    @UpdateWith
    @From(CollectDevice.class)
    @SetSentence("active = '0'")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    int update(Connection con, CollectDevice collectDevice)throws SQLException;
    @SelectOne
    @Nullable
    CollectDevice query(Connection con, String id) throws SQLException;
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<CollectDevice> pageQuery(Connection con, @Nullable String serverId, @Nullable String code) throws SQLException;
}

src/main/java/com/ekexiu/project/bridge/system/dao/UserDao.java

@@ -0,0 +1,58 @@
package com.ekexiu.project.bridge.system.dao;
import com.ekexiu.project.bridge.system.po.User;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.Dynamic;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2018/8/7.
 */
@DAO
public interface UserDao {
    @Nullable
    @SelectOne
    User query(Connection con, String id)throws SQLException;
    @Nullable
    @SelectOne
    @Where("active = '1'")
    User login(Connection con, String account,String passwd) throws SQLException;
    @Insert
    int insert(Connection con, User user) throws SQLException;
    @Update
    @Exclude("passwd")
    @Dynamic
    int update(Connection con, User user) throws SQLException;
    @UpdateWith
    @From(User.class)
    @SetSentence("active = '0'")
    int ban(Connection con,@Set String modifier, String id) throws SQLException;
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<User> pageQuery(Connection con, @Nullable @Like String account, @Nullable @Like String name, @Nullable @Like String comp, int pageSize, int pageNo) throws SQLException;
    @UpdateWith
    @From(User.class)
    int changePw(Connection con, @Set String passwd, String id) throws SQLException;
}

src/main/java/com/ekexiu/project/bridge/system/po/User.java

@@ -5,6 +5,7 @@ import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.annotation.entry.Unique;
import org.jfw.apt.orm.annotation.entry.Uniques;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.project.bridge.base.po.BaseTable;
@@ -27,6 +28,7 @@ public class User implements BaseTable {
	private String email;
	private String remark;
	private String passwd;
	private int type;
	
	private boolean active;
	
@@ -38,7 +40,7 @@ public class User implements BaseTable {
	public void setActive(boolean active) {
		this.active = active;
	}
	@Column(descp="密码（MD5）",value=DE.id_32)
	@Column(descp="密码（MD5）",queryable=false,handlerClass = StringHandler.class,dbType = "TEXT")
	public String getPasswd() {
		return passwd;
	}
@@ -101,6 +103,13 @@ public class User implements BaseTable {
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(descp="账户类型",value=DE.int_de)
	public int getType() {
		return type;
	}
	public void setType(int type) {
		this.type = type;
	}
	public String getCreateTime() {
		return createTime;
	}

src/main/java/com/ekexiu/project/bridge/system/service/DictService.java

@@ -1,12 +1,7 @@
package com.ekexiu.project.bridge.system.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import com.ekexiu.project.bridge.system.dao.DictDao;
import com.ekexiu.project.bridge.system.po.DictItem;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
@@ -15,8 +10,12 @@ import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.AfterCommit;
import org.jfw.apt.web.annotation.param.JdbcConn;
import com.ekexiu.project.bridge.system.dao.DictDao;
import com.ekexiu.project.bridge.system.po.DictItem;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@Path("/dict")
public class DictService {
@@ -26,6 +25,13 @@ public class DictService {
	@Autowrie
	private DictDao dictDao;
	public DictDao getDictDao() {
		return dictDao;
	}
	public void setDictDao(DictDao dictDao) {
		this.dictDao = dictDao;
	}
	public void load(Connection con) throws SQLException {
		List<DictItem> items = this.dictDao.query(con);
		for (DictItem item : items) {

src/main/java/com/ekexiu/project/bridge/system/service/SysService.java

@@ -0,0 +1,131 @@
package com.ekexiu.project.bridge.system.service;
import com.ekexiu.project.bridge.system.dao.UserDao;
import com.ekexiu.project.bridge.system.po.User;
import com.ekexiu.project.bridge.system.vo.SessionUser;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.LoginUser;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.method.InvalidSession;
import org.jfw.apt.web.annotation.method.SetSession;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2018/8/7.
 */
@Path("/sys")
public class SysService {
    public static final String DEFAULT_PW_STR = StringUtil.md5("123456");
    @Autowrie
    private UserDao userDao;
    public UserDao getUserDao() {
        return userDao;
    }
    public void setUserDao(UserDao userDao) {
        this.userDao = userDao;
    }
    @SetSession("JFW_SESSION_LOGIN_USER=result")
    @Path("/login")
    @Post
    public SessionUser login(@JdbcConn Connection con, String account, String pw) throws SQLException {
        User user = userDao.login(con, account, StringUtil.md5(pw));
        if (user != null) {
            SessionUser sessionUser = new SessionUser();
            sessionUser.setAccount(user.getAccount());
            sessionUser.setComp(user.getComp());
            sessionUser.setEmail(user.getEmail());
            sessionUser.setId(user.getId());
            sessionUser.setJob(user.getJob());
            sessionUser.setName(user.getName());
            sessionUser.setPhone(user.getPhone());
            sessionUser.setRemark(user.getRemark());
            sessionUser.setType(user.getType());
            return sessionUser;
        }
        return null;
    }
    @Get
    @Path
    public SessionUser get(@LoginUser SessionUser user) {
        return user;
    }
    @Get
    @Path("/logout")
    @InvalidSession
    public void logout() {
    }
    @Post
    @Path
    public void insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, User user) throws SQLException {
        user.setId(StringUtil.buildUUID());
        user.setActive(true);
        user.setPasswd(DEFAULT_PW_STR);
        user.setType(0);
        user.setCreator(sessionUser.getId());
        user.setModifier(sessionUser.getId());
        this.userDao.insert(con, user);
    }
    @Get
    @Path("/id/{id}")
    public User query(@JdbcConn Connection con,@PathVar String id)throws SQLException {
        return this.userDao.query(con, id);
    }
    @Post
    @Path("/update")
    public void update(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, User user) throws SQLException {
        user.setModifier(sessionUser.getId());
        this.userDao.update(con, user);
    }
    @Get
    @Path("/ban")
    public void ban(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
        this.userDao.ban(con, sessionUser.getId(), id);
    }
    @Get
    @Path("/pq")
    public PageQueryResult pageQuery(@JdbcConn Connection con, @Nullable String account, @Nullable String name, @Nullable String comp, int pageSize, int pageNo) throws SQLException {
        return this.userDao.pageQuery(con, account == null ? null : "%" + account + "%", name == null ? null : "%" + name + "%", comp == null ? null : "%" + comp + "%", pageSize, pageNo);
    }
    @Get
    @Path("/resetPw")
    public void resetPw(@JdbcConn(true) Connection con,String id)throws SQLException {
        this.userDao.changePw(con, DEFAULT_PW_STR, id);
    }
    @Post
    @Path("/changePw")
    public void changePw(@JdbcConn(true) Connection con,String id,String oldPw,String newPw) throws SQLException, JfwBaseException {
        User user = this.userDao.query(con, id);
        if (user!=null&&StringUtil.md5(oldPw).equals(StringUtil.md5(user.getPasswd()))) {
            this.userDao.changePw(con, StringUtil.md5(newPw), id);
        }else{
            throw new JfwBaseException(100001, "用户不存在或密码不匹配");
        }
    }
}

src/main/java/com/ekexiu/project/bridge/system/vo/SessionUser.java

@@ -0,0 +1,89 @@
package com.ekexiu.project.bridge.system.vo;
/**
 * Created by TT on 2018/8/7.
 */
public class SessionUser {
    private String id;
    private String name;
    private String account;
    private String comp;
    private String job;
    private String phone;
    private String email;
    private String remark;
    private int type;
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getAccount() {
        return account;
    }
    public void setAccount(String account) {
        this.account = account;
    }
    public String getComp() {
        return comp;
    }
    public void setComp(String comp) {
        this.comp = comp;
    }
    public String getJob() {
        return job;
    }
    public void setJob(String job) {
        this.job = job;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public int getType() {
        return type;
    }
    public void setType(int type) {
        this.type = type;
    }
}