Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git into dev

src/main/java/com/ekexiu/operation/service/StatistService.java

package com.ekexiu.operation.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import com.ekexiu.portal.dao.DiscoverBannerDao;
import com.ekexiu.portal.dao.UserDao;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
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.util.jdbc.JdbcUtil;
import com.ekexiu.portal.dao.UserDao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
@Path("/operation/statist")
public class StatistService {
	@Autowrie
	private UserDao userDao;
	@Autowrie
	private DiscoverBannerDao discoverBannerDao;
	public UserDao getUserDao() {
		return userDao;
	public void setUserDao(UserDao userDao) {
		this.userDao = userDao;
	}
	
	public DiscoverBannerDao getDiscoverBannerDao() {
		return discoverBannerDao;
	}
	public void setDiscoverBannerDao(DiscoverBannerDao discoverBannerDao) {
		this.discoverBannerDao = discoverBannerDao;
	}
	@Get
	@Path("/user")
	public Map<String,Object> user(@JdbcConn Connection con)throws SQLException{
		map.put("actived", this.userDao.countActived(con));
		map.put("byRole",JdbcUtil.queryMaps(con, "select authentication code,count(1) num from professor group by code"));
		map.put("byType",JdbcUtil.queryMaps(con, "select auth_type code,count(1) num from professor group by code"));
		return map;		
		return map;
	}
	@Post
	@Path("/bannerClick")
	public void bannerClick(@JdbcConn(true) Connection con, long id) throws SQLException {
		this.discoverBannerDao.incClicks(con, id);
	}
}

src/main/java/com/ekexiu/portal/dao/DiscoverBannerDao.java

package com.ekexiu.portal.dao;
import com.ekexiu.portal.po.DiscoverBanner;
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.operator.UpdateWith;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/8/25.
 */
@DAO
public interface DiscoverBannerDao {
    @UpdateWith
    @From(DiscoverBanner.class)
    @SetSentence("clicks = clicks + 1")
    int incClicks(Connection con, long id) throws SQLException;
}

src/main/java/com/ekexiu/portal/po/DiscoverBanner.java

    private String modifier;
    private String createTime;
    private String creator;
    private Integer location;
    @Column(DE.bigSerial)
    public long getId() {
        this.creator = creator;
    }
    @Column(DE.Int_de)
    public Integer getLocation() {
        return location;
    }
    public void setLocation(Integer location) {
        this.location = location;
    }
    @Override
    public String getModifyTime() {
        return this.modifyTime;

src/main/resources/database.sql

  
  --- modify begin at version 1.9.2
ALTER TABLE ARTICLE ADD COLUMN COL_NUM int4 not null default 0;
COMMENT ON COLUMN article.col_num IS '栏目号  <=0:没有栏目号，1：个人自建 2：企业自发  其它：由业务定义';
update article set col_num=1 where professor_id is not null;
update article set col_num=2 where org_id is not null;
-- ALTER TABLE ARTICLE ADD COLUMN COL_NUM int4 not null default 0;
-- COMMENT ON COLUMN article.col_num IS '栏目号  <=0:没有栏目号，1：个人自建 2：企业自发  其它：由业务定义';
-- update article set col_num=1 where professor_id is not null;
-- update article set col_num=2 where org_id is not null;
ALTER TABLE organization ADD COLUMN col_mgr char(1) NOT NULL DEFAULT '0';
COMMENT ON COLUMN organization.col_mgr IS '是否是管理者 0：不是  1:是';
  modify_time CHARACTER(14) NOT NULL, -- 修改时间
  modifier CHARACTER VARYING(32), -- 最后修改人ID
  create_time CHARACTER(14) NOT NULL, -- 创建时间
  creator CHARACTER VARYING(32) NOT NULL -- 创建人ID
  creator CHARACTER VARYING(32) NOT NULL, -- 创建人ID
  location SMALLINT
);
COMMENT ON COLUMN discover_banner.id IS '编号id';
COMMENT ON COLUMN discover_banner.title IS '外显标题';
COMMENT ON COLUMN discover_banner.modifier IS '最后修改人ID';
COMMENT ON COLUMN discover_banner.create_time IS '创建时间';
COMMENT ON COLUMN discover_banner.creator IS '创建人ID';
COMMENT ON COLUMN public.discover_banner.location IS '显示位置';