Commit c22e95d0 authored by Quxl's avatar Quxl

xx

parent 525a080e
package com.egolm.film.api.admin; package com.egolm.film.api.admin;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.Date; import java.util.Date;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.util.ResourceUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.egolm.common.FileUtil;
import com.egolm.common.bean.Rjx; import com.egolm.common.bean.Rjx;
import com.egolm.film.api.admin.service.AdminUserService; import com.egolm.film.api.admin.service.AdminAuthService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@Api @Api
@Controller @Controller
@RequestMapping("admin/user") @RequestMapping("admin/auth")
public class AdminUserController { public class AdminAuthController {
@Autowired @Autowired
AdminUserService service; AdminAuthService service;
@ResponseBody @ResponseBody
@RequestMapping("list") @RequestMapping("adminList")
@ApiOperation("用户分页查询") @ApiOperation("管理员分页查询")
public Object list(String keyword, String group_id, Long index, Long limit) { public Object adminList(String keyword, String group_id, Long index, Long limit) {
return Rjx.jsonOk(); return Rjx.jsonOk();
} }
@ResponseBody @ResponseBody
@RequestMapping("add") @RequestMapping("adminSaveOrUpdate")
@ApiOperation("添加用户") @ApiOperation("添加管理员")
public Object add(String realname, String username, String password, String group_id, Date expire_time, String email, String telphone) { public Object adminSaveOrUpdate(String realname, String username, String password, String group_id, Date expire_time, String email, String telphone) {
return Rjx.jsonOk(); return Rjx.jsonOk();
} }
@ResponseBody @ResponseBody
@RequestMapping("del") @RequestMapping("adminDilabled")
@ApiOperation("删除用户") @ApiOperation("禁用管理员")
public Object del(String adminid) { public Object adminDilabled(String[] adminid) {
return Rjx.jsonOk(); return Rjx.jsonOk();
} }
@ResponseBody @ResponseBody
@RequestMapping("group/list") @RequestMapping("groupList")
@ApiOperation("分页查询") @ApiOperation("管理员分组,分页查询")
public Object groupList(Long index, Long limit) { public Object groupList(String keyword, Long index, Long limit) {
return Rjx.jsonOk(); return Rjx.jsonOk();
} }
@ResponseBody @ResponseBody
@RequestMapping("group/add") @RequestMapping("groupAuth")
@ApiOperation("添加组") @ApiOperation("管理组权限查询")
public Object groupAdd(String group_name, Integer state) { public Object groupAuth(Integer gorupid) throws FileNotFoundException {
File file = ResourceUtils.getFile("classpath:auth_admin.json");
return Rjx.jsonOk(); String json = FileUtil.fileToString(file);
return Rjx.jsonOk().setData(json);
} }
@ResponseBody @ResponseBody
@RequestMapping("group/del") @RequestMapping("groupSaveOrUpdate")
@ApiOperation("删除组") @ApiOperation("添加组")
public Object groupDel(String group_id) { public Object groupSaveOrUpdate(Integer groupid, String group_name, Integer state, String film_type_name, String authJson) {
return Rjx.jsonOk(); return Rjx.jsonOk();
} }
} }
package com.egolm.film.api.admin.service; package com.egolm.film.api.admin.service;
public interface AdminUserService { public interface AdminAuthService {
} }
...@@ -4,10 +4,10 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -4,10 +4,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.egolm.common.jdbc.JdbcTemplate; import com.egolm.common.jdbc.JdbcTemplate;
import com.egolm.film.api.admin.service.AdminUserService; import com.egolm.film.api.admin.service.AdminAuthService;
@Service @Service
public class AdminUserServiceImpl implements AdminUserService { public class AdminAuthServiceImpl implements AdminAuthService {
@Autowired @Autowired
JdbcTemplate jdbcTemplate; JdbcTemplate jdbcTemplate;
......
...@@ -31,7 +31,7 @@ public class EmailServiceImpl implements EmailService { ...@@ -31,7 +31,7 @@ public class EmailServiceImpl implements EmailService {
Integer port = 25; Integer port = 25;
boolean is_auth = true; boolean is_auth = true;
String from = "filmpassword@siff.com"; String from = "filmpassword@siff.com";
String username = "filmpassword"; String username = "filmpassword@siff.com";
String password = "siffstvf2018"; String password = "siffstvf2018";
String subject = "Test"; String subject = "Test";
String content = "Test"; String content = "Test";
......
package com.egolm.film.api.user.service; //package com.egolm.film.api.user.service;
//
import java.util.Date; //import java.util.Date;
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
//
import com.egolm.common.bean.Rjx; //import com.egolm.common.bean.Rjx;
import com.egolm.common.jdbc.Page; //import com.egolm.common.jdbc.Page;
import com.egolm.film.bean.Fc_film; //import com.egolm.film.bean.Fc_film;
import com.egolm.film.bean.Fc_film_doubtful_point; //import com.egolm.film.bean.Fc_film_doubtful_point;
import com.egolm.film.bean.Fc_film_review; //import com.egolm.film.bean.Fc_film_review;
//
public interface UserReviewService { //public interface UserReviewService {
//
List<Map<String, Object>> limitReviewList(Long user_id, Page page, Date push_date, String film_type_name, String keyword); // List<Map<String, Object>> limitReviewList(Long user_id, Page page, Date push_date, String film_type_name, String keyword);
//
List<Map<String, Object>> limitUnviewList(Long user_id, Page page, Date push_date, String film_type_name, String keyword); // List<Map<String, Object>> limitUnviewList(Long user_id, Page page, Date push_date, String film_type_name, String keyword);
//
Long queryMemberFilmIdByFilmId(Long film_id); // Long queryMemberFilmIdByFilmId(Long film_id);
//
List<Fc_film_review> queryRoundReviewList(Long user_id, Integer round, Long film_id); // List<Fc_film_review> queryRoundReviewList(Long user_id, Integer round, Long film_id);
//
List<Fc_film_doubtful_point> queryDoubtfulList(Long user_id, Long film_id); // List<Fc_film_doubtful_point> queryDoubtfulList(Long user_id, Long film_id);
//
Fc_film queryFilmById(Long film_id); // Fc_film queryFilmById(Long film_id);
//
Integer queryRound(Long user_id, Long film_id); // Integer queryRound(Long user_id, Long film_id);
//
Rjx queryStatistics(Long user_id); // Rjx queryStatistics(Long user_id);
//
void doubtfulAppend(Long user_id, Long film_id, Integer round, Integer type, String type_content, Long play_time, Long times); // void doubtfulAppend(Long user_id, Long film_id, Integer round, Integer type, String type_content, Long play_time, Long times);
//
void playAppend(Long user_id, Long film_id, Integer round, Long playtime, Long watchtime); // void playAppend(Long user_id, Long film_id, Integer round, Long playtime, Long watchtime);
//
void doReject(Long user_id, Long film_id, Integer round, String veto); // void doReject(Long user_id, Long film_id, Integer round, String veto);
//
void doPass(Long user_id, Long film_id, Integer round, Double score, String content); // void doPass(Long user_id, Long film_id, Integer round, Double score, String content);
//
} //}
...@@ -6,7 +6,7 @@ import javax.persistence.Id; ...@@ -6,7 +6,7 @@ import javax.persistence.Id;
/** /**
* @author 曲欣亮 * @author 曲欣亮
* @since 2018-10-17 * @since 2018-11-19
* @version v-1.0 * @version v-1.0
*/ */
@Entity(name="fc_admin") @Entity(name="fc_admin")
......
...@@ -6,7 +6,7 @@ import javax.persistence.Id; ...@@ -6,7 +6,7 @@ import javax.persistence.Id;
/** /**
* @author 曲欣亮 * @author 曲欣亮
* @since 2018-10-17 * @since 2018-11-19
* @version v-1.0 * @version v-1.0
*/ */
@Entity(name="fc_admin_group") @Entity(name="fc_admin_group")
...@@ -45,16 +45,6 @@ public class Fc_admin_group implements java.io.Serializable { ...@@ -45,16 +45,6 @@ public class Fc_admin_group implements java.io.Serializable {
*/ */
private Integer state; private Integer state;
/**
* 权限
*/
private String power;
/**
* 成员数量
*/
private Long user_num;
/** /**
* 群组权限 * 群组权限
*/ */
...@@ -76,19 +66,15 @@ public class Fc_admin_group implements java.io.Serializable { ...@@ -76,19 +66,15 @@ public class Fc_admin_group implements java.io.Serializable {
* @param create_ip 创建者ip * @param create_ip 创建者ip
* @param adminid 创建者uid * @param adminid 创建者uid
* @param state 小组状态 * @param state 小组状态
* @param power 权限
* @param user_num 成员数量
* @param group_power 群组权限 * @param group_power 群组权限
*/ */
public Fc_admin_group(Integer group_id, String group_name, Long create_time, String create_ip, Integer adminid, Integer state, String power, Long user_num, String group_power) { public Fc_admin_group(Integer group_id, String group_name, Long create_time, String create_ip, Integer adminid, Integer state, String group_power) {
this.group_id = group_id; this.group_id = group_id;
this.group_name = group_name; this.group_name = group_name;
this.create_time = create_time; this.create_time = create_time;
this.create_ip = create_ip; this.create_ip = create_ip;
this.adminid = adminid; this.adminid = adminid;
this.state = state; this.state = state;
this.power = power;
this.user_num = user_num;
this.group_power = group_power; this.group_power = group_power;
} }
...@@ -140,22 +126,6 @@ public class Fc_admin_group implements java.io.Serializable { ...@@ -140,22 +126,6 @@ public class Fc_admin_group implements java.io.Serializable {
return state; return state;
} }
public void setPower(String power) {
this.power = power;
}
public String getPower() {
return power;
}
public void setUser_num(Long user_num) {
this.user_num = user_num;
}
public Long getUser_num() {
return user_num;
}
public void setGroup_power(String group_power) { public void setGroup_power(String group_power) {
this.group_power = group_power; this.group_power = group_power;
} }
......
package com.egolm.film.bean;
import javax.persistence.Entity;
import javax.persistence.Id;
/**
* @author 曲欣亮
* @since 2018-10-17
* @version v-1.0
*/
@Entity(name="fc_admin_logs")
public class Fc_admin_logs implements java.io.Serializable {
private static final long serialVersionUID = 1L;
/**
* 日志id
*/
@Id
private Long log_id;
private Integer log_type;
private Long log_time;
/**
* 记录内容
*/
private String log_content;
/**
* 操作者uid
*/
private String log_ip;
/**
* 管理员id
*/
private Long adminid;
/**
* 操作时用户所在组
*/
private Integer group_id;
/**
* 浏览器类型
*/
private String user_agent;
/**
* 关联id
*/
private Long relation_id;
/**
* 无参数构造方法
*/
public Fc_admin_logs () {
super();
}
/**
* 全参数构造方法
* @param log_id 日志id
* @param log_type
* @param log_time
* @param log_content 记录内容
* @param log_ip 操作者uid
* @param adminid 管理员id
* @param group_id 操作时用户所在组
* @param user_agent 浏览器类型
* @param relation_id 关联id
*/
public Fc_admin_logs(Long log_id, Integer log_type, Long log_time, String log_content, String log_ip, Long adminid, Integer group_id, String user_agent, Long relation_id) {
this.log_id = log_id;
this.log_type = log_type;
this.log_time = log_time;
this.log_content = log_content;
this.log_ip = log_ip;
this.adminid = adminid;
this.group_id = group_id;
this.user_agent = user_agent;
this.relation_id = relation_id;
}
public void setLog_id(Long log_id) {
this.log_id = log_id;
}
public Long getLog_id() {
return log_id;
}
public void setLog_type(Integer log_type) {
this.log_type = log_type;
}
public Integer getLog_type() {
return log_type;
}
public void setLog_time(Long log_time) {
this.log_time = log_time;
}
public Long getLog_time() {
return log_time;
}
public void setLog_content(String log_content) {
this.log_content = log_content;
}
public String getLog_content() {
return log_content;
}
public void setLog_ip(String log_ip) {
this.log_ip = log_ip;
}
public String getLog_ip() {
return log_ip;
}
public void setAdminid(Long adminid) {
this.adminid = adminid;
}
public Long getAdminid() {
return adminid;
}
public void setGroup_id(Integer group_id) {
this.group_id = group_id;
}
public Integer getGroup_id() {
return group_id;
}
public void setUser_agent(String user_agent) {
this.user_agent = user_agent;
}
public String getUser_agent() {
return user_agent;
}
public void setRelation_id(Long relation_id) {
this.relation_id = relation_id;
}
public Long getRelation_id() {
return relation_id;
}
}
package com.egolm.film.bean;
import javax.persistence.Entity;
import javax.persistence.Id;
/**
* @author 曲欣亮
* @since 2018-10-17
* @version v-1.0
*/
@Entity(name="fc_excel_state")
public class Fc_excel_state implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
private Integer id;
private String type_name;
private String intro;
private Integer state;
/**
* 无参数构造方法
*/
public Fc_excel_state () {
super();
}
/**
* 全参数构造方法
* @param id
* @param type_name
* @param intro
* @param state
*/
public Fc_excel_state(Integer id, String type_name, String intro, Integer state) {
this.id = id;
this.type_name = type_name;
this.intro = intro;
this.state = state;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getId() {
return id;
}
public void setType_name(String type_name) {
this.type_name = type_name;
}
public String getType_name() {
return type_name;
}
public void setIntro(String intro) {
this.intro = intro;
}
public String getIntro() {
return intro;
}
public void setState(Integer state) {
this.state = state;
}
public Integer getState() {
return state;
}
}
package com.egolm.film.bean;
import javax.persistence.Entity;
import javax.persistence.Id;
/**
* @author 曲欣亮
* @since 2018-10-17
* @version v-1.0
*/
@Entity(name="fc_file_check")
public class Fc_file_check implements java.io.Serializable {
private static final long serialVersionUID = 1L;
/**
* 文件自增id
*/
@Id
private Integer id;
/**
* 文件或文件夹名称
*/
private String name;
/**
* 1 是 2 目录
*/
private Integer is_file;
/**
* 父类id
*/
private Integer parent_id;
/**
* 文件MD5值
*/
private String file_md5;
/**
* 全路径,值针对项目路径而言
*/
private String full_path;
/**
* 无参数构造方法
*/
public Fc_file_check () {
super();
}
/**
* 全参数构造方法
* @param id 文件自增id
* @param name 文件或文件夹名称
* @param is_file 1 是 2 目录
* @param parent_id 父类id
* @param file_md5 文件MD5值
* @param full_path 全路径,值针对项目路径而言
*/
public Fc_file_check(Integer id, String name, Integer is_file, Integer parent_id, String file_md5, String full_path) {
this.id = id;
this.name = name;
this.is_file = is_file;
this.parent_id = parent_id;
this.file_md5 = file_md5;
this.full_path = full_path;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getId() {
return id;
}
public void setName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public void setIs_file(Integer is_file) {
this.is_file = is_file;
}
public Integer getIs_file() {
return is_file;
}
public void setParent_id(Integer parent_id) {
this.parent_id = parent_id;
}
public Integer getParent_id() {
return parent_id;
}
public void setFile_md5(String file_md5) {
this.file_md5 = file_md5;
}
public String getFile_md5() {
return file_md5;
}
public void setFull_path(String full_path) {
this.full_path = full_path;
}
public String getFull_path() {
return full_path;
}
}
This diff is collapsed.
package com.egolm.film.bean;
import javax.persistence.Entity;
import javax.persistence.Id;
/**
* @author 曲欣亮
* @since 2018-10-17
* @version v-1.0
*/
@Entity(name="fc_film_admin_review")
public class Fc_film_admin_review implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
private Long id;
private Long film_id;
/**
* 原状态
*/
private Integer old_state;
/**
* 修改之后的状态
*/
private Integer state;
/**
* 管理员ip
*/
private String adminip;
/**
* 创建时间
*/
private Long create_time;
/**
* 备注
*/
private String remark;
/**
* 无参数构造方法
*/
public Fc_film_admin_review () {
super();
}
/**
* 全参数构造方法
* @param id
* @param film_id
* @param old_state 原状态
* @param state 修改之后的状态
* @param adminip 管理员ip
* @param create_time 创建时间
* @param remark 备注
*/
public Fc_film_admin_review(Long id, Long film_id, Integer old_state, Integer state, String adminip, Long create_time, String remark) {
this.id = id;
this.film_id = film_id;
this.old_state = old_state;
this.state = state;
this.adminip = adminip;
this.create_time = create_time;
this.remark = remark;
}
public void setId(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
public void setFilm_id(Long film_id) {
this.film_id = film_id;
}
public Long getFilm_id() {
return film_id;
}
public void setOld_state(Integer old_state) {
this.old_state = old_state;
}
public Integer getOld_state() {
return old_state;
}
public void setState(Integer state) {
this.state = state;
}
public Integer getState() {
return state;
}
public void setAdminip(String adminip) {
this.adminip = adminip;
}
public String getAdminip() {
return adminip;
}
public void setCreate_time(Long create_time) {
this.create_time = create_time;
}
public Long getCreate_time() {
return create_time;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getRemark() {
return remark;
}
}
package com.egolm.film.bean;
import javax.persistence.Entity;
/**
* @author 曲欣亮
* @since 2018-10-17
* @version v-1.0
*/
@Entity(name="fc_film_allot")
public class Fc_film_allot implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private Long film_id;
private Long uid;
/**
* 评审环节
*/
private Integer review_round;
/**
* 记录时间
*/
private Long push_time;
/**
* 管理员id
*/
private Long adminid;
/**
* 修改时间
*/
private Long update_time;
/**
* 是否复审 1是 0不是
*/
private Integer is_recheck;
/**
* 1最后复审
*/
private Integer review_last_recheck;
/**
* 1待评审 2已超时 3已开始 4已结束
*/
private Integer allot_state;
/**
* 无参数构造方法
*/
public Fc_film_allot () {
super();
}
/**
* 全参数构造方法
* @param film_id
* @param uid
* @param review_round 评审环节
* @param push_time 记录时间
* @param adminid 管理员id
* @param update_time 修改时间
* @param is_recheck 是否复审 1是 0不是
* @param review_last_recheck 1最后复审
* @param allot_state 1待评审 2已超时 3已开始 4已结束
*/
public Fc_film_allot(Long film_id, Long uid, Integer review_round, Long push_time, Long adminid, Long update_time, Integer is_recheck, Integer review_last_recheck, Integer allot_state) {
this.film_id = film_id;
this.uid = uid;
this.review_round = review_round;
this.push_time = push_time;
this.adminid = adminid;
this.update_time = update_time;
this.is_recheck = is_recheck;
this.review_last_recheck = review_last_recheck;
this.allot_state = allot_state;
}
public void setFilm_id(Long film_id) {
this.film_id = film_id;
}
public Long getFilm_id() {
return film_id;
}
public void setUid(Long uid) {
this.uid = uid;
}
public Long getUid() {
return uid;
}
public void setReview_round(Integer review_round) {
this.review_round = review_round;
}
public Integer getReview_round() {
return review_round;
}
public void setPush_time(Long push_time) {
this.push_time = push_time;
}
public Long getPush_time() {
return push_time;
}
public void setAdminid(Long adminid) {
this.adminid = adminid;
}
public Long getAdminid() {
return adminid;
}
public void setUpdate_time(Long update_time) {
this.update_time = update_time;
}
public Long getUpdate_time() {
return update_time;
}
public void setIs_recheck(Integer is_recheck) {
this.is_recheck = is_recheck;
}
public Integer getIs_recheck() {
return is_recheck;
}
public void setReview_last_recheck(Integer review_last_recheck) {
this.review_last_recheck = review_last_recheck;
}
public Integer getReview_last_recheck() {
return review_last_recheck;
}
public void setAllot_state(Integer allot_state) {
this.allot_state = allot_state;
}
public Integer getAllot_state() {
return allot_state;
}
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
package com.egolm.film.bean;
import javax.persistence.Entity;
import javax.persistence.Id;
/**
* @author 曲欣亮
* @since 2018-10-17
* @version v-1.0
*/
@Entity(name="fc_film_import_time")
public class Fc_film_import_time implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
private Long tid;
/**
* 创建时间
*/
private Long create_time;
private Long adminid;
/**
* 无参数构造方法
*/
public Fc_film_import_time () {
super();
}
/**
* 全参数构造方法
* @param tid
* @param create_time 创建时间
* @param adminid
*/
public Fc_film_import_time(Long tid, Long create_time, Long adminid) {
this.tid = tid;
this.create_time = create_time;
this.adminid = adminid;
}
public void setTid(Long tid) {
this.tid = tid;
}
public Long getTid() {
return tid;
}
public void setCreate_time(Long create_time) {
this.create_time = create_time;
}
public Long getCreate_time() {
return create_time;
}
public void setAdminid(Long adminid) {
this.adminid = adminid;
}
public Long getAdminid() {
return adminid;
}
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -6,7 +6,7 @@ import javax.persistence.Id; ...@@ -6,7 +6,7 @@ import javax.persistence.Id;
/** /**
* @author 曲欣亮 * @author 曲欣亮
* @since 2018-10-17 * @since 2018-11-19
* @version v-1.0 * @version v-1.0
*/ */
@Entity(name="fc_member") @Entity(name="fc_member")
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment