111

src/main/java/com/ekexiu/project/bridge/resource/po/Transducer.java

@@ -1,5 +1,6 @@
package com.ekexiu.project.bridge.resource.po;
import com.ekexiu.project.bridge.base.po.BaseTable;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
@@ -7,7 +8,7 @@ import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("id")
@Table(descp="传感器")
public class Transducer {
public class Transducer implements BaseTable {
	private String id;
	private String code;
	private String deviceId;

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

@@ -16,7 +16,7 @@ import java.util.Random;
public class VerifyCodeServlet extends HttpServlet {
	/**
	 * 
	 *
	 */
	private static final long serialVersionUID = -384069991394456296L;
@@ -116,22 +116,22 @@ public class VerifyCodeServlet extends HttpServlet {
		}
		String val = request.getParameter(QUERY_FLAG);
		if(val!=null){
	        if(null == request.getCharacterEncoding()){
	            request.setCharacterEncoding("UTF-8");
	            request.setCharacterEncoding("UTF-8");
	        }
	        response.setContentType("application/json");
	        java.io.PrintWriter out = response.getWriter();
	        out.write("{\"success\":true,\"data\":");
			if(null == request.getCharacterEncoding()){
				request.setCharacterEncoding("UTF-8");
				request.setCharacterEncoding("UTF-8");
			}
			response.setContentType("application/json");
			java.io.PrintWriter out = response.getWriter();
			out.write("{\"success\":true,\"data\":");
			Long to = (Long)session.getAttribute("TIMEOUT_"+flag);
			if( val.equals(session.getAttribute(flag)) &&  (to!=null) && (to.longValue()>System.currentTimeMillis())){
			     	  out.write("true}");
	        }else{
	        	  out.write("false}");
	        	  session.removeAttribute("TIMEOUT_"+flag);
	        	  session.removeAttribute(flag);
	        }
	        return;
				out.write("true}");
			}else{
				out.write("false}");
				session.removeAttribute("TIMEOUT_"+flag);
				session.removeAttribute(flag);
			}
			return;
		}
		response.setContentType("image/jpeg");
		int width = 0, height = 0, len = 0;

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

@@ -4,6 +4,7 @@ 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.IncludeFixSet;
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;
@@ -22,7 +23,7 @@ import java.sql.SQLException;
 * Created by TT on 2018/8/8.
 */
@DAO
public interface BirdgeDao {
public interface BridgeDao {
    @Insert
    int insert(Connection con, Bridge bridge)throws SQLException;
@@ -30,6 +31,7 @@ public interface BirdgeDao {
    @UpdateWith
    @From(Bridge.class)
    @SetSentence("active = false")
    @IncludeFixSet("modifyTime")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @Update

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

@@ -4,6 +4,7 @@ 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.IncludeFixSet;
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;
@@ -12,6 +13,8 @@ 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.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -29,7 +32,8 @@ public interface BridgeServerDao {
    @UpdateWith
    @From(BridgeServer.class)
    @SetSentence("active = '0'")
    int logicDelete(Connection con, @Set String modifier, String id)throws SQLException;
    @IncludeFixSet("modifyTime")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @Update
    int update(Connection con, BridgeServer bridgeServer) throws SQLException;
@@ -40,7 +44,7 @@ public interface BridgeServerDao {
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<BridgeServer> pqgeQuery(Connection con);
    PageQueryResult<BridgeServer> pageQuery(Connection con, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE WHERE CODE = ?)"}) String bridgeCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
}

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

@@ -4,13 +4,17 @@ 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.IncludeFixSet;
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.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -28,10 +32,11 @@ public interface CollectDeviceDao {
    @UpdateWith
    @From(CollectDevice.class)
    @SetSentence("active = '0'")
    @IncludeFixSet("modifyTime")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    int update(Connection con, CollectDevice collectDevice)throws SQLException;
    @Update
    int update(Connection con, CollectDevice collectDevice) throws SQLException;
    @SelectOne
    @Nullable
@@ -39,5 +44,5 @@ public interface CollectDeviceDao {
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<CollectDevice> pageQuery(Connection con, @Nullable String serverId, @Nullable String code) throws SQLException;
    PageQueryResult<CollectDevice> pageQuery(Connection con, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM BRIDGE_SERVER WHERE CODE = ?)"}) String serverCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
}

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

@@ -0,0 +1,48 @@
package com.ekexiu.project.bridge.system.dao;
import com.ekexiu.project.bridge.resource.po.Transducer;
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.IncludeFixSet;
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.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2018/8/8.
 */
@DAO
public interface TransducerDao {
    @Insert
    int insert(Connection con, Transducer transducer) throws SQLException;
    @UpdateWith
    @From(Transducer.class)
    @SetSentence("active = '0'")
    @IncludeFixSet("modifyTime")
    int logicDelete(Connection con, @Set String modifier, String id) throws SQLException;
    @Update
    int update(Connection con, Transducer transducer) throws SQLException;
    @SelectOne
    @Nullable
    Transducer query(Connection con, String id) throws SQLException;
    @PageSelect
    @Where("active = '1'")
    PageQueryResult<Transducer> pageQuery(Connection con, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ID IN (SELECT ID FROM COLLECT_DEVICE WHERE CODE = ?)"}) String collectDeviceCode, @Nullable String code, int pageSize, int pageNo) throws SQLException;
}

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

@@ -1,11 +1,13 @@
package com.ekexiu.project.bridge.system.dao;
import com.ekexiu.project.bridge.system.po.Notice;
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.IncludeFixSet;
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;
@@ -55,4 +57,9 @@ public interface UserDao {
    @UpdateWith
    @From(User.class)
    int changePw(Connection con, @Set String passwd, String id) throws SQLException;
    @UpdateWith
    @From(Notice.class)
    @IncludeFixSet("modifyTime")
    int updateNotice(Connection con, @Set String cnt,@Set String modifier) throws SQLException;
}

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

@@ -0,0 +1,45 @@
package com.ekexiu.project.bridge.system.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2018/8/8.
 */
@Table(descp = "系统公告")
public class Notice {
    private String cnt;
    private String modifier;
    private String modifyTime;
    @Column(descp="备注",value=DE.Text_de)
    public String getCnt() {
        return cnt;
    }
    public void setCnt(String cnt) {
        this.cnt = cnt;
    }
    @Column(descp="最后修改人ID",value= DE.refid_32)
    public String getModifier() {
        return modifier;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    }
    @Column(descp="最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101", handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", fixSqlValueWithInsert = "'20000101010101'", fixSqlValueWithUpdate = "TO_CHAR(NOW(),'YYYYMMDDHH24MISS')", insertable = true, nullable = false, queryable = true, renewable = true)
    public String getModifyTime() {
        return modifyTime;
    }
    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }
}

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,14 @@ public class DictService {
	@Autowrie
	private DictDao dictDao;
	public DictDao getDictDao() {
		return dictDao;
	}
	public void setDictDao(DictDao dictDao) {
		this.dictDao = dictDao;
	}
	@Path("/load")
	@Get
	public void load(@JdbcConn Connection con) throws SQLException {

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

@@ -1,5 +1,13 @@
package com.ekexiu.project.bridge.system.service;
import com.ekexiu.project.bridge.resource.po.Bridge;
import com.ekexiu.project.bridge.resource.po.BridgeServer;
import com.ekexiu.project.bridge.resource.po.CollectDevice;
import com.ekexiu.project.bridge.resource.po.Transducer;
import com.ekexiu.project.bridge.system.dao.BridgeDao;
import com.ekexiu.project.bridge.system.dao.BridgeServerDao;
import com.ekexiu.project.bridge.system.dao.CollectDeviceDao;
import com.ekexiu.project.bridge.system.dao.TransducerDao;
import com.ekexiu.project.bridge.system.dao.UserDao;
import com.ekexiu.project.bridge.system.po.User;
import com.ekexiu.project.bridge.system.vo.SessionUser;
@@ -12,25 +20,78 @@ 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.apt.web.annotation.param.Upload;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.web.fileupload.Item;
import org.jfw.util.web.fileupload.UploadItemIterator;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
/**
 * Created by TT on 2018/8/7.
 */
@Path("/sys")
@Path
public class SysService {
    public static final String DEFAULT_PW_STR = StringUtil.md5("123456");
    private static final AtomicInteger FN_IDX = new AtomicInteger(1);
    private File imgPath;
    @Autowrie
    private UserDao userDao;
    @Autowrie
    private BridgeDao bridgeDao;
    @Autowrie
    private BridgeServerDao bridgeServerDao;
    @Autowrie
    private CollectDeviceDao collectDeviceDao;
    @Autowrie
    private TransducerDao transducerDao;
    public BridgeDao getBridgeDao() {
        return bridgeDao;
    }
    public void setBridgeDao(BridgeDao bridgeDao) {
        this.bridgeDao = bridgeDao;
    }
    public BridgeServerDao getBridgeServerDao() {
        return bridgeServerDao;
    }
    public void setBridgeServerDao(BridgeServerDao bridgeServerDao) {
        this.bridgeServerDao = bridgeServerDao;
    }
    public CollectDeviceDao getCollectDeviceDao() {
        return collectDeviceDao;
    }
    public void setCollectDeviceDao(CollectDeviceDao collectDeviceDao) {
        this.collectDeviceDao = collectDeviceDao;
    }
    public TransducerDao getTransducerDao() {
        return transducerDao;
    }
    public void setTransducerDao(TransducerDao transducerDao) {
        this.transducerDao = transducerDao;
    }
    public UserDao getUserDao() {
        return userDao;
@@ -40,41 +101,87 @@ public class SysService {
        this.userDao = userDao;
    }
    /**
     * 上传文件
     *
     * @param it
     * @return
     * @throws Exception
     */
    @Path("/bridge/upload")
    @Post
    public List<UploadFile> upload(@Upload UploadItemIterator it) throws Exception {
        List<UploadFile> ret = new LinkedList<UploadFile>();
        try {
            while (it.hasNext()) {
                Item item = it.next();
                if (!item.isFormField()) {
                    String name = normalizeFileName(item.getName());
                    int index = name.lastIndexOf('.');
                    String ext = index >= 0 ? name.substring(index + 1) : "";
                    ext = ext.trim();
                    long fileLen = 0;
                    int len = 0;
                    UploadFile uf = this.buildTargetFile(ext);
                    uf.setName(name);
                    File file = uf.getFn();
                    ret.add(uf);
                    byte[] buf = new byte[8092];
                    OutputStream of = new FileOutputStream(file);
                    try {
                        InputStream in = item.getInputStream();
                        try {
                            while ((len = in.read(buf)) >= 0) {
                                if (len > 0) {
                                    of.write(buf, 0, len);
                                    fileLen += len;
                                }
                            }
                            uf.setSize(fileLen);
                        } finally {
                            in.close();
                        }
                    } finally {
                        of.close();
                    }
                }
            }
            return ret;
        } catch (Exception e) {
            this.remove(ret);
            throw e;
        } finally {
            if (it != null)
                it.clean();
        }
    }
    @SetSession("JFW_SESSION_LOGIN_USER=result")
    @Path("/login")
    @Path("/user/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 makeSessionUser(user);
        }
        return null;
    }
    @Get
    @Path
    @Path("/user")
    public SessionUser get(@LoginUser SessionUser user) {
        return user;
    }
    @Get
    @Path("/logout")
    @Path("/user/logout")
    @InvalidSession
    public void logout() {
    }
    @Post
    @Path
    @Path("/user/insert")
    public void insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, User user) throws SQLException {
        user.setId(StringUtil.buildUUID());
        user.setActive(true);
@@ -86,46 +193,313 @@ public class SysService {
    }
    @Get
    @Path("/id/{id}")
    public User query(@JdbcConn Connection con,@PathVar String id)throws SQLException {
        return this.userDao.query(con, id);
    @Path("/user/qo")
    public SessionUser query(@JdbcConn Connection con, String id) throws SQLException {
        return makeSessionUser(this.userDao.query(con, id));
    }
    @Post
    @Path("/update")
    @Path("/user/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")
    @Path("/user/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);
    @Path("/user/pq")
    public PageQueryResult<SessionUser> pageQuery(@JdbcConn Connection con, @Nullable String account, @Nullable String name, @Nullable String comp, int pageSize, int pageNo) throws SQLException {
        PageQueryResult<User> pageQueryResult = this.userDao.pageQuery(con, account == null ? null : "%" + account + "%", name == null ? null : "%" + name + "%", comp == null ? null : "%" + comp + "%", pageSize, pageNo);
        List<User> users = pageQueryResult.getData();
        List<SessionUser> sessionUsers = new ArrayList<>();
        if (!users.isEmpty()) {
            for (User user : users) {
                sessionUsers.add(makeSessionUser(user));
            }
            PageQueryResult<SessionUser> pageQueryResult1 = new PageQueryResult<>();
            pageQueryResult1.setData(sessionUsers);
            return pageQueryResult1;
        }
        return null;
    }
    @Get
    @Path("/resetPw")
    public void resetPw(@JdbcConn(true) Connection con,String id)throws SQLException {
    @Path("/user/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 {
    @Path("/user/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()))) {
        if (user != null && StringUtil.md5(oldPw).equals(StringUtil.md5(user.getPasswd()))) {
            this.userDao.changePw(con, StringUtil.md5(newPw), id);
        }else{
        } else {
            throw new JfwBaseException(100001, "用户不存在或密码不匹配");
        }
    }
    @Post
    @Path("/bridge")
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Bridge bridge) throws SQLException {
        String id = StringUtil.buildUUID();
        bridge.setId(id);
        bridge.setActive(true);
        bridge.setCreator(sessionUser.getId());
        bridge.setModifier(sessionUser.getId());
        this.bridgeDao.insert(con, bridge);
        return id;
    }
    @Get
    @Path("/bridge/qo")
    public Bridge queryBridge(@JdbcConn Connection con, String id) throws SQLException {
        return this.bridgeDao.query(con, id);
    }
    @Get
    @Path("/bridge/delete")
    public void delete(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
        this.bridgeDao.logicDelete(con, sessionUser.getId(), id);
    }
    @Post
    @Path("/bridge/update")
    public void update(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Bridge bridge) throws SQLException {
        bridge.setModifier(sessionUser.getId());
        this.bridgeDao.update(con, bridge);
    }
    @Get
    @Path("/bridge/pq")
    public PageQueryResult<Bridge> pageQuery(@JdbcConn Connection con, @Nullable String name, @Nullable String code, int pageSize, int pageNo) throws SQLException {
        return this.bridgeDao.pageQuery(con, name == null ? null : "%" + name + "%", code, pageSize, pageNo);
    }
    @Post
    @Path("/bridgeServer")
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, BridgeServer bridgeServer) throws SQLException {
        String id = StringUtil.buildUUID();
        bridgeServer.setId(id);
        bridgeServer.setActive(true);
        bridgeServer.setCreator(sessionUser.getId());
        bridgeServer.setModifier(sessionUser.getId());
        this.bridgeServerDao.insert(con, bridgeServer);
        return id;
    }
    @Get
    @Path("/bridgeServer/qo")
    public BridgeServer queryBS(@JdbcConn Connection con, String id) throws SQLException {
        return this.bridgeServerDao.query(con, id);
    }
    @Get
    @Path("/bridgeServer/pq")
    public PageQueryResult<BridgeServer> pageQueryBS(@JdbcConn Connection con, @Nullable String bcode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
        return this.bridgeServerDao.pageQuery(con, bcode, code, pageSize, pageNo);
    }
    @Post
    @Path("/bridgeServer/update")
    public void updateBS(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, BridgeServer bridgeServer) throws SQLException {
        bridgeServer.setModifier(sessionUser.getId());
        this.bridgeServerDao.update(con, bridgeServer);
    }
    @Get
    @Path("/bridgeServer/delete")
    public void deleteBS(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser
            , String id) throws SQLException {
        this.bridgeServerDao.logicDelete(con, sessionUser.getId(), id);
    }
    @Post
    @Path("/collectDevice")
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, CollectDevice collectDevice) throws SQLException {
        String id = StringUtil.buildUUID();
        collectDevice.setId(id);
        collectDevice.setActive(true);
        collectDevice.setCreator(sessionUser.getId());
        collectDevice.setModifier(sessionUser.getId());
        this.collectDeviceDao.insert(con, collectDevice);
        return id;
    }
    @Get
    @Path("/collectDevice/qo")
    public CollectDevice queryCD(@JdbcConn Connection con, String id) throws SQLException {
        return this.collectDeviceDao.query(con, id);
    }
    @Get
    @Path("/collectDevice/pq")
    public PageQueryResult<CollectDevice> pageQueryCD(@JdbcConn Connection con, @Nullable String scode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
        return this.collectDeviceDao.pageQuery(con, scode, code, pageSize, pageNo);
    }
    @Post
    @Path("/collectDevice/update")
    public void updateCD(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, CollectDevice collectDevice) throws SQLException {
        collectDevice.setModifier(sessionUser.getId());
        this.collectDeviceDao.update(con, collectDevice);
    }
    @Get
    @Path("/collectDevice/delete")
    public void deleteCD(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
        this.collectDeviceDao.logicDelete(con, sessionUser.getId(), id);
    }
    @Post
    @Path("/transducer")
    public String insert(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Transducer transducer) throws SQLException {
        String id = StringUtil.buildUUID();
        transducer.setId(id);
        transducer.setActive(true);
        transducer.setCreator(sessionUser.getId());
        transducer.setModifier(sessionUser.getId());
        this.transducerDao.insert(con, transducer);
        return id;
    }
    @Get
    @Path("/transducer/qo")
    public Transducer queryTransducer(@JdbcConn Connection con, String id) throws SQLException {
        return this.transducerDao.query(con, id);
    }
    @Get
    @Path("/transducer/pq")
    public PageQueryResult<Transducer> pageQueryT(@JdbcConn Connection con, @Nullable String cdCode, @Nullable String code, int pageSize, int pageNo) throws SQLException {
        return this.transducerDao.pageQuery(con, cdCode, code, pageSize, pageNo);
    }
    @Post
    @Path("/transducer/update")
    public void updateTransducer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, Transducer transducer) throws SQLException {
        transducer.setModifier(sessionUser.getId());
        this.transducerDao.update(con, transducer);
    }
    @Get
    @Path("/transducer/delete")
    public void deleteTransducer(@JdbcConn(true) Connection con, @LoginUser SessionUser sessionUser, String id) throws SQLException {
        this.transducerDao.logicDelete(con, sessionUser.getId(), id);
    }
    @Post
    @Path("/notice")
    public void updateNotice(@JdbcConn(true)Connection con,@LoginUser SessionUser sessionUser,String cnt)throws SQLException {
        this.userDao.updateNotice(con, cnt, sessionUser.getId());
    }
    private void remove(List<UploadFile> list) {
        for (UploadFile file : list) {
            if (file.fn != null)
                file.fn.delete();
        }
    }
    private UploadFile buildTargetFile(String ext) {
        StringBuilder sb = new StringBuilder();
        sb.append(System.currentTimeMillis() / (1000 * 60 * 60 * 24));
        File path = new File(this.imgPath, sb.toString());
        if (!path.exists()) {
            synchronized (this) {
                if (!path.mkdirs())
                    throw new RuntimeException("mkdir error[" + path + "]");
                FN_IDX.set(1);
            }
        }
        File file;
        do {
            String fn = FN_IDX.toString();
            if (ext.isEmpty()) {
                file = new File(path, fn);
            } else {
                file = new File(path, fn + "." + ext);
            }
            FN_IDX.incrementAndGet();
        } while (file.exists());
        sb.append("/").append(file.getName());
        UploadFile uf = new UploadFile();
        uf.setFn(file);
        uf.setUri("/" + sb.toString());
        return uf;
    }
    private String normalizeFileName(String fn) {
        int index = fn.indexOf('\\');
        if (index >= 0) {
            fn = fn.substring(fn.lastIndexOf('\\') + 1);
        }
        index = fn.indexOf('/');
        if (index >= 0) {
            fn = fn.substring(fn.lastIndexOf('/') + 1);
        }
        if (fn.length() == 0)
            throw new RuntimeException("invalid filename in Multipart/data request");
        return fn;
    }
    public static class UploadFile {
        private String name;
        private String uri;
        private long size;
        private transient File fn;
        public File getFn() {
            return fn;
        }
        public void setFn(File fn) {
            this.fn = fn;
        }
        public String getName() {
            return name;
        }
        public void setName(String name) {
            this.name = name;
        }
        public String getUri() {
            return uri;
        }
        public void setUri(String uri) {
            this.uri = uri;
        }
        public long getSize() {
            return size;
        }
        public void setSize(long size) {
            this.size = size;
        }
    }
    private static SessionUser makeSessionUser(User user) {
        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;
    }
}

src/main/resources/project.properties

@@ -28,4 +28,6 @@ dataSource.poolPreparedStatements::boolean=true
#statement池能够同时分配的打开的statements的最大数量
dataSource.maxPoolPreparedStatementPerConnectionSize::int=20
#默认的SQL语句自动提交状态(开启或关闭)设置由连接池本身设置(false由连接池定)
dataSource.defaultAutoCommit::boolean=false
dataSource.defaultAutoCommit::boolean=false
com_ekexiu_portal_ware_WareService.imgPath::java.io.File=D:/tmp/data/bridge

src/main/webapp/WEB-INF/web.xml

@@ -8,7 +8,7 @@
		<servlet-class>org.jfw.web.servlet.core.FilenameConfigServlet</servlet-class>
		<init-param>
			<param-name>prefixLen</param-name>
			<param-value>7</param-value>
			<param-value>6</param-value>
		</init-param>
		<init-param>
			<param-name>viewType</param-name>
@@ -31,7 +31,7 @@
	</servlet>
	<servlet>
		<servlet-name>wave</servlet-name>
		<servlet-class>com.ekxiu.project.bridge.servlet.WaveDataServlet</servlet-class>
		<servlet-class>com.ekexiu.project.bridge.servlet.WaveDataServlet</servlet-class>
		<load-on-startup>3</load-on-startup>
	</servlet>
	<servlet-mapping>