diff --git a/.gitignore b/.gitignore index 549e00a2a96fa9d7c5dbc9859664a78d980158c2..9af17df96a04b863006b067d81d46cd62fe7d5e6 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ build/ ### VS Code ### .vscode/ +/out/ +/myLogs/ +/myLogs/ diff --git a/pom.xml b/pom.xml index 05555ad83efa4fd9f349b2f50e7e09d4840c5563..292b3143bc29e1c09feac3c22d8187cf729fd8fc 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ com.cetc32 - dh - 0.0.1-SNAPSHOT + dh-authCenter + 1.1 jar dhManage Demo project for Spring Boot @@ -20,7 +20,6 @@ UTF-8 UTF-8 1.3.1 - @@ -28,6 +27,11 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + @@ -72,11 +85,7 @@ 42.2.18 - - com.cetc32 - web-util - 1.0 - + tk.mybatis @@ -101,11 +110,11 @@ mybatis-generator-core 1.3.7 --> - + com.github.pagehelper @@ -283,41 +292,8 @@ --> - - - - dev - - dev - - - - - true - - - - - - - - src/main/resources - false - - application-*.yml - - - - src/main/resources - true - - application-{profiles.active}.yml - - - - org.springframework.boot diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000000000000000000000000000000000000..561be43d4e33b5a6259c7b7b2521643b7c471dc3 --- /dev/null +++ b/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: com.cetc32.dh.DhApplication + diff --git a/src/main/java/com/cetc32/dh/DhApplication.java b/src/main/java/com/cetc32/dh/DhApplication.java index c30e26d8afd964104651226216892eae229070d9..4d71944b14b1d8416923d0fd2bfee67596ceb5dd 100644 --- a/src/main/java/com/cetc32/dh/DhApplication.java +++ b/src/main/java/com/cetc32/dh/DhApplication.java @@ -18,7 +18,7 @@ import tk.mybatis.spring.annotation.MapperScan; * @version: 1.0 * @date: 2020/10/13 11:19 */ -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"com.cetc32.dh","com.cetc32.webutil.client"}) @MapperScan(basePackages = "com.cetc32.dh.mybatis") public class DhApplication { diff --git a/src/main/java/com/cetc32/dh/beans/DataCollected.java b/src/main/java/com/cetc32/dh/beans/DataCollected.java deleted file mode 100644 index 5c0d68766e8a80505a57c16745fb5b17c96844eb..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/beans/DataCollected.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.cetc32.dh.beans; - -import java.util.Date; - -public class DataCollected { - private Integer userid; - private String eventtype; - private String points; - private String cityname; - private Date uploadtime; - private String describe; - private byte[] photo; - private String submitor; - - - - public Integer getUserid() { - return userid; - } - - public void setUserid(Integer userid) { - this.userid = userid; - } - - public String getEventtype() { - return eventtype; - } - - public void setEventtype(String eventtype) { - if(eventtype!=null) - { - eventtype=eventtype.toLowerCase(); - } - this.eventtype = eventtype; - } - - public String getPoints() { - return points; - } - - public void setPoints(String points) { - this.points = points; - } - - public String getCityname() { - return cityname; - } - - public void setCityname(String cityname) { - this.cityname = cityname; - } - - public Date getUploadtime() { - return uploadtime; - } - - public void setUploadtime(Date uploadtime) { - this.uploadtime = uploadtime; - } - - public String getDescribe() { - return describe; - } - - public void setDescribe(String describe) { - this.describe = describe; - } - - public byte[] getPhoto() { - return photo; - } - - public void setPhoto(byte[] photo) { - this.photo = photo; - } - - public String getSubmitor() { - return submitor; - } - - public void setSubmitor(String submitor) { - this.submitor = submitor; - } -} diff --git a/src/main/java/com/cetc32/dh/beans/FormSysInfo.java b/src/main/java/com/cetc32/dh/beans/FormSysInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..4628e81edf1c6a5e9eeb98b0e5274fb456d821d4 --- /dev/null +++ b/src/main/java/com/cetc32/dh/beans/FormSysInfo.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/7 上午10:48 + ******************************************************************************/ +package com.cetc32.dh.beans; + +import com.cetc32.dh.entity.SysInfo; + +public class FormSysInfo { + private String permission; + private String sysurl; + private String sysname; + + public String getPermission() { + return permission; + } + + public void setPermission(String permission) { + this.permission = permission; + } + + public String getSysurl() { + return sysurl; + } + + public void setSysurl(String sysurl) { + this.sysurl = sysurl; + } + + public String getSysname() { + return sysname; + } + + public void setSysname(String sysname) { + this.sysname = sysname; + } +} diff --git a/src/main/java/com/cetc32/dh/beans/FormUser.java b/src/main/java/com/cetc32/dh/beans/FormUser.java new file mode 100644 index 0000000000000000000000000000000000000000..4ec8bccd6c3df5a669e630037ceb4c4a5993f062 --- /dev/null +++ b/src/main/java/com/cetc32/dh/beans/FormUser.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/7/22 下午3:36 + ******************************************************************************/ +package com.cetc32.dh.beans; + +public class FormUser { + String username; + String password; + String passwordN; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getPasswordN() { + return passwordN; + } + + public void setPasswordN(String passwordN) { + this.passwordN = passwordN; + } +} diff --git a/src/main/java/com/cetc32/dh/beans/ReqSubmit.java b/src/main/java/com/cetc32/dh/beans/ReqSubmit.java deleted file mode 100644 index 9ff7e1a2c1fb62bce4749de6c12a315bd6ec3802..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/beans/ReqSubmit.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.cetc32.dh.beans; - -import org.springframework.web.multipart.MultipartFile; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -public class ReqSubmit { - private String project; - private String name; - private String duedate; - private String area; - private String description; - private String username; - private Integer department; - private MultipartFile file; - - public String getProject() { - return project; - } - - public void setProject(String project) { - this.project = project; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Date getDuedate() { - SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd" ); - try { - return sdf.parse(duedate); - } catch (ParseException e) { - return null; -// e.printStackTrace(); - } - } - - public void setDuedate(String duedate) { - this.duedate = duedate; - } - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public Integer getDepartment() { - return department; - } - - public void setDepartment(Integer department) { - this.department = department; - } - - public MultipartFile getFile() { - return file; - } - - public void setFile(MultipartFile file) { - this.file = file; - } - - @Override - public String toString() { - return "ReqSubmit{" + - "project='" + project + '\'' + - ", name='" + name + '\'' + - ", duedate='" + duedate + '\'' + - ", area='" + area + '\'' + - ", description='" + description + '\'' + - ", username='" + username + '\'' + - ", department=" + department + - ", file=" + file.getName() + - '}'; - } -} diff --git a/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java b/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java deleted file mode 100644 index 2c0692d9770d790da162ba7c1c22f9c454ff09ff..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.cetc32.dh.beans; - - -import com.alibaba.fastjson.annotation.JSONField; - -import java.util.Date; - -public class ResultDataCollected { - private Integer userid; - private String eventtype; - private String points; - private String cityname; - private Date uploadtime; - private String describe; - private String photopath; - - - - public String getPhotopath() { - return photopath; - } - - public void setPhotopath(String photopath) { - this.photopath = photopath; - } - - - public Integer getUserid() { - return userid; - } - - public void setUserid(Integer userid) { - this.userid = userid; - } - - public String getEventtype() { - return eventtype; - } - - public void setEventtype(String eventtype) { - this.eventtype = eventtype; - } - - public String getPoints() { - return points; - } - - public void setPoints(String points) { - this.points = points; - } - - public String getCityname() { - return cityname; - } - - public void setCityname(String cityname) { - this.cityname = cityname; - } - - public Date getUploadtime() { - return uploadtime; - } - - public void setUploadtime(Date uploadtime) { - this.uploadtime = uploadtime; - } - - public String getDescribe() { - return describe; - } - - public void setDescribe(String describe) { - this.describe = describe; - } - -} diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java index 0a7f47815131d66602dc6750c5aeb36e788182e7..67d7104b93fe72c827644500430e85a997b65979 100644 --- a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java +++ b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java @@ -2,7 +2,10 @@ package com.cetc32.dh.beans; import com.cetc32.dh.entity.NumberS; +import javax.persistence.Column; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -18,9 +21,124 @@ public class ResultUserInfo extends NumberS { private Integer security; private List department; private List areacode; + private List permissions; + /** + * 用户状态 + * */ private Integer userStatus; + /** + * 登记时间 + */ + private Date regTime; + /** + * 失败次数 + * **/ + private Integer loginFailed; + + /** + * 网页登陆时间 + * **/ + private Date webLoginDate; + + /** + * 网页登陆状态 + * **/ + private Integer webLoginStatus; + + /** + * 网页登陆次数 + * **/ + private Integer webLoginCount; + + /** + * app登陆时间 + * **/ + private Date appLoginDate; + + /** + * app登陆状态 + * **/ + private Integer appLoginStatus; + + /** + * app登陆次数 + * **/ + private Integer appLoginCount; + /** + * app登陆次数 + * **/ + private String userPhone; + /** + * app登陆次数 + * **/ + private String realName; + + public Date getRegTime() { + return regTime; + } + + public void setRegTime(Date regTime) { + this.regTime = regTime; + } + + public Integer getLoginFailed() { + return loginFailed; + } + + public void setLoginFailed(Integer loginFailed) { + this.loginFailed = loginFailed; + } + + public Date getWebLoginDate() { + return webLoginDate; + } + + public void setWebLoginDate(Date webLoginDate) { + this.webLoginDate = webLoginDate; + } + + public Integer getWebLoginStatus() { + return webLoginStatus; + } + + public void setWebLoginStatus(Integer webLoginStatus) { + this.webLoginStatus = webLoginStatus; + } + + public Integer getWebLoginCount() { + return webLoginCount; + } + + public void setWebLoginCount(Integer webLoginCount) { + this.webLoginCount = webLoginCount; + } + + public Date getAppLoginDate() { + return appLoginDate; + } + + public void setAppLoginDate(Date appLoginDate) { + this.appLoginDate = appLoginDate; + } + + public Integer getAppLoginStatus() { + return appLoginStatus; + } + + public void setAppLoginStatus(Integer appLoginStatus) { + this.appLoginStatus = appLoginStatus; + } + + public Integer getAppLoginCount() { + return appLoginCount; + } + + public void setAppLoginCount(Integer appLoginCount) { + this.appLoginCount = appLoginCount; + } + public Integer getUserStatus() { return userStatus; } @@ -48,16 +166,42 @@ public class ResultUserInfo extends NumberS { public List getDepartment() { return department; } - public void setDepartment(String department) + +// public void setDepartment(List department) { +// this.department = department; +// } + + public void setDepartment(Object department) { - this.department=str2intList(department); + if(department ==null) + { + this.department = new ArrayList<>(); + return; + } + if(department instanceof String) + { + if(((String)department).isEmpty()) + { + this.department = new ArrayList<>(); + return; + } + // String s=trimBothEndsChars((String) department,","); + this.department=str2intList((String) department); + } + if(department instanceof List || department instanceof ArrayList) + { + this.department=(List) department; + } } public List getAreacode() { return areacode; } - public void setAreacode(String areacode) +// public void setAreacode(Listareacode){ +// this.areacode=areacode; +// } + public void setAreacode(Object areacode) { if(areacode ==null) { @@ -66,16 +210,90 @@ public class ResultUserInfo extends NumberS { } if(areacode instanceof String) { - if(areacode.isEmpty()) + if(((String)areacode).isEmpty()) { this.areacode = new ArrayList<>(); return; } - String s=trimBothEndsChars(areacode,","); + String s=trimBothEndsChars((String) areacode,","); this.areacode=Stream.of(s.split(",")).collect(Collectors.toList()); } + if(areacode instanceof List || areacode instanceof ArrayList) + { + this.areacode=(List) areacode; + } } + public void addPermissions(List permissions){ + if(permissions ==null){ + return; + } + if(permissions instanceof List){ + if(permissions.isEmpty()){ + return; + } + if(this.permissions==null ) + this.permissions=new ArrayList<>(); + this.permissions.addAll(permissions); + } + } + public void setPermissions(String[] permissions){ + if(permissions ==null) + { + this.permissions = new ArrayList<>(); + return; + } + if(permissions instanceof String[]) + { + if(permissions.length==0) + { + return; + } + if(this.permissions==null ) + this.permissions=new ArrayList<>(); + this.permissions.clear(); + this.permissions.addAll(Arrays.asList(permissions)); + } + } + public void setPermissions(List permissions){ + if(permissions ==null) + { + this.permissions = new ArrayList<>(); + return; + } + if(permissions instanceof List) + { + if(permissions.isEmpty()) + { + //this.permissions = new ArrayList<>(); + return; + } + if(this.permissions==null ) + this.permissions=new ArrayList<>(); + this.permissions.clear(); + this.permissions.addAll(permissions); + } + } + public void setPermissions(String permissions){ + if(permissions ==null) + { + this.permissions = new ArrayList<>(); + return; + } + if(permissions instanceof String) + { + if(permissions.isEmpty()) + { + //this.permissions = new ArrayList<>(); + return ; + } + String s=trimBothEndsChars(permissions,","); + this.permissions=Stream.of(s.split(",")).collect(Collectors.toList()); + } + } + public List getPermissions() { + return permissions; + } public String getUsername() { return username; @@ -93,4 +311,21 @@ public class ResultUserInfo extends NumberS { this.security = security; } + + + public String getRealName() { + return realName; + } + + public void setRealName(String realName) { + this.realName = realName; + } + + public String getUserPhone() { + return userPhone; + } + + public void setUserPhone(String userPhone) { + this.userPhone = userPhone; + } } diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java b/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java index 446083a1242fe2f2f7d09641296a0ccdd9f2aa9e..dd6d2c24a77a208104ffd5ba9cb2c905116b5192 100644 --- a/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java +++ b/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java @@ -1,5 +1,6 @@ package com.cetc32.dh.beans; +import java.util.Date; import java.util.List; public class ResultUserInfoDe extends ResultUserInfo { @@ -8,6 +9,8 @@ public class ResultUserInfoDe extends ResultUserInfo { private List areaCodeName; private List departmentName; + + public List getAreaCodeName() { return areaCodeName; } diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserRole.java b/src/main/java/com/cetc32/dh/beans/ResultUserRole.java index df167a7d1c007143a3883c772b13649965a73cd7..da107cb059a5a82a60d14badfeab00dec8737423 100644 --- a/src/main/java/com/cetc32/dh/beans/ResultUserRole.java +++ b/src/main/java/com/cetc32/dh/beans/ResultUserRole.java @@ -19,6 +19,23 @@ public class ResultUserRole extends NumberS { private Integer id; + /** + * 角色名称 + */ + @Column(name = "role_name") + private String roleName; + /** + * 权限列表 + * */ + private List systemMenu; + /** + * 权限描述 + * */ + private String description; + /** + * 是否默认 + * */ + private Integer isDefault; public List getSystemMenu() { return systemMenu; @@ -34,21 +51,13 @@ public class ResultUserRole extends NumberS { String s= Tools.trimBothEndsChars((String) systemMenu,","); this.systemMenu= Stream.of(s.split(",")).collect(Collectors.toList()); } - else + else if(systemMenu instanceof List) { this.systemMenu = (List) systemMenu; } } - private List systemMenu; - private String description; - private Integer isDefault; - /** - * 角色名称 - */ - @Column(name = "role_name") - private String roleName; public Integer getId() { return id; diff --git a/src/main/java/com/cetc32/dh/beans/StatisticBean.java b/src/main/java/com/cetc32/dh/beans/StatisticBean.java new file mode 100644 index 0000000000000000000000000000000000000000..381683057630891c62f2a5eac39cbdcf407c0d64 --- /dev/null +++ b/src/main/java/com/cetc32/dh/beans/StatisticBean.java @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/25 上午11:04 + ******************************************************************************/ +package com.cetc32.dh.beans; +/*** + * 数量统计专用类 + * + * **/ +public class StatisticBean { + /** + * 统计类型的唯一标示 + * */ + Integer id; + /** + * 统计类型的展示名称 + * */ + String name; + /** + * 统计类型的总计数 + * **/ + Integer value; + + public StatisticBean(){ + + } + /** + * 构造函数 + * @param id + * @param name + * @param value + * */ + public StatisticBean(Integer id,String name,Integer value){ + this.id = id; + this.value= value; + this.name = name; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } +} diff --git a/src/main/java/com/cetc32/dh/beans/TraceUpload.java b/src/main/java/com/cetc32/dh/beans/TraceUpload.java deleted file mode 100644 index 5578bbeffbb57c600ee2e646ffe8e4a5bacf19aa..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/beans/TraceUpload.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.cetc32.dh.beans; - -import java.util.Date; - -public class TraceUpload { - - private String path; - private String title; - private String category; - private String starttime; - private String endtime; - private String size; - - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public String getStarttime() { - return starttime; - } - - public void setStarttime(String starttime) { - this.starttime = starttime; - } - - public String getEndtime() { - return endtime; - } - - public void setEndtime(String endtime) { - this.endtime = endtime; - } - - public String getSize() { - return size; - } - - public void setSize(String size) { - this.size = size; - } - - -} diff --git a/src/main/java/com/cetc32/dh/beans/UserInfo.java b/src/main/java/com/cetc32/dh/beans/UserInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..e1acd57b427287827ef44a455035afbe1b873aa6 --- /dev/null +++ b/src/main/java/com/cetc32/dh/beans/UserInfo.java @@ -0,0 +1,86 @@ +package com.cetc32.dh.beans; + +import com.cetc32.dh.entity.NumberS; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class UserInfo extends NumberS { + private String username; + private String password; + private List role; + private Integer security; + private List department; + private List areacode; + + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public List getRole() { + return role; + } + + public void setRole(List role) { + this.role = role; + } + public void setSingleRole(String singleRole) { + if(isNumber(singleRole)) + { + this.role = new ArrayList<>(); + this.role.add(Integer.parseInt(singleRole)); + } + } + + public Integer getSecurity() { + return security; + } + + public void setSecurity(Integer security) { + this.security = security; + } + + public List getDepartment() { + return department; + } + + public void setDepartment(List department) { + this.department = department; + } + + public List getAreacode() { + return areacode; + } + + public void setAreacode(List areacode) { + this.areacode = areacode; + } + + + private boolean isNumber(String num) + { + if(num==null || num.isEmpty()) + { + return false; + } + Pattern pattern = Pattern.compile("[0-9]*"); + return pattern.matcher(num).matches(); + } + +} diff --git a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java b/src/main/java/com/cetc32/dh/common/filter/FormFilter.java deleted file mode 100644 index 162c938c9628071467fc7a96a7c3201205a23e28..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * Copyright(C): CETC-32 - * 文件描述：过滤认证格式类 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.filter; - - -import com.cetc32.dh.entity.BaseAdminUser; -import org.apache.shiro.session.Session; -import org.apache.shiro.subject.Subject; -import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -/** - * @Title: FormFilter - * @Description: 过滤认证格式类 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述：2020/9/13加上 subject.isRemembered()，让它同时也兼容remember这种情况。 - */ -public class FormFilter extends FormAuthenticationFilter { - - /** - * 指定缓存失效时间 - * @param request servlet请求 - * @param response servlet响应 - * @param mappedValue 之前传输数据使用的对象，现在废弃了 - * @return 返回布尔值true，说明登陆用户为已登陆的且使用记住我功能登陆的用户，反之亦然。 - * 修改信息： - */ - @Override - protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) { - Subject subject = getSubject(request, response); - - // 如果 isAuthenticated 为 false 证明不是登录过的，同时 isRememberd 为true - // 证明是没登陆直接通过记住我功能进来的 - if (!subject.isAuthenticated() && subject.isRemembered()) { - - // 获取session看看是不是空的 - Session session = subject.getSession(true); - - // 查看session属性当前是否是空的 - if (session.getAttribute("userName") == null) { - // 如果是空的才初始化 - BaseAdminUser user = (BaseAdminUser)subject.getPrincipal(); - //存入用户数据 - session.setAttribute("userName", user.getSysUserName()); - } - } - - // 这个方法本来只返回 subject.isAuthenticated() 现在我们加上 subject.isRemembered() - // 让它同时也兼容remember这种情况 - return subject.isAuthenticated() || subject.isRemembered(); -// return true; - } - -} diff --git a/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java b/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java deleted file mode 100644 index da983d8aaff581babff423adfc2743455bcdf823..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java +++ /dev/null @@ -1,201 +0,0 @@ -/** - * 文件描述： Token检查类 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.filter; - -import com.auth0.jwt.exceptions.TokenExpiredException; -import com.cetc32.dh.common.utils.JWTUtil; -import com.cetc32.dh.config.JWTToken; -import com.cetc32.dh.config.RedisUtil; -import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URLEncoder; - -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -public class JWTFilter extends BasicHttpAuthenticationFilter { - /** - * 指定缓存失效时间 - * @param request servlet请求 - * @param response servlet响应 - * @param mappedValue 之前传输数据使用的对象，现在废弃了 - * @return 返回布尔值true或false，true说明toker校验通过 - * 修改信息： - */ - //是否允许访问，如果带有 token，则对 token 进行检查，否则直接通过 - @Override - protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) { - //判断请求的请求头是否带上 "Token" - System.out.println("isAccessAllowed"); - if (isLoginAttempt(request, response)){ - //如果存在，则进入 executeLogin 方法执行登入，检查 token 是否正确 - try { - executeLogin(request, response); - return true; - - }catch (Exception e){ - /* - * 注意这里捕获的异常其实是在Realm抛出的，但是由于executeLogin（）方法抛出的异常是从login（）来的， - * login抛出的异常类型是AuthenticationException，所以要去获取它的子类异常才能获取到我们在Realm抛出的异常类型。 - */ - System.out.println("刷新token"); - String msg=e.getMessage(); - Throwable cause = e.getCause(); - if (cause!=null&&cause instanceof TokenExpiredException){ - //AccessToken过期，尝试去刷新token - String result=refreshToken(request, response); - if (result.equals("success")){ - System.out.println("request.equals(\"success\")"); - return true; - } - msg=result; - } - responseError(response,msg); - } - } - //如果请求头不存在 Token，则可能是执行登陆操作或者是游客状态访问，无需检查 token，直接返回 true - return true; - } - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) { - HttpServletRequest req= (HttpServletRequest) request; - String token=req.getHeader("Authorization"); - return token !=null; - } - /** - * executeLogin实际上就是先调用createToken来获取token，这里我们重写了这个方法，就不会自动去调用createToken来获取token - * 然后调用getSubject方法来获取当前用户再调用login方法来实现登录 - * 这也解释了我们为什么要自定义jwtToken，因为我们不再使用Shiro默认的UsernamePasswordToken了。 - * */ - @Override - protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception { - System.out.println("executeLogin"); - HttpServletRequest req= (HttpServletRequest) request; - String token=req.getHeader("Authorization"); - JWTToken jwt=new JWTToken(token); - //交给自定义的realm对象去登录，如果错误他会抛出异常并被捕获 - getSubject(request, response).login(jwt); - return true; - } - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception { - System.out.println("preHandle"); - HttpServletRequest req= (HttpServletRequest) request; - HttpServletResponse res= (HttpServletResponse) response; - res.setHeader("Access-control-Allow-Origin",req.getHeader("Origin")); - res.setHeader("Access-control-Allow-Methods","GET,POST,OPTIONS,PUT,DELETE"); - res.setHeader("Access-control-Allow-Headers",req.getHeader("Access-Control-Request-Headers")); - // 跨域时会首先发送一个option请求，这里我们给option请求直接返回正常状态 - if (req.getMethod().equals(RequestMethod.OPTIONS.name())) { - res.setStatus(HttpStatus.OK.value()); - return false; - } - return super.preHandle(request, response); - } - - /** - * 将非法请求跳转到 /unauthorized/** - */ - private void responseError(ServletResponse response, String message) { - System.out.println("responseError"); - - try { - HttpServletResponse httpServletResponse = (HttpServletResponse) response; - //设置编码，否则中文字符在重定向时会变为空字符串 - message = URLEncoder.encode(message, "UTF-8"); - httpServletResponse.sendRedirect("/unauthorized/" + message); - } catch (IOException e) { - System.out.println(e.getMessage()); - } - } - - - /** - * 这里的getBean是因为使用@Autowired无法把RedisUtil注入进来 - * 这样自动去注入当使用的时候是未NULL，是注入不进去了。通俗的来讲是因为拦截器在spring扫描bean之前加载所以注入不进去。 - * 解决的方法： - * 可以通过已经初始化之后applicationContext容器中去获取需要的bean. - * */ - public T getBean(Class clazz,HttpServletRequest request){ - WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); - return applicationContext.getBean(clazz); - } - - //刷新token - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - private String refreshToken(ServletRequest request,ServletResponse response) { - System.out.println("refreshToken"); - - HttpServletRequest req= (HttpServletRequest) request; - RedisUtil redisUtil=getBean(RedisUtil.class,req); - //获取传递过来的accessToken - String accessToken=req.getHeader("Authorization"); - //获取token里面的用户名 - String username= JWTUtil.getUsername(accessToken); - System.out.println("username"+username); - //判断refreshToken是否过期了，过期了那么所含的username的键不存在 - System.out.println("redisUtil.hasKey(username)"+redisUtil.hasKey(username)); - if (redisUtil.hasKey(username)){ - //判断refresh的时间节点和传递过来的accessToken的时间节点是否一致，不一致校验失败 - long current= (long) redisUtil.get(username); - if (current== JWTUtil.getExpire(accessToken)){ - //获取当前时间节点 - long currentTimeMillis = System.currentTimeMillis(); - //生成刷新的token - String token=JWTUtil.createToken(username,currentTimeMillis); - //刷新redis里面的refreshToken,过期时间是30min - redisUtil.set(username,currentTimeMillis,30*60); - //再次交给shiro进行认证 - JWTToken jwtToken=new JWTToken(token); - try { - getSubject(request, response).login(jwtToken); - // 最后将刷新的AccessToken存放在Response的Header中的Authorization字段返回 - HttpServletResponse httpServletResponse = (HttpServletResponse) response; - httpServletResponse.setHeader("Authorization", token); - httpServletResponse.setHeader("Access-Control-Expose-Headers", "Authorization"); - return "success"; - }catch (Exception e){ - return e.getMessage(); - } - } - } - return "token认证失效，token过期，重新登陆"; - } -} diff --git a/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java b/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java deleted file mode 100644 index 5b9122ca4ee98d3fc9c5a8c910f63a36d3ab0d45..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java +++ /dev/null @@ -1,239 +0,0 @@ -/** - * @Title: KickouSessionFilter - * @Description: 进行用户访问控制 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.filter; - -import com.cetc32.dh.common.IStatusMessage; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.common.utils.ShiroFilterUtils; -import com.cetc32.dh.entity.BaseAdminUser; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.shiro.cache.Cache; -import org.apache.shiro.cache.CacheManager; -import org.apache.shiro.session.Session; -import org.apache.shiro.session.mgt.DefaultSessionKey; -import org.apache.shiro.session.mgt.SessionManager; -import org.apache.shiro.subject.Subject; -import org.apache.shiro.web.filter.AccessControlFilter; -import org.apache.shiro.web.util.WebUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Serializable; -import java.util.ArrayDeque; -import java.util.Deque; - -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -public class KickoutSessionFilter extends AccessControlFilter { - - private static final Logger logger = LoggerFactory.getLogger(KickoutSessionFilter.class); - - private final static ObjectMapper objectMapper = new ObjectMapper(); - - private String kickoutUrl; // 踢出后到的地址 - private boolean kickoutAfter = false; // 踢出之前登录的/之后登录的用户 默认false踢出之前登录的用户 - private int maxSession = 1; // 同一个帐号最大会话数 默认1 - private SessionManager sessionManager; - private Cache> cache; - - public void setKickoutUrl(String kickoutUrl) { - this.kickoutUrl = kickoutUrl; - } - - public void setKickoutAfter(boolean kickoutAfter) { - this.kickoutAfter = kickoutAfter; - } - - public void setMaxSession(int maxSession) { - this.maxSession = maxSession; - } - - public void setSessionManager(SessionManager sessionManager) { - this.sessionManager = sessionManager; - } - - // 设置Cache的key的前缀 - public void setCacheManager(CacheManager cacheManager) { - //必须和ehcache缓存配置中的缓存name一致 - this.cache = cacheManager.getCache("shiro-activeSessionCache"); - } - - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected boolean isAccessAllowed(ServletRequest servletRequest, ServletResponse servletResponse, Object o) throws Exception { -// return false; - return true; - } - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected boolean onAccessDenied(ServletRequest request, ServletResponse response)throws Exception { - Subject subject = getSubject(request,response); - // 没有登录授权 且没有记住我 - if(!subject.isAuthenticated() && !subject.isRemembered()){ - // 如果没有登录，直接进行之后的流程 - return true; - } - // 获得用户请求的URI - HttpServletRequest req=(HttpServletRequest) request; - String path = req.getRequestURI(); - logger.info("===当前请求的uri:" + path); - - if(path.equals("/login")){ - return true; - } - Session session = subject.getSession(); - logger.info("session时间设置：" + String.valueOf(session.getTimeout())); - - - try{ - // 当前用户 - BaseAdminUser user = (BaseAdminUser) subject.getPrincipal(); - String username = user.getSysUserName(); - logger.info("===当前用户username:" + username); - Serializable sessionId = session.getId(); - logger.info("===当前用户sessionId:" + sessionId); - // 读取缓存用户 没有就存入 - Deque deque = cache.get(username); - logger.debug("===当前deque:" + deque); - if (deque == null) { - // 初始化队列 - deque = new ArrayDeque(); - } - // 如果队列里没有此sessionId，且用户没有被踢出；放入队列 - if (!deque.contains(sessionId) && session.getAttribute("kickout") == null) { - // 将sessionId存入队列 - deque.push(sessionId); - // 将用户的sessionId队列缓存 - cache.put(username, deque); - } - // 如果队列里的sessionId数超出最大会话数，开始踢人 - while (deque.size() > maxSession) { - logger.debug("===deque队列长度:" + deque.size()); - Serializable kickoutSessionId = null; - // 是否踢出后来登录的，默认是false；即后者登录的用户踢出前者登录的用户； - if (kickoutAfter) { // 如果踢出后者 - kickoutSessionId = deque.removeFirst(); - } else { // 否则踢出前者 - kickoutSessionId = deque.removeLast(); - } - // 踢出后再更新下缓存队列 - cache.put(username, deque); - try{ - // 获取被踢出的sessionId的session对象 - Session kickoutSession = sessionManager - .getSession(new DefaultSessionKey(kickoutSessionId)); - if (kickoutSession != null) { - // 设置会话的kickout属性表示踢出了 - kickoutSession.setAttribute("kickout", true); - } - }catch (Exception e){ - - } - } - - // 如果被踢出了，(前者或后者)直接退出，重定向到踢出后的地址 - if ((Boolean) session.getAttribute("kickout") != null - && (Boolean) session.getAttribute("kickout") == true){ - // 会话被踢出了 - try { - // 退出登录 - subject.logout(); - } catch (Exception e) { // ignore - } - saveRequest(request); - logger.debug("===踢出后用户重定向的路径kickoutUrl:" + kickoutUrl); - return isAjaxResponse(request,response); - } - return true; - }catch (Exception e){ - logger.error("控制用户在线数量【KickoutSessionFilter.onAccessDenied】异常！", e); - return isAjaxResponse(request,response); - } - } - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static void out(ServletResponse response, ResponseResult result){ - PrintWriter out = null; - try { - response.setCharacterEncoding("UTF-8");//设置编码 - response.setContentType("application/json");//设置返回类型 - out = response.getWriter(); - out.println(objectMapper.writeValueAsString(result));//输出 - logger.info("用户在线数量限制【KickoutSessionFilter.out】响应json信息成功"); - } catch (Exception e) { - logger.error("用户在线数量限制【KickoutSessionFilter.out】响应json信息出错", e); - }finally{ - if(null != out){ - out.flush(); - out.close(); - } - } - } - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - private boolean isAjaxResponse(ServletRequest request, - ServletResponse response) throws IOException { - // ajax请求 - /** - * 判断是否已经踢出 - * 1.如果是Ajax 访问，那么给予json返回值提示。 - * 2.如果是普通请求，直接跳转到登录页 - */ - //判断是不是Ajax请求 - ResponseResult responseResult = new ResponseResult(); - if (ShiroFilterUtils.isAjax(request) ) { - logger.info(getClass().getName()+ "当前用户已经在其他地方登录，并且是Ajax请求！"); - responseResult.setCode(IStatusMessage.SystemStatus.MANY_LOGINS.getCode()); - responseResult.setMessage("您已在别处登录，请您修改密码或重新登录"); - out(response, responseResult); - }else{ - // 重定向 - WebUtils.issueRedirect(request, response, kickoutUrl); - } - return false; -// return true; - } - - -} diff --git a/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java b/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java index 66618eb444a3591e2cb1553103237908da8b1897..92573a74a41d3a0438308e9dc1c324517d4968ec 100644 --- a/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java +++ b/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java @@ -12,6 +12,7 @@ import com.auth0.jwt.exceptions.TokenExpiredException; import org.apache.shiro.ShiroException; import org.apache.shiro.authz.UnauthenticatedException; import org.apache.shiro.authz.UnauthorizedException; +import org.locationtech.jts.triangulate.ConstraintEnforcementException; import org.springframework.http.HttpStatus; import org.springframework.validation.BindingResult; import org.springframework.validation.ObjectError; @@ -37,101 +38,84 @@ public class GlobalExceptionHandler { // 捕捉shiro的异常 @ResponseStatus(HttpStatus.UNAUTHORIZED) @ExceptionHandler(ShiroException.class) - public ResponseResult handle401(ShiroException e) { - return ResponseResult.fail(401, e.getMessage(), null); + public ResponseData handle401(ShiroException e) { + return ResponseData.fail(401, e.getMessage(), null); } // 捕捉未登录的异常 @ResponseStatus(HttpStatus.UNAUTHORIZED) @ExceptionHandler(UnauthenticatedException.class) - public ResponseResult handle401(UnauthenticatedException e) { + public ResponseData handle401(UnauthenticatedException e) { System.out.println(e.getMessage()); - return ResponseResult.fail(401, "你还没有登录", null); + return ResponseData.fail(401, "你还没有登录", null); } // 捕捉没有相应的权限或者角色的异常 @ResponseStatus(HttpStatus.UNAUTHORIZED) @ExceptionHandler(UnauthorizedException.class) - public ResponseResult handle401(UnauthorizedException e) { + public ResponseData handle401(UnauthorizedException e) { System.out.println(e.getMessage()); - return ResponseResult.fail(401, "你没有权限访问"+e.getMessage(), null); + return ResponseData.fail(401, "你没有权限访问"+e.getMessage(), null); } - - /** - * @Validated 校验错误异常处理 - */ /** * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) * @return * 修改信息： */ @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(value = MethodArgumentNotValidException.class) - public ResponseResult handler(MethodArgumentNotValidException e) throws IOException { + public ResponseData handler(MethodArgumentNotValidException e) throws IOException { // log.error("运行时异常:-------------->",e); BindingResult bindingResult = e.getBindingResult(); //这一步是把异常的信息最简化 ObjectError objectError = bindingResult.getAllErrors().stream().findFirst().get(); - return ResponseResult.fail(HttpStatus.BAD_REQUEST.value(),objectError.getDefaultMessage(),null); + return ResponseData.fail(HttpStatus.BAD_REQUEST.value(),objectError.getDefaultMessage(),null); } - /** - * 处理Assert的异常 - */ /** * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) * @return * 修改信息： */ @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(value = IllegalArgumentException.class) - public ResponseResult handler(IllegalArgumentException e) throws IOException { + public ResponseData handler(IllegalArgumentException e) throws IOException { // log.error("Assert异常:-------------->{}",e.getMessage()); - return ResponseResult.fail(400,e.getMessage(),null); + return ResponseData.fail(400,e.getMessage(),null); } //运行时错误处理 /** * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) * @return * 修改信息： */ @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(value = RuntimeException.class) - public ResponseResult handle(RuntimeException e){ - return ResponseResult.fail(HttpStatus.BAD_REQUEST.value(),e.getMessage(),null); + public ResponseData handle(RuntimeException e){ + return ResponseData.fail(HttpStatus.BAD_REQUEST.value(),e.getMessage(),null); } /** * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) * @return * 修改信息： */ @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(value = TokenExpiredException.class) - public ResponseResult handler(TokenExpiredException e) throws IOException { - return ResponseResult.fail(HttpStatus.BAD_REQUEST.value(),"token已经过期，请重新登录",null); + public ResponseData handler(TokenExpiredException e) throws IOException { + return ResponseData.fail(HttpStatus.BAD_REQUEST.value(),"token已经过期，请重新登录",null); } /** * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) * @return * 修改信息： */ @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) @ExceptionHandler(value= HttpRequestMethodNotSupportedException.class) - public ResponseResult handler405(HttpRequestMethodNotSupportedException e){ - return ResponseResult.fail(HttpStatus.METHOD_NOT_ALLOWED.value(),"方法不支持的請求方式",null); + public ResponseData handler405(HttpRequestMethodNotSupportedException e){ + return ResponseData.fail(HttpStatus.METHOD_NOT_ALLOWED.value(),"方法不支持的請求方式",null); } } diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java index 0b4fcad2ee2a214c76ac413f8837eb41bca3d741..ae9354903e2a5751c9e36b35c7795f9a09e86fca 100644 --- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java +++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java @@ -10,6 +10,7 @@ package com.cetc32.dh.common.response; import com.cetc32.dh.entity.NumberS; +import com.cetc32.dh.entity.SysInfo; import java.util.List; @@ -19,15 +20,16 @@ import java.util.List; * @version: 1.0 * @date: 2020/9/11 10:55 */ -public class PageDataResult { +public class PageDataResult extends ResponseMessage{ - private Integer code=200; + //private Integer code=200; //总记录数量 private Integer totals; private List list; + public List getList_new() { return list_new; } @@ -63,13 +65,13 @@ public class PageDataResult { } - public Integer getCode() { + /*public Integer getCode() { return code; } public void setCode(Integer code) { this.code = code; - } + }*/ public Integer getTotals() { return totals; diff --git a/src/main/java/com/cetc32/dh/common/response/ResponseData.java b/src/main/java/com/cetc32/dh/common/response/ResponseData.java index 142ff025c86b7908c3d9d55dde1f58bbc7a6d7a7..f7bbd912a30679c97935ce9bf22071fae89fddc5 100644 --- a/src/main/java/com/cetc32/dh/common/response/ResponseData.java +++ b/src/main/java/com/cetc32/dh/common/response/ResponseData.java @@ -2,43 +2,40 @@ package com.cetc32.dh.common.response; import com.cetc32.dh.common.IStatusMessage; -public class ResponseData { +public class ResponseData extends ResponseMessage{ - private String code; - private String message; + //private String code; + //private String message; private Object data; public ResponseData() { - this.code = IStatusMessage.SystemStatus.SUCCESS.getCode(); + this.code = Integer.valueOf(IStatusMessage.SystemStatus.SUCCESS.getCode()); this.message = IStatusMessage.SystemStatus.SUCCESS.getMessage(); } public ResponseData(IStatusMessage statusMessage){ - this.code = statusMessage.getCode(); + this.code = Integer.valueOf(statusMessage.getCode()); this.message = statusMessage.getMessage(); } public ResponseData(String mg){ - this.code="200"; - this.message=mg; + this(mg,null); } public ResponseData(String mg,Object obj){ - this.code="200"; - this.data=obj; - this.message=mg; + this("200",mg,obj); } public ResponseData(String code ,String mg,Object obj){ - this.code=code; + this.code=Integer.valueOf(code); this.data=obj; this.message=mg; } - public String getCode() { + /*public String getCode() { return code; - } + }*/ - public void setCode(String code) { + /*public void setCode(String code) { this.code = code; - } + }*/ public String getMessage() { return message; @@ -84,21 +81,20 @@ public class ResponseData { } /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) + * 构造函数重载指定缓存失效时间 + * @param code 状态码 + * @param msg 描述消息 + * @param data 反馈的数据 * @return * 修改信息： */ public static ResponseData fail(int code, String msg, Object data) { - ResponseData r = new ResponseData(); - r.setCode(code+""); - r.setMessage(msg); - r.setData(data); - return r; + return new ResponseData(code+"",msg,data); } - + /** + * 重写toString()方法 + * **/ @Override public String toString() { return "ResponseData{" + "code='" + code + '\'' + ", message='" diff --git a/src/main/java/com/cetc32/dh/common/response/ResponseMessage.java b/src/main/java/com/cetc32/dh/common/response/ResponseMessage.java new file mode 100644 index 0000000000000000000000000000000000000000..ef184a75a31908c54f026190262f9fb76ff56d6b --- /dev/null +++ b/src/main/java/com/cetc32/dh/common/response/ResponseMessage.java @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description：抽象响应消息 + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/1/30 下午1:43 + ******************************************************************************/ +package com.cetc32.dh.common.response; + +public abstract class ResponseMessage { + protected int code; + protected String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/src/main/java/com/cetc32/dh/common/response/ResponseResult.java b/src/main/java/com/cetc32/dh/common/response/ResponseResult.java index b4e57fd3bc192a8ac28a42a2c5932e3304b32c76..f4bfa9b8b456dd4c3b1e68ade3bb2ce558dfa71b 100644 --- a/src/main/java/com/cetc32/dh/common/response/ResponseResult.java +++ b/src/main/java/com/cetc32/dh/common/response/ResponseResult.java @@ -18,44 +18,42 @@ import java.io.Serializable; * @version: 1.0 * @date: 2020/9/11 10:55 **/ -public class ResponseResult implements Serializable{ +@Deprecated +public class ResponseResult extends ResponseMessage implements Serializable{ - private String code; - private String message; + /* private String code; + private String message;*/ private Object obj; public ResponseResult() { - this.code = IStatusMessage.SystemStatus.SUCCESS.getCode(); + this.code = Integer.valueOf(IStatusMessage.SystemStatus.SUCCESS.getCode()); this.message = IStatusMessage.SystemStatus.SUCCESS.getMessage(); } public ResponseResult(IStatusMessage statusMessage){ - this.code = statusMessage.getCode(); + this.code = Integer.valueOf(statusMessage.getCode()); this.message = statusMessage.getMessage(); } public ResponseResult(String mg){ - this.code="200"; - this.message=mg; + this(mg,null); } public ResponseResult(String mg,Object obj){ - this.code="200"; - this.obj=obj; - this.message=mg; + this("200",mg,obj); } public ResponseResult(String code ,String mg,Object obj){ - this.code=code; + this.code=Integer.valueOf(code); this.obj=obj; this.message=mg; } - public String getCode() { + /* public String getCode() { return code; } public void setCode(String code) { this.code = code; } - +*/ public String getMessage() { return message; } @@ -101,23 +99,16 @@ public class ResponseResult implements Serializable{ /** * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) + * @param code 键 + * @param msg 时间(秒) * @return * 修改信息： */ public static ResponseResult fail(int code, String msg, Object data) { - ResponseResult r = new ResponseResult(); - r.setCode(code+""); - r.setMessage(msg); - r.setObj(data); - return r; + return new ResponseResult(code+"",msg,data); } /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) * @return * 修改信息： */ diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java deleted file mode 100644 index 0ea702d41a794cea5f6f4b741292dadf7357a989..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * @Title: CenterAuthRealm - * @Description: 根据token判断此Authenticator是否使用该realm - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.common.shiro; - -import com.auth0.jwt.exceptions.TokenExpiredException; -import com.cetc32.dh.common.utils.JWTUtil; -import com.cetc32.dh.config.JWTToken; -import com.cetc32.dh.config.RedisUtil; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.AuthenticationInfo; -import org.apache.shiro.authc.AuthenticationToken; -import org.apache.shiro.authc.SimpleAuthenticationInfo; -import org.apache.shiro.authz.AuthorizationInfo; -import org.apache.shiro.authz.SimpleAuthorizationInfo; -import org.apache.shiro.realm.AuthorizingRealm; -import org.apache.shiro.subject.PrincipalCollection; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -@Component -public class CenterAuthRealm extends AuthorizingRealm { - /* @Autowired - private UserService userService;*/ - @Autowired - private RedisUtil redisUtil; - - //根据token判断此Authenticator是否使用该realm - //必须重写不然shiro会报错 - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - public boolean supports(AuthenticationToken token) { - return token instanceof JWTToken; - } - - /** - * 只有当需要检测用户权限的时候才会调用此方法，例如@RequiresRoles,@RequiresPermissions之类的 - */ - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - System.out.println("授权~~~~~"); - String token=principals.toString(); - String username= JWTUtil.getUsername(token); - /*User user=userService.getUser(username);*/ - SimpleAuthorizationInfo info=new SimpleAuthorizationInfo(); - //查询数据库来获取用户的角色 - /*info.addRole(user.getRoles()); - //查询数据库来获取用户的权限 - info.addStringPermission(user.getPermission());*/ - return info; - } - - - /** - * 默认使用此方法进行用户名正确与否验证，错误抛出异常即可，在需要用户认证和鉴权的时候才会调用 - */ - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { - System.out.println("认证~~~~~~~"); - String jwt= (String) token.getCredentials(); - String username= null; - try { - username= JWTUtil.getUsername(jwt); - }catch (Exception e){ - throw new AuthenticationException("token非法，不是规范的token，可能被篡改了，或者过期了"); - } - if (username==null){ - throw new AuthenticationException("token中无用户名"); - } - /*User user=userService.getUser(username);*/ - /*if (user==null){ - throw new AuthenticationException("该用户不存在"); - }*/ - //开始认证，只要AccessToken没有过期，或者refreshToken的时间节点和AccessToken一致即可 - if (redisUtil.hasKey(username)){ - //判断AccessToken有无过期 - if (!JWTUtil.verify(jwt)){ - throw new TokenExpiredException("token认证失效，token过期，重新登陆"); - }else { - //判断AccessToken和refreshToken的时间节点是否一致 - long current= (long) redisUtil.get(username); - if (current==JWTUtil.getExpire(jwt)){ - return new SimpleAuthenticationInfo(jwt,jwt,"MyRealm"); - }else{ - throw new AuthenticationException("token已经失效，请重新登录！"); - } - } - }else{ - throw new AuthenticationException("token过期或者Token错误！！"); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java deleted file mode 100644 index d06c8ae12fcfdbbeab0aa760852bd47a5f4dd401..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java +++ /dev/null @@ -1,251 +0,0 @@ -/** - * @Title: CenterAuthShiroConfig - * @Description: Shiro安全认证 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.common.shiro; - -import com.cetc32.dh.common.filter.JWTFilter; -import org.apache.shiro.cas.CasFilter; -import org.apache.shiro.mgt.DefaultSessionStorageEvaluator; -import org.apache.shiro.mgt.DefaultSubjectDAO; -import org.apache.shiro.spring.LifecycleBeanPostProcessor; -import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; -import org.apache.shiro.spring.web.ShiroFilterFactoryBean; -import org.apache.shiro.web.mgt.DefaultWebSecurityManager; -import org.jasig.cas.client.session.SingleSignOutFilter; -import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; -import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.boot.web.servlet.ServletListenerRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; -import org.springframework.web.filter.DelegatingFilterProxy; - -import javax.servlet.Filter; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -@Configuration -public class CenterAuthShiroConfig { - -// //cas server地址 -// public static final String casServerUrlPrefix="http://www.cetc.daohang.com:9100/cas"; -// -// //cas登录页面地址 -// public static final String casLoginUrl = casServerUrlPrefix + "/login"; -// -// //cas登出页面地址 -// public static final String casLogoutUrl = casServerUrlPrefix + "/logout"; -// -// //当前工程对外提供的服务地址 -// public static final String shiroServerUrlPrefix = "http://localhost:9100"; -// -// //casFilter UrlPattern -// public static final String casFilterUrlPattern = "/cas"; -// -// //登录地址 -// public static final String loginUrl = casLoginUrl + "?service=" + shiroServerUrlPrefix + casFilterUrlPattern; -// -// // 登出地址（casserver启用service跳转功能，需在webapps\cas\WEB-INF\cas.properties文件中启用cas.logout.followServiceRedirects=true） -// public static final String logoutUrl = casLogoutUrl + "?service=" + shiroServerUrlPrefix; -// -// //登录成功地址 -// public static final String loginSuccessUrl = "/user"; -// -// //限认证失败跳转地址 -// public static final String unauthorizedUrl = "/403.html"; -// -// @Value("${jedis.pool.host}") -// private String host; -// -// @Value("${jedis.pool.port}") -// private int port; - - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean(name = "securityManager") - public DefaultWebSecurityManager securityManager(CenterAuthRealm centerAuthRealm){ - DefaultWebSecurityManager securityManager=new DefaultWebSecurityManager(); - // 设置自定义 realm. - securityManager.setRealm(centerAuthRealm); - - //关闭session - DefaultSubjectDAO subjectDAO=new DefaultSubjectDAO(); - DefaultSessionStorageEvaluator sessionStorageEvaluator=new DefaultSessionStorageEvaluator(); - sessionStorageEvaluator.setSessionStorageEnabled(false); - subjectDAO.setSessionStorageEvaluator(sessionStorageEvaluator); - securityManager.setSubjectDAO(subjectDAO); - return securityManager; - } - -// /** -// * 注册单点登出listener -// * -// * @return -// */ -// @Bean -// @Order(Ordered.HIGHEST_PRECEDENCE) -// public ServletListenerRegistrationBean singleSignOutHttpSessionListener() { -// ServletListenerRegistrationBean bean = new ServletListenerRegistrationBean(); -// bean.setListener(new SingleSignOutHttpSessionListener()); -// bean.setEnabled(true); -// return bean; -// } -// -// /** -// * 注册单点登出filter -// * -// * @return -// */ -// @Bean -// public FilterRegistrationBean singleSignOutFilter() { -// FilterRegistrationBean bean = new FilterRegistrationBean(); -// bean.setName("singleSignOutFilter"); -// bean.setFilter(new SingleSignOutFilter()); -// bean.addUrlPatterns("/*"); -// bean.setEnabled(true); -// return bean; -// } -// -// /** -// * 注册DelegatingFilterProxy（Shiro） -// * -// * @return -// */ -// @Bean -// public FilterRegistrationBean delegatingFilterProxy() { -// FilterRegistrationBean filterRegistration = new FilterRegistrationBean(); -// filterRegistration.setFilter(new DelegatingFilterProxy("shiroFilter")); -// // 该值缺省为false,表示生命周期由SpringApplicationContext管理,设置为true则表示由ServletContainer管理 -// filterRegistration.addInitParameter("targetFilterLifecycle", "true"); -// filterRegistration.setEnabled(true); -// filterRegistration.addUrlPatterns("/*"); -// return filterRegistration; -// } - -// /** -// * CAS过滤器 -// * -// * @return -// */ -// @Bean(name = "casFilter") -// public CasFilter getCasFilter() { -// CasFilter casFilter = new CasFilter(); -// casFilter.setName("casFilter"); -// casFilter.setEnabled(true); -// // 登录失败后跳转的URL，也就是 Shiro 执行 CasRealm 的 doGetAuthenticationInfo 方法向CasServer验证tiket -// casFilter.setFailureUrl(loginUrl);// 我们选择认证失败后再打开登录页面 -// casFilter.setSuccessUrl(loginSuccessUrl); -// return casFilter; -// } - - - - /** - * 先走 filter ，然后 filter 如果检测到请求头存在 token，则用 token 去 login，走 Realm 去验证 - */ - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean - public ShiroFilterFactoryBean factory(@Qualifier("securityManager")DefaultWebSecurityManager securityManager){ - ShiroFilterFactoryBean factoryBean=new ShiroFilterFactoryBean(); - factoryBean.setSecurityManager(securityManager); - // 添加自己的过滤器并且取名为jwt - Map filterMap=new LinkedHashMap<>(); - //设置我们自定义的JWT过滤器 - filterMap.put("jwt",new JWTFilter()); - factoryBean.setFilters(filterMap); - - // 设置无权限时跳转的 url; - factoryBean.setUnauthorizedUrl("/unauthorized/无权限"); - Map filterRuleMap=new HashMap<>(); - // 所有请求通过我们自己的JWT Filter - filterRuleMap.put("/**","jwt"); - // 访问 /unauthorized/** 不通过JWTFilter - filterRuleMap.put("/unauthorized/**","anon"); - filterRuleMap.put("/open/**","anon"); - //filterRuleMap.put("/rest/**","anon"); - factoryBean.setFilterChainDefinitionMap(filterRuleMap); - return factoryBean; - } - - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean - public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() { - return new LifecycleBeanPostProcessor(); - } - - - - /** - * 添加注解支持，如果不加的话很有可能注解失效 - */ - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean - // @DependsOn({"lifecycleBeanPostProcessor"}) - public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator(){ - - DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator=new DefaultAdvisorAutoProxyCreator(); - defaultAdvisorAutoProxyCreator.setProxyTargetClass(true); - return defaultAdvisorAutoProxyCreator; - } - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean - public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(@Qualifier("securityManager") DefaultWebSecurityManager securityManager){ - - AuthorizationAttributeSourceAdvisor advisor=new AuthorizationAttributeSourceAdvisor(); - advisor.setSecurityManager(securityManager); - return advisor; - } - - - -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java b/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java deleted file mode 100644 index 4ba5fad142d014cfb769f14d1613662a041d3b0a..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java +++ /dev/null @@ -1,199 +0,0 @@ -/** - * @Title: CenterAuthShiroConfig - * @Description: 自定义Realm - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.common.shiro; - -import com.cetc32.dh.beans.ResultUserRole; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.mybatis.BaseAdminPermissionMapper; -import com.cetc32.dh.mybatis.BaseAdminRoleMapper; -import com.cetc32.dh.service.AdminRoleService; -import com.cetc32.dh.service.AdminUserService; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.shiro.authc.*; -import org.apache.shiro.authz.AuthorizationInfo; -import org.apache.shiro.authz.SimpleAuthorizationInfo; -import org.apache.shiro.cas.CasRealm; -import org.apache.shiro.subject.PrincipalCollection; -import org.apache.shiro.util.ByteSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -public class CustomRealm extends CasRealm { - - private Logger log = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private AdminUserService userService; - @Autowired - private BaseAdminUser baseAdminUser; - @Autowired - private AdminRoleService roleService; - @Autowired - private BaseAdminPermissionMapper permissionMapper; - @Autowired - private BaseAdminRoleMapper roleMapper; - //模拟数据库的数据 - Map map=new HashMap(); - { - map.put("jarWorker","123"); - super.setName("customRealm"); - } - /** - * 授权使用 - * @param principals - * @return - */ - @Override - protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - BaseAdminUser userName=(BaseAdminUser) principals.getPrimaryPrincipal(); - Set roles=getRolesByUserName(userName.getSysUserName()); - Set permissions=getPermissionsByUserName(userName.getSysUserName()); - SimpleAuthorizationInfo simpleAuthorizationInfo=new SimpleAuthorizationInfo(); - log.info("开始授权"); - simpleAuthorizationInfo.setRoles(roles); - simpleAuthorizationInfo.setStringPermissions(permissions); - return simpleAuthorizationInfo; - } - - - /** - * 认证使用 - * @param - * @return - */ - protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException { -// //从主体传过来的认证信息中获取用户名 -// String userName=(String) token.getPrincipal();//获取用户名 -// String passWord=getPassword(userName); -// if(passWord==null){ -// return null; -// } -// SimpleAuthenticationInfo simpleAuthenticationInfo=new SimpleAuthenticationInfo("",passWord,"customRealm"); -// return simpleAuthenticationInfo; - //UsernamePasswordToken用于存放提交的登录信息 - UsernamePasswordToken token = (UsernamePasswordToken) authenticationToken; - log.info("用户登录认证：验证当前Subject时获取到token为：" + ReflectionToStringBuilder - .toString(token, ToStringStyle.MULTI_LINE_STYLE)); - String username = token.getUsername(); - // 调用数据层 - BaseAdminUser sysUser = userService.findByUserName(username); - log.debug("用户登录认证！用户信息user：" + sysUser); - if (sysUser == null) { - // 用户不存在 - return null; - } - // 返回密码 - return new SimpleAuthenticationInfo(sysUser, sysUser.getSysUserPwd(), ByteSource.Util.bytes(username), getName()); - - } - - /** - * 数据库信息获取用户密码 - * @param userName - * @return - */ - private String getPassword(String userName) { - if(null==userName){ - return null; - } - BaseAdminUser adminUser = new BaseAdminUser(); - adminUser = userService.findByUserName(userName); - String pwd = adminUser.getSysUserPwd(); - return pwd; - } - - /** - * 数据库获取用户角色 - * @param userName - * @return - */ - private Set getRolesByUserName(String userName) { -// Set roles=new HashSet(); -// roles.add("admin"); -// roles.add("tourist"); -// return roles; - - Set roles = new HashSet(); - - BaseAdminUser user = userService.findByUserName(userName); - List roleId = Stream.of(user.getRoleId().split(",")).map(Integer::parseInt).collect(Collectors.toList()); - for(Integer rid:roleId) - { - BaseAdminRole baseAdminRole = roleMapper.selectByPrimaryKey(rid); - roles.add(baseAdminRole.getRoleName()); - } - return roles; - - } - - /** - * 模拟数据库获取用户权限 - * @param userName - * @return - */ - private Set getPermissionsByUserName(String userName) { - /*Set permissions=new HashSet(); - permissions.add("user:update"); - permissions.add("user:query"); - return permissions;*/ - Set per = new HashSet(); - BaseAdminUser user = userService.findByUserName(userName); - List roleId = Stream.of(user.getRoleId().split(",")).map(Integer::parseInt).collect(Collectors.toList()); - List rids=new ArrayList<>(); - for(Integer rid:roleId) - { - ResultUserRole baseAdminRole = roleService.findRoleById(rid); -// String permissions = role.getPermissions(); -// rids.addAll(Arrays.asList(permissions.split(","))); - } - rids=rids.stream().distinct().collect(Collectors.toList()); - if (rids.size()>0) { - List permissionList = new ArrayList <>(); - for (String id : rids) { - // 角色对应的权限数据 - BaseAdminPermission perm = permissionMapper.selectByPrimaryKey(id); - if (null != perm ) { - // 授权角色下所有权限 - PermissionDTO permissionDTO = new PermissionDTO(); - BeanUtils.copyProperties(perm,permissionDTO); - //获取子权限 - List childrens = permissionMapper.getPermissionListByPId(perm.getId()); - permissionDTO.setChildrens(childrens); - - permissionList.add(permissionDTO); - } - } - - for(PermissionDTO permissionDTO:permissionList){ - per.add(permissionDTO.getName()); - } - - - } - return per; - - } -} diff --git a/src/main/java/com/cetc32/dh/common/utils/DateUtils.java b/src/main/java/com/cetc32/dh/common/utils/DateUtils.java index 3801a7ba0293027f3e1f3a7c19f9ec30e143d500..c73762c935265454ab49bf68e6a7862bcb2f303f 100644 --- a/src/main/java/com/cetc32/dh/common/utils/DateUtils.java +++ b/src/main/java/com/cetc32/dh/common/utils/DateUtils.java @@ -17,9 +17,9 @@ import java.util.Date; /** * @Title: DateUtils * @Description: - * @author: youqing + * @author: Xuwenyuan * @version: 1.0 - * @date: 2018/5/26 9:58 + * @date: 2021.4.15 */ public class DateUtils { @@ -29,42 +29,20 @@ public class DateUtils { * * @param: 获取当前系统时间 yyyy-MM-dd HH:mm:ss * @return: - * @auther: youqing - * @date: 2018/5/26 9:59 + * @auther: */ - public static String getCurrentDate(){ + public static String currentDateTime(){ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = df.format(System.currentTimeMillis()); return date; } - - /** - * - * 功能描述： - * @param: date类 获取当前系统时间 yyyy-MM-dd HH:mm:ss - * @return: - * @auther: youqing - * @date: 2018/5/26 10:39 - */ - public static Date getCurrentDateToDate () { - DateFormat df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - String date = df.format(System.currentTimeMillis()); - Date d = null; - try { - d = df.parse( date.toString( ) ); - } catch ( ParseException e ) { - e.printStackTrace( ); - } - return d; - } - /** - * 增加时间单位：天 + * 增加时间单位：天 ，显示时间格式样例：2021-04-15 12:33:59 * @param day * @return */ - public static String getCurrentAddDay(int day) { + public static String addDay2Str(int day) { SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); Calendar cal = Calendar.getInstance(); cal.setTime(new Date()); @@ -89,7 +67,7 @@ public class DateUtils { * 获取当前时间 * @return */ - public static String getNowDateString ( ) { + public static String nowDate ( ) { Date d = new Date(); SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd"); return sdf.format( d ); @@ -101,7 +79,7 @@ public class DateUtils { * @param format * @return */ - public static String getFormatTime(Date date, String format) { + public static String formatDate(Date date, String format) { SimpleDateFormat sdf = new SimpleDateFormat(format); return sdf.format(date); } @@ -141,7 +119,58 @@ public class DateUtils { return addDay(date, -day); } + /** + * 加多少小时 + * @parm date 时间 + * @parm hour 增加小时数 + * **/ + public static Date addHour(Date date,int hour){ + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.HOUR, hour); + return cal.getTime(); + } + /** + * 减少多少小时 + * @parm date 时间 + * @parm hour 增加小时数 + * **/ + public static Date minusHour(Date date,int hour){ + return addHour(date, -1*hour); + } + /** + * 日期向下取整数 + * @param date + * @return 返回向下取整的日期 + * **/ + public static Date floorDay(Date date){ + return new Date( date.getTime() - date.getTime()%(24*1000*60*60L)); + } + /** + * 日期向上取整数 + * @param date + * @return 返回向上取整的日期 + * **/ + public static Date ceilDay(Date date){ + return addDay(floorDay(date),1); + } + /** + * 小时向下取整数 + * @param date + * @return 返回向下取整的日期 + * **/ + public static Date floorHour(Date date){ + return new Date( date.getTime() - date.getTime()%(1000*60*60L)); + } + /** + * 小时向上取整数 + * @param date + * @return 返回向上取整的日期 + * **/ + public static Date ceilHour(Date date){ + return addHour(floorHour(date),1); + } public static void main(String[] args) { - System.out.println(getCurrentAddDay(2)); + System.out.println(addDay2Str(2)); } } diff --git a/src/main/java/com/cetc32/dh/common/utils/DigestUtils.java b/src/main/java/com/cetc32/dh/common/utils/DigestUtils.java index f749969352d4ba2425fffcf1d3207efe14e7c025..4ab5ded48d90c5349e113cb6c4623ba594deabcd 100644 --- a/src/main/java/com/cetc32/dh/common/utils/DigestUtils.java +++ b/src/main/java/com/cetc32/dh/common/utils/DigestUtils.java @@ -23,11 +23,9 @@ public class DigestUtils { /** * * 功能描述: MD5加密账号密码 - * - * @param: - * @return: - * @auther: youqing - * @date: 2018/9/11 15:11 + * @param userName 用户名 + * @param password 密码 + * @return 返回md5hash */ public static String Md5(String userName,String password){ Md5Hash hash = new Md5Hash(password, ByteSource.Util.bytes(userName), 2); diff --git a/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java b/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java deleted file mode 100644 index 9ab25776d1640b36f5777dce23b1423788dee3fd..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java +++ /dev/null @@ -1,115 +0,0 @@ -/** - * @Title: CenterAuthShiroConfig - * @Description: 自定义Realm - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.utils; - -import com.auth0.jwt.JWT; -import com.auth0.jwt.JWTVerifier; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.exceptions.JWTDecodeException; -import com.auth0.jwt.interfaces.DecodedJWT; - -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -/** - * 响应状态信息接口 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -public class JWTUtil { - //token有效时长 - private static final long EXPIRE=2*60*60*1000; - //token的密钥 - private static final String SECRET="jwt+shiro+32s"; - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static String createToken(String username,long current){ - Date date= new Date(current+EXPIRE); - //JWT的header部分 - Map map =new HashMap<>(); - map.put("alg","HS256"); - map.put("typ","JWT"); - - //使用JWT生成 token - String token=null; - try{ - token= JWT.create() - .withHeader(map) - .withClaim("username",username) - .withClaim("current",current) - .withIssuedAt(new Date()) - .withExpiresAt(date) - .sign(Algorithm.HMAC256(SECRET)); - }catch (UnsupportedEncodingException e){ - e.printStackTrace(); - } - return token; - } - - ////校验token的有效性，1、token的header和payload是否没改过；2、没有过期 - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static boolean verify(String token){ - try{ - JWTVerifier verifier=JWT.require(Algorithm.HMAC256(SECRET)).build(); - verifier.verify(token); - return true; - }catch ( Exception e){ - - } - return false; - } - //无需解密也可以获取token的信息 - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static String getUsername(String token){ - try { - DecodedJWT jwt = JWT.decode(token); - return jwt.getClaim("username").asString(); - } catch (JWTDecodeException e) { - return null; - } - } - - //获取过期时间 - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static long getExpire(String token){ - try { - DecodedJWT jwt = JWT.decode(token); - return jwt.getClaim("exp").asLong(); - }catch (Exception e){ - return System.currentTimeMillis()/1000; - } - } -} diff --git a/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java b/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java deleted file mode 100644 index 25344e3448a5c81c2b19e1b1deb1b6e3bc7504cf..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @Title: CenterAuthShiroConfig - * @Description: 自定义Realm - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.utils; - -import com.cetc32.dh.common.response.ResponseResult; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.PrintWriter; - -/** - * @Title: ShiroFilterUtils - * @Description: shiro工具类 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/23 9:54 - */ -public class ShiroFilterUtils { - - private static final Logger logger = LoggerFactory.getLogger(ShiroFilterUtils.class); - - private final static ObjectMapper objectMapper = new ObjectMapper(); - - /** - * - * 功能描述: 判断请求是否是ajax - * - * @param: - * @return: - * @auther: youqing - * @date: 2018/11/23 9:57 - */ - public static boolean isAjax(ServletRequest request){ - String header = ((HttpServletRequest) request).getHeader("X-Requested-With"); - if("XMLHttpRequest".equalsIgnoreCase(header)){ - logger.info("shiro工具类【ShiroFilterUtils.isAjax】当前请求,为Ajax请求"); - return Boolean.TRUE; - } - logger.debug("shiro工具类【ShiroFilterUtils.isAjax】当前请求,非Ajax请求"); - return Boolean.FALSE; - } - - /** - * - * 功能描述: response输出json - * - * @param: - * @return: - * @auther: youqing - * @date: 2018/11/23 9:58 - */ - public static void out(HttpServletResponse response, ResponseResult result){ - PrintWriter out = null; - try { - response.setCharacterEncoding("UTF-8");//设置编码 - response.setContentType("application/json");//设置返回类型 - out = response.getWriter(); - out.println(objectMapper.writeValueAsString(result));//输出 - logger.info("用户在线数量限制【ShiroFilterUtils.out】响应json信息成功"); - } catch (Exception e) { - logger.error("用户在线数量限制【ShiroFilterUtils.out】响应json信息出错", e); - }finally{ - if(null != out){ - out.flush(); - out.close(); - } - } - } -} diff --git a/src/main/java/com/cetc32/dh/common/utils/Tools.java b/src/main/java/com/cetc32/dh/common/utils/Tools.java index df7801957a9c339d481d728617198c3a65de484c..feb4974a6b482a93138364196323637f9480507e 100644 --- a/src/main/java/com/cetc32/dh/common/utils/Tools.java +++ b/src/main/java/com/cetc32/dh/common/utils/Tools.java @@ -1,5 +1,7 @@ package com.cetc32.dh.common.utils; +import org.apache.commons.lang3.StringUtils; + import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -163,16 +165,21 @@ public class Tools { */ public static Integer getMapValueInt(Map map, String mapName) { - Object obj= map.getOrDefault(mapName,null); - if(obj==null) - { + Object obj= map.get(mapName); + if(obj==null){ return null; } - if(obj.getClass()==String.class) + if(obj instanceof String) { - return Integer.parseInt((String) obj); + if(StringUtils.isNotBlank((String)obj)) + return Integer.parseInt((String) obj); + return null; } - return (Integer) obj; + if(obj instanceof Integer) + return (Integer)obj; + if(obj instanceof Long) + return (Integer) obj; + return null; } /** @@ -188,11 +195,11 @@ public class Tools { { return null; } - if(obj.getClass()==Integer.class) + /*if(obj.getClass()==Integer.class) { return String.valueOf(obj); - } - return (String) obj; + }*/ + return obj.toString(); } /** diff --git a/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java b/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java index d833bf0cd9e8e08c94e6144c7e11a383b3bb048b..efd0888818a3e04a06ff16d5ece29a6662830185 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java @@ -6,9 +6,11 @@ ******************************************************************************/ package com.cetc32.dh.controller.rest; +import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.service.AreaCommonService; +import com.cetc32.webutil.common.annotations.LoginSkipped; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -18,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; + import java.util.Arrays; import java.util.List; @@ -42,6 +47,7 @@ public class AreaCommonController { @ApiImplicitParam(name = "id", value = "查询ID（key值）下的范围树,非必填，默认查询全国", dataType = "String"), }) @RequestMapping(value = "/all", method = RequestMethod.GET) + //@LoginSkipped public ResponseResult areaCommonTree(String id) { if (id == null) { id = "100000"; @@ -74,5 +80,10 @@ public class AreaCommonController { } return ResponseResult.success(areaCommon); } + @GetMapping("/0") + @LoginSkipped + public ResponseData allArea(){ + return ResponseData.success( areaCommonService.selectAll()); + } } diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index 890d93adb72fe70eb548b5f9b1197be917eda8ca..c172be30705cbabdf3b8bfb6a5c4e7fef7dc44b3 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -8,52 +8,41 @@ package com.cetc32.dh.controller.rest; -import com.cetc32.dh.beans.LoginParameter; -import com.cetc32.dh.beans.LoginResult; -import com.cetc32.dh.beans.ResultUserInfo; -import com.cetc32.dh.common.response.PageDataResult; +import com.alibaba.fastjson.JSONObject; import com.cetc32.dh.beans.*; import com.cetc32.dh.common.response.PageDataResult; import com.cetc32.dh.common.response.ResponseData; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.common.utils.JWTUtil; import com.cetc32.dh.config.RedisUtil; import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.entity.NumberS; -import com.cetc32.dh.mybatis.AreaCommonMapper; -import com.cetc32.dh.mybatis.BaseAdminUserMapper; +import com.cetc32.dh.listener.ContainerStartedListener; +import com.cetc32.dh.service.AdminRoleService; import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.service.AreaCommonService; -import com.cetc32.dh.service.impl.AdminRoleServiceImpl; -import com.cetc32.dh.service.impl.AdminUserServiceImpl; -import com.cetc32.dh.service.impl.AreaCommonServiceImpl; -import com.google.inject.internal.util.$FinalizableWeakReference; -import com.google.inject.internal.util.$ObjectArrays; -import com.google.inject.internal.util.$ToStringBuilder; +import com.cetc32.webutil.common.annotations.LoginRequired; +import com.cetc32.webutil.common.annotations.LoginSkipped; +import com.cetc32.webutil.common.util.CookieUtil; +import com.cetc32.webutil.common.util.JWTUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; - +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.crypto.interfaces.PBEKey; import javax.servlet.http.HttpServletRequest; -import java.awt.*; import java.io.UnsupportedEncodingException; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; +import java.util.*; import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.stream.Collectors; import com.cetc32.dh.common.utils.DigestUtils; +import javax.servlet.http.HttpServletResponse; + +import static com.cetc32.dh.common.utils.Tools.isContainChinese; import static com.cetc32.dh.common.utils.Tools.*; /** @@ -66,19 +55,26 @@ import static com.cetc32.dh.common.utils.Tools.*; */ @RestController @RequestMapping("/rest/auth/") +@LoginRequired(loginSuccess = true) public class AuthController { @Autowired RedisUtil redisUtil; @Autowired - AdminUserServiceImpl userService; + AdminUserService userService; @Autowired - AreaCommonMapper areaCommonMapper; + AreaCommonService areaCommonMapper; + + @Autowired + AdminRoleService adminRoleService; /** - * 用户登陆 + * web用户登陆 + * @Description 用户登陆接口，登陆过程中需要更新用户的登陆时间，loginFailed次数等 + * loginFailed每次登陆都要更新，且登陆失败或成功都要进行更新，且登陆失败 + * 也需要更新登陆时间，且登陆登出时间保持为一致，为了统计在线人数 * @param loginParameter "包含username和password的json字符串" * @return ResponseData * 备注:无 @@ -89,39 +85,167 @@ public class AuthController { @ApiImplicitParam(name = "password", value = "密码", paramType = "String") }) @PostMapping("/login") - public ResponseData login2(@RequestBody LoginParameter loginParameter){ + @LoginSkipped + public ResponseData weblogin2(@RequestBody LoginParameter loginParameter, HttpServletRequest request, HttpServletResponse response){ String username=loginParameter.getUsername(); String password=loginParameter.getPassword(); - if(username==null || password==null || password.length()==0) - { - return ResponseData.error("用户名和密码不能为空！"); - } BaseAdminUser user= userService.findByUserName(username); - if(user==null || !user.getSysUserPwd().equals(DigestUtils.Md5(username,password))) - { - return ResponseData.error("账户信息有误或未审核！"); - } + ResponseData x = verifyUserLoginEnable(username,password,user); + if(x != null) return x; + user.setLoginFailed(0); + user.setWebLoginDate(new Date()); + user.setWebLoginStatus(1); + int webCount=user.getWebLoginCount()+1; + user.setWebLoginCount(webCount); + return createTokenAndSaveCookies(request, response, username, user); + } + + /** + * web用户登陆 + * @Description 用户登陆接口，登陆过程中需要更新用户的登陆时间，loginFailed次数等 + * loginFailed每次登陆都要更新，且登陆失败或成功都要进行更新，且登陆失败 + * 也需要更新登陆时间，且登陆登出时间保持为一致，为了统计在线人数 + * @param loginParameter "包含username和password的json字符串" + * @return ResponseData + * 备注:无 + */ + @ApiOperation(value = "用户登录验证，并返回用户相应角色", notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), + @ApiImplicitParam(name = "password", value = "密码", paramType = "String") + }) + @PostMapping("/applogin") + @LoginSkipped + public ResponseData applogin2(@RequestBody LoginParameter loginParameter, HttpServletRequest request, HttpServletResponse response){ + String username=loginParameter.getUsername(); + String password=loginParameter.getPassword(); + BaseAdminUser user= userService.findByUserName(username); + ResponseData x = verifyUserLoginEnable(username, password, user); + if (x != null) return x; + user.setLoginFailed(0); + user.setAppLoginDate(new Date()); + user.setAppLoginStatus(1); + int appCount=user.getAppLoginCount()+1; + user.setAppLoginCount(appCount); + return createTokenAndSaveCookies(request, response, username, user); + } + + @NotNull + private ResponseData createTokenAndSaveCookies(HttpServletRequest request, HttpServletResponse response, String username, BaseAdminUser user) { + userService.updateLogin(user); long currentTimeMillis = System.currentTimeMillis(); - String token= JWTUtil.createToken(username,currentTimeMillis); - redisUtil.set(username,currentTimeMillis,60*30); - LoginResult data=new LoginResult(token, + String jwtToken = JWTUtil.createToken(username, currentTimeMillis); + LoginResult data = new LoginResult(jwtToken, user.getDepartment(), username, user.getId(), user.getRoleId(), user.getSecurity(), user.getAreacode(), - JWTUtil.getExpire(token)); - return ResponseData.success(200,"success",data); + JWTUtil.getExpire(jwtToken)); + CookieUtil.setCookie(request, response, "token", jwtToken, 60 * 60 * 2, true); + return ResponseData.success(200, "success", data); } + @Nullable + private ResponseData verifyUserLoginEnable(String username, String password, BaseAdminUser user) { + if(user.getUserStatus() == -1){ + return ResponseData.error("未激活用户请先联系管理员审核账号。"); + }else if( user.getUserStatus()<1){ + return ResponseData.error("账号已经注销。"); + } + int failed=user.getLoginFailed(); + if(failed>3){ + return ResponseData.error("失败次数超过三次！"); + } + if(StringUtils.isBlank(username) || StringUtils.isBlank(password)) + { + // loginFailed每次登陆都要更新，且登陆失败或成功都要进行更新，且登陆失败 + // 也需要更新登陆时间，且登陆登出时间保持为一致，为了统计在线人数 + failed=++failed; + user.setLoginFailed(failed); + userService.updateLogin(user); + return ResponseData.error("用户名和密码不能为空！"); + } + + if(user==null || !user.getSysUserPwd().equals(DigestUtils.Md5(username,password))) + { + // loginFailed每次登陆都要更新，且登陆失败或成功都要进行更新，且登陆失败 + // 也需要更新登陆时间，且登陆登出时间保持为一致，为了统计在线人数 + failed=++failed; + user.setLoginFailed(failed); + userService.updateLogin(user); + return ResponseData.error("账户信息有误或未审核！"); + } + if(user.getAppLoginStatus()==1){ + return ResponseData.error("用户已在线，不能重复登录！"); + } + return null; + } + /** + * 监测用户名是否存在 + * @param username + * **/ + @LoginSkipped + @GetMapping("/user/exist") + public ResponseData findUserByName(String username){ + System.out.println("username"+username); + BaseAdminUser user =userService.findByUserName(username); + if(user == null){ + return ResponseData.success( true); + }else{ + return ResponseData.success( false); + } + } + + /*** + * WEB端用户注册,默认 + * @param userInfo 请求用户信息 + * @return 返回用户是否添加成功 + * **/ + @LoginSkipped + @PostMapping("/apply") + public ResponseData apply(@RequestBody UserInfo userInfo){ + BaseAdminUser user =new BaseAdminUser(); + System.out.println(JSONObject.toJSONString(userInfo).toString()); + + String username =userInfo.getUsername(); + if(StringUtils.isBlank(username)) + { + return ResponseData.error("用户名不能为空！"); + } + if(userService.findByUserNameAll(username)!=null) + { + return ResponseData.error("用户名已存在！"); + } + if(StringUtils.isBlank(userInfo.getPassword())){ + return ResponseData.error("密码不能为空！"); + } + user.setSysUserPwd(DigestUtils.Md5(userInfo.getUsername(),userInfo.getPassword())); + user.setUserStatus(-1); + user.setSysUserName(userInfo.getUsername()); + user.setSecurity(userInfo.getSecurity()); + user.setAreacode(userInfo.getAreacode()); + if(userService.insertUser(user)>0) + { + return ResponseData.success("添加成功"); + } + else { + return ResponseData.error("添加失败"); + } + } + /** + * + * + ***/ @ApiOperation(value = "移动终端用户注册（固定角色、固定为非M权限)", notes = "") @ApiImplicitParams({ @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), @ApiImplicitParam(name = "password", value = "密码", paramType = "String") }) @PostMapping(value="/register",produces = "application/json;charset=UTF-8") + @LoginSkipped public ResponseData register(@RequestBody Map loginParameter){ Map reg=new HashMap<>(); reg.put("username",loginParameter.getOrDefault("username",null)); @@ -141,7 +265,7 @@ public class AuthController { } //默认用户有效 userInfo.setUserStatus(-1); - userInfo.setRegTime(String.valueOf(System.currentTimeMillis())); + userInfo.setRegTime(new Date()); // TODO 默认安全等级 if(userInfo.getSecurity()==null) { @@ -161,7 +285,7 @@ public class AuthController { @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), @ApiImplicitParam(name = "password", value = "密码", paramType = "String"), @ApiImplicitParam(name = "role", value = "角色id列表", paramType = "List"), - @ApiImplicitParam(name = "security", value = "密级(1:JM，2：MM，3：FM)", paramType = "Integer"), + @ApiImplicitParam(name = "security", value = "密级(1:JUEM，2：JIM，3：MM，4:FM)", paramType = "Integer"), @ApiImplicitParam(name = "department", value = "部门id列表", paramType = "List"), @ApiImplicitParam(name = "areacode", value = "区域id列表", paramType = "List") }) @@ -177,17 +301,18 @@ public class AuthController { { return ResponseData.error("用户名已存在！"); } - if(StringUtils.isBlank(userInfo.getSysUserPwd())){ + if(userInfo.getSysUserPwd()==null || userInfo.getSysUserPwd().trim().isEmpty()){ userInfo.setSysUserPwd(DigestUtils.Md5(username,"123456")); } //默认用户有效 - userInfo.setUserStatus(1); - long currentTimeMillis = System.currentTimeMillis(); - userInfo.setRegTime(String.valueOf(currentTimeMillis)); + userInfo.setUserStatus(-1); +// long currentTimeMillis = System.currentTimeMillis(); + Date date = new Date(); + userInfo.setRegTime(date); // TODO 默认安全等级 if(userInfo.getSecurity()==null) { - userInfo.setSecurity(3); + userInfo.setSecurity(4); } if(userService.insertUser(userInfo)>0) { @@ -205,7 +330,7 @@ public class AuthController { @PostMapping(value = "/deleteUser") public ResponseData deleteUser(@RequestBody Map did){ Integer id=did.getOrDefault("id",0); - if(userService.delUser(id,0)>0) + if(userService.deleteInfo(id)>0) { return ResponseData.success("删除成功！"); } @@ -214,12 +339,27 @@ public class AuthController { return ResponseData.error("删除失败！"); } } - - @ApiOperation(value = "用户删除（从数据库中删除不可恢复）", notes = "") + @ApiOperation(value = "用户删除（仅标记不从数据库删除）", notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "用户id", paramType = "Integer"), + }) + @PostMapping(value = "/rejectUser") + public ResponseData reject(@RequestBody Map did){ + Integer id=did.getOrDefault("id",0); + if(userService.delUser(id,0)>0) + { + return ResponseData.success("操作成功！"); + } + else + { + return ResponseData.error("操作失败！"); + } + } + /* @ApiOperation(value = "用户删除（从数据库中删除不可恢复）", notes = "") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "用户id", paramType = "Integer"), }) - @PostMapping(value = "/deleteInfo") + @PostMapping(value = "/deleteInfo")*/ public ResponseData deleteUser1(@RequestBody Map did){ Integer id=did.getOrDefault("id",0); if(userService.deleteInfo(id)>0) @@ -247,11 +387,27 @@ public class AuthController { // public PageDataResult getUserList(@RequestBody UserInfo user_info){ public PageDataResult getUserList(@RequestBody Map userInfo){ BaseAdminUser user_info=CreateUser(userInfo); + // user_info.setUserStatus(1); return new PageDataResult(userService.countUserByCondition(user_info), userService.findUserByCondition(user_info), user_info.getOffset()); } - + /** + * @param formUser 用户表单信息 + * **/ + @LoginSkipped + @PostMapping("/resetpwd") + public ResponseData resetPwd(@RequestBody FormUser formUser){ + BaseAdminUser us = userService.findByUserName(formUser.getUsername()); + if(us !=null){ + if(us.getSysUserPwd().equals(DigestUtils.Md5(formUser.getUsername(),formUser.getPassword()))){ + userService.updatePwd(formUser.getUsername(),formUser.getPasswordN()); + return ResponseData.success(); + } + return ResponseData.error("mimabui"); + } + return ResponseData.error("用户账户信息有误。"); + } @ApiOperation(value = "注册用户激活及信息修改", notes = "") @ApiImplicitParams({ @@ -323,7 +479,8 @@ public class AuthController { user_info.setAreacode(areaCodeName); if(isContainChinese(user_info.getAreacode())) { - List areaCommons = areaCommonMapper.selectAll(); + //List areaCommons = areaCommonMapper.selectAll(); + List areaCommons = ContainerStartedListener.getAreas(); List areaCode=new ArrayList<>(); Map areaCommonsMap = areaCommons.stream().collect(Collectors.toMap(AreaCommon::getName, AreaCommon::getId)); @@ -341,7 +498,7 @@ public class AuthController { // 用户名需要在密码之前赋值 // 用户名去除两端空格 user_info.setSysUserName(StringUtils.trim(getMapValueStr(userInfo,"username"))); - String password=getMapValueStr(userInfo,"password"); + String password=(String)userInfo.get("password");//getMapValueStr(userInfo,"password"); if(password!=null && user_info.getSysUserName()!=null && password.trim().length()>0) { user_info.setSysUserPwd(DigestUtils.Md5(user_info.getSysUserName(),password)); @@ -356,14 +513,17 @@ public class AuthController { user_info.setPage(getMapValueInt(userInfo,"page")); user_info.setResults(getMapValueInt(userInfo,"results")); user_info.setUserStatus(getMapValueInt(userInfo,"userStatus")); + user_info.setLoginFailed(getMapValueInt(userInfo,"loginFailed")); + user_info.setSortField(StringUtils.trim(getMapValueStr(userInfo,"sortField"))); + user_info.setSortOrder(StringUtils.trim(getMapValueStr(userInfo,"sortOrder"))); + } return user_info; } /** - * 注销 - * @param token + * 注销登陆，只需要清除cookies即可 * @return ResponseData * 备注:无 */ @@ -372,27 +532,25 @@ public class AuthController { @ApiImplicitParam(name = "token", value = "登陆成功返回的token", paramType = "String"), }) @PostMapping("/logout") - public ResponseData logout(String token){ - if(token!=null) - { - String username=JWTUtil.getUsername(token); - redisUtil.del(username); - } + public ResponseData logout(HttpServletRequest req,HttpServletResponse rep){ + CookieUtil.setCookie(req,rep,"token","",0,false); return ResponseData.success(); } /** - * 注销 + * 根据token获取用户信息 * @param token * @return ResponseData * 备注:无 */ - @ApiOperation(value = "token校验", notes = "") + @ApiOperation(value = "token获取用户信息", notes = "") @ApiImplicitParams({ @ApiImplicitParam(name = "token", value = "登陆成功返回的token", paramType = "String"), }) - @RequestMapping("/token") + @GetMapping("/verify") + @PostMapping("/token") + @LoginSkipped public ResponseData token(String token){ if(token!=null ) { @@ -404,15 +562,39 @@ public class AuthController { { long currentTimeMillis = System.currentTimeMillis()/1000; long exp=JWTUtil.getExpire(token); + List resultUserRole=null; + try{ + String[] roleIds =user.getRoleId().split(","); + for(String role:roleIds){ + if(StringUtils.isBlank(role)){ + continue; + } + if(resultUserRole ==null) + resultUserRole =new ArrayList<>(); + if(StringUtils.isBlank(role)){ + continue; + } + ResultUserRole r = adminRoleService.findRoleById(Integer.valueOf(role)); + if(r!=null) + resultUserRole.add(r); + } + }catch (Exception e){ + e.printStackTrace(); + } if(exp>currentTimeMillis) { ResultUserInfo data=new ResultUserInfo(); + data.setId(user.getId()); data.setSecurity(user.getSecurity()); data.setAreacode(user.getAreacode()); data.setDepartment(user.getDepartment()); data.setRole(user.getRoleId()); data.setUsername(username); - return ResponseData.success(200,"success",data); + if(resultUserRole!=null){ + for(ResultUserRole r :resultUserRole) + data.addPermissions(r.getSystemMenu()); + } + return ResponseData.success(data); } else { @@ -432,7 +614,8 @@ public class AuthController { * 备注:无 */ @PostMapping(path = "/unauthorized/{message}") - public ResponseResult unauthorized(@PathVariable String message) throws UnsupportedEncodingException { - return ResponseResult.fail(message); + @LoginSkipped + public ResponseData unauthorized(@PathVariable String message) throws UnsupportedEncodingException { + return ResponseData.error(message); } } diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java index 19b7107db479997a9a7f3aa9288144bf44c31b67..880c83907461adf5b5f5cc8cfa588c1a4b33af56 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java @@ -10,6 +10,8 @@ import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.entity.NumberS; import com.cetc32.dh.service.impl.AdminRoleServiceImpl; import com.cetc32.dh.service.impl.AdminUserServiceImpl; +import com.cetc32.webutil.common.annotations.AccessPermission; +import com.cetc32.webutil.common.annotations.LoginRequired; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Map; +@LoginRequired @RestController @RequestMapping("/rest/role/") public class AuthRoleController { diff --git a/src/main/java/com/cetc32/dh/controller/rest/BaseController.java b/src/main/java/com/cetc32/dh/controller/rest/BaseController.java deleted file mode 100644 index 36cfb4a957dd5c5e10796897597a7c0aacfb5c88..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/BaseController.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * @Description：基本controller 提供获取用户id的方法 - * @Author ：徐文远 - * @version：1.0 - * @date ： 2021/1/12 下午1:38 - ******************************************************************************/ - -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.service.AdminUserService; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class BaseController { - @Autowired - AdminUserService adminUserService; - public BaseAdminUser getCurrentUserId(){ - BaseAdminUser baseAdminUser= (BaseAdminUser)SecurityUtils.getSubject().getPrincipal();//.getSession().getAttribute("currentUserId"); - return baseAdminUser;//adminUserService.getUserById(id.intValue()); - } - @RequestMapping("/test/user") - public String testUser(){ - return getCurrentUserId().getSysUserName(); - } - -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityController.java b/src/main/java/com/cetc32/dh/controller/rest/CityController.java deleted file mode 100644 index d3608bb3cc916cecd929e1ea4bcf9a37b2ffde1f..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/CityController.java +++ /dev/null @@ -1,151 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.AreaCommon; -import com.cetc32.dh.entity.City; -import com.cetc32.dh.service.AreaCommonService; -import com.cetc32.dh.service.CityService; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import java.util.*; - -/** - * 数据管理地理信息接口操作类 - * @author: 肖小霞 - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@RestController -@RequestMapping("/rest/city/") -public class CityController { - @Autowired - CityService cityService; - @Autowired - AreaCommonService areaCommonService; - - /** - * 计算根据点集得出各城市的地理区域 - * @return 返回区域面结果 - * 备注:无 - */ - @ApiOperation(value = "北京城市的点") - @PostMapping("/polygon") - public ResponseResult polygon() { - int count = 0; - List areaCommonList = areaCommonService.selectAll(); - for (AreaCommon areaCommon : areaCommonList) { - String result = ""; - String geom = ""; - List stringList = new ArrayList<>(); - if (cityService.selectByCityCode(areaCommon.getId()).size() > 0) { - //搜集所有该城市数据 - List cityList = cityService.selectByCityCode(areaCommon.getId()); - Collections.sort(cityList, new Comparator() { - public int compare(City c1, City c2) { - return Integer.parseInt(c1.getFid()) - Integer.parseInt(c2.getFid()); - } - }); - String start_end = null; - for (int i = 0; i < cityList.size(); i++) { - String s = cityList.get(i).getPointX(); - s = s + " "; - s = s + cityList.get(i).getPointY(); - if (i == 0) { - start_end = s; - } - stringList.add(s); - } - stringList.add(start_end); - result = stringList.toString(); - //result ="(117.293890872000006 30.427812941999999, 117.293890872000006 30.427812941999999, 117.293890872000006 30.427812941999999, 117.293890872000006 30.427812941999999,118.293890872000006 33.427812941999999,110.293890872000006 36.427812941999999,117.293890872000006 30.427812941999999)"; - result = result.replace("[", "("); - result = result.replace("]", ")"); - System.out.println(result); - result = "POLYGON(" + result + ")"; - System.out.println(result); -// geom = cityService.judge(result); - } - if (result != "") { - areaCommon.setGeom(result); - } - - if (areaCommonService.updateByCity(areaCommon) > 0) { - count++; - } - } - if (count > 0) { - return ResponseResult.success("更新成功"); - } else { - return ResponseResult.error("更新失败"); - } - - - } - - /** - * 判断某个点是否在一个面中 - * @return 返回判断结果 - * 备注:无 - */ - @ApiOperation(value = "判断点point是否在多边形polygon中") - @PostMapping("/pointpolygon") - public ResponseResult pointContain(@RequestBody Map map) { - String point = (String) map.get("point"); - String polygon = (String) map.get("polygon"); -// String polygon ="POLYGON((1 1,1 6,6 6,6 1,1 1))"; -// String point ="POINT(2 2)"; - //经测试边界线上的点不包含在面中 - Boolean judge = cityService.judgePointContain(point, polygon); - if (judge == true) { - return ResponseResult.success("判断结果为：点point包含面polygon"); - } else { - return ResponseResult.success("判断结果为：点point不包含面polygon"); - } - - } - - /** - * 判断多边形polygon2是否在多边形polygon1中 - * @return 返回判断结果 - * 备注:无 - */ - @ApiOperation(value = "判断多边形polygon2是否在多边形polygon1中") - @PostMapping("/jugpolygon") - public ResponseResult polygonContain(@RequestBody Map map) { - String area_big = (String) map.get("areaBig"); - String area_small = (String) map.get("areaSmall"); - String polygon1 = "POLYGON((1 1,1 6,6 6,6 1,1 1))"; - String polygon2 = "POLYGON((2 2,2 5,5 5,5 2,2 2))"; - //经测验多边形包含其本身 - Boolean judge = cityService.judgePolygonContain(area_big, area_small); - if (judge == true) { - return ResponseResult.success("判断结果为：面polygon1包含面polygon2"); - } else { - return ResponseResult.success("判断结果为：面polygon1不包含面polygon2"); - } - - } - - // @ApiOperation(value = "当前用户名提交的数据") -// @PostMapping("/jug") -// public ResponseResult Judge() { -//// String pointss ="POLYGON((98.31768 46.16992,127.59814 45.80590,108.78794 34.13706,93.2099 35.04692,98.31768 46.16992,98.31768 46.16992))"; -// String pointss ="POLYGON((116.67521 41.40101, 116.67611 41.04001, 116.68291 41.04291,98.31768 46.16992,98.31768 46.16992,116.67521 41.40101))"; -// String judge = cityService.judge(pointss); -// -// return ResponseResult.success("判断结果为："+judge); -// } - - -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java b/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java deleted file mode 100644 index 4c24b5a55dae5d3e54a817770c67bfb6e390ad21..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java +++ /dev/null @@ -1,266 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.DataFile; -import com.cetc32.dh.entity.DataPlp; -import com.cetc32.dh.entity.DataTrace; -import com.cetc32.dh.service.DataFileService; -import com.cetc32.dh.service.DataMenuService; -import com.cetc32.dh.service.DataPlpService; -import com.cetc32.dh.service.DataTraceService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 数据管理公共接口 - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@Slf4j -@RestController -@RequestMapping("/rest/datamanage/common") -public class DataCommonController { - @Autowired - private DataFileService dataFileService; - @Autowired - private DataPlpService dataPlpService; - @Autowired - private DataTraceService dataTraceService; - @Autowired - private DataMenuService dataMenuService; - - - /** - * 统计今日提交或审批数管个数 - * - * @param map status审核 - * @return 返回查询个数结果 - * 备注:无 - */ - @PostMapping(value = "/todaydataCount") - public ResponseResult countTodayData(@RequestBody Map map) { - DataFile dataFile = new DataFile(); - DataTrace dataTrace = new DataTrace(); - DataPlp dataPlp = new DataPlp(); - int count_all; - int count; - String status = (String) map.get("status"); - LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点 - String td_start = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - LocalDateTime today_end = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);//当天最晚点 - String td_end = today_end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - dataFile.setTd_start(td_start); - dataFile.setTd_end(td_end); - dataPlp.setTd_start(td_start); - dataPlp.setTd_end(td_end); - dataTrace.setTd_start(td_start); - dataTrace.setTd_end(td_end); - dataFile.setStatus(null); - dataPlp.setStatus(null); - dataTrace.setStatus(null); - count_all = dataFileService.countFilesByObj(dataFile); - count_all += dataPlpService.countFilesByObj(dataPlp); - count_all += dataTraceService.countFilesByObj(dataTrace); - if (status == null || status.contains("全部审批") || StringUtils.isBlank(status)) { - return ResponseResult.success(count_all); - } else { - status = "未审批"; - dataFile.setStatus(status); - dataPlp.setStatus(status); - dataTrace.setStatus(status); - count = dataFileService.countFilesByObj(dataFile); - count += dataPlpService.countFilesByObj(dataPlp); - count += dataTraceService.countFilesByObj(dataTrace); - count_all = count_all - count; - return ResponseResult.success(count_all); - } - } - - /** - * 统计今日提交或审批数管个数 - * - * @param map status审核 - * @return 返回查询个数结果 - * 备注:无 - */ - @PostMapping(value = "/todaydataShow") - public PageDataResult showTodayData(@RequestBody Map map) { - DataFile dataFile = new DataFile(); - DataTrace dataTrace = new DataTrace(); - DataPlp dataPlp = new DataPlp(); - int total; - List objectList = new ArrayList(); - String status; - try { - status = (String) map.get("status"); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点 - String td_start = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - LocalDateTime today_end = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);//当天最晚点 - String td_end = today_end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - dataFile.setTd_start(td_start); - dataFile.setTd_end(td_end); - dataPlp.setTd_start(td_start); - dataPlp.setTd_end(td_end); - dataTrace.setTd_start(td_start); - dataTrace.setTd_end(td_end); - if (status == null || status.contains("全部审批") || StringUtils.isBlank(status)) { - dataFile.setStatus(null); - dataPlp.setStatus(null); - dataTrace.setStatus(null); - } else { - dataFile.setStatus(status); - dataPlp.setStatus(status); - dataTrace.setStatus(status); - } - List dataFileList = new ArrayList<>(); - List dataPlpList = new ArrayList<>(); - List dataTraceList = new ArrayList<>(); - dataFileList = dataFileService.queryFilesByObj(null, null, dataFile); - dataPlpList = dataPlpService.queryFilesByObj(null, null, dataPlp); - dataTraceList = dataTraceService.queryFilesByObj(null, null, dataTrace); - for (DataFile dataFileOne : dataFileList) { - objectList.add(dataFileOne); - } - for (DataPlp dataPlpOne : dataPlpList) { - objectList.add(dataPlpOne); - } - for (DataTrace dataTraceOne : dataTraceList) { - objectList.add(dataTraceOne); - } - System.out.println(objectList.size()); - total = objectList.size(); - return new PageDataResult(objectList, total, 200); - } - - /** - * 统计今日提交或审批数管个数 - * - * @param map status审核 - * @return 返回查询个数结果 - * 备注:无 - */ - @PostMapping(value = "/approveRate") - public ResponseResult approveRate(@RequestBody Map map) { - List list = new ArrayList(); - List menuIds = (List) map.get("menuIds"); - String status = (String) map.get("status"); - if (status == null || status.contains("全部审批") || StringUtils.isBlank(status)) { - status = null; - } - Integer num; - for (Integer menuId : menuIds) { - if (menuId == 35) { - DataTrace dataTrace = new DataTrace(); - dataTrace.setStatus(status); - dataTrace.setMenuId(menuId); - num = dataTraceService.countFilesByObj(dataTrace); - Map hashMap = new HashMap(); - hashMap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName()); - hashMap.put("value", num); - list.add(hashMap); -// hashMap.put(dataMenuService.queryById(menuId.longValue()).getMenuName()+":未审批百分比", (float) un_approve / total); -// hashMap.put(dataMenuService.queryById(menuId.longValue()).getMenuName()+":已审批百分比", 1-(float) un_approve / total); - } else if (menuId == 34) { - DataPlp dataPlp = new DataPlp(); - dataPlp.setStatus(status); - dataPlp.setMenuId(menuId); - num = dataPlpService.countFilesByObj(dataPlp); - Map hashMap = new HashMap(); - hashMap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName()); - hashMap.put("value", num); - list.add(hashMap); - } else { - DataFile dataFile = new DataFile(); - dataFile.setStatus(status); - dataFile.setMenuId(menuId); - num = dataFileService.countFilesByObj(dataFile); - Map hashMap = new HashMap(); - hashMap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName()); - hashMap.put("value", num); - list.add(hashMap); - } - - } - return ResponseResult.success(list); - } - - /** - * 统计今日提交或审批数管个数 - * - * @param map status审核 - * @return 返回查询个数结果 - * 备注:无 - */ - @PostMapping(value = "/sevenDayAdd") - public ResponseResult sevenDayAdd(@RequestBody Map map) { - List list = new ArrayList(); - List menuIds = (List) map.get("menuIds"); - Integer add_num; - LocalDateTime today_start = LocalDateTime.of(LocalDate.now().minusDays(7), LocalTime.now());//当天零点 - String td_start = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - LocalDateTime today_end = LocalDateTime.of(LocalDate.now(), LocalTime.now());//当天最晚点 - String td_end = today_end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - - for (Integer menuId : menuIds) { - if (menuId == 35) { - DataTrace dataTrace = new DataTrace(); - dataTrace.setTd_start(td_start); - dataTrace.setTd_end(td_end); - add_num = dataTraceService.countFilesByObj(dataTrace); - Map hashmap = new HashMap(); - hashmap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName()); - hashmap.put("value", add_num); - list.add(hashmap); - } else if (menuId == 34) { - DataPlp dataPlp = new DataPlp(); - dataPlp.setTd_start(td_start); - dataPlp.setTd_end(td_end); - add_num = dataPlpService.countFilesByObj(dataPlp); - Map hashmap = new HashMap(); - hashmap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName()); - hashmap.put("value", add_num); - list.add(hashmap); - } else { - DataFile dataFile = new DataFile(); - dataFile.setTd_start(td_start); - dataFile.setTd_end(td_end); - dataFile.setMenuId(menuId); - add_num = dataFileService.countFilesByObj(dataFile); - Map hashmap = new HashMap(); - hashmap.put("name", dataMenuService.queryById(menuId.longValue()).getMenuName()); - hashmap.put("value", add_num); - list.add(hashmap); - } - - } - return ResponseResult.success(list); - } - - -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java deleted file mode 100644 index a055f1ccf3fdc2908d926cbf377538cdcb1c1890..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ /dev/null @@ -1,1026 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.DataFile; -import com.cetc32.dh.entity.DataSubmit; -import com.cetc32.dh.service.*; -import com.cetc32.dh.utils.FileUtil; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.util.*; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** - * 数管文件、数据接口操作类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@RestController -@RequestMapping("/rest/import/") -public class DataFileController { - - @Autowired - DataSubmitService dataSubmitService; - @Autowired - DataFileService dataFileService; - @Autowired - DataMenuService dataMenuService; - @Autowired - AdminUserService adminUserService; - @Value("${upLoadPath}") - String upLoadPath; - -// /** -// * 批量文件夹上传服务器 -// * @param folder 批量文件 -// * @param dataSubmit 数据信息 -// * @return ResponseResult 网页返回结果 -// * **/ -// @ApiOperation(value="批量文件上传") -// @PostMapping("/uploadFolder") -// public ResponseResult uploadFolder(MultipartFile[] folder,DataSubmit dataSubmit) { -// dataSubmit=new DataSubmit(1,2,2,2,"SDF","DSF",3,"FG","DDD","DF",2011); -// System.out.println(uploadPath); -// System.out.println(folder.length); -// FileUtil.saveMultiFile(uploadPath, folder); -// dataSubmit.setSubtype(1); -// dataSubmit.setStatus(1); -// int count = dataSubmitService.insertDataSubmit(dataSubmit); -// if(0<=count){ -// return ResponseResult.success("数据提交成功！"); -// } -// return ResponseResult.error("数据提交失败！"); -// } - - /** - * 查询当前用户提交的所有导入请求 - * - * @param page 页码 - * @param results 每页显示的条数 - * @return 返回给前端分装好的结构体 - **/ - @ApiOperation(value = "当前用户名提交的数据") - @PostMapping("/request") - public PageDataResult mySubmits(Integer page, Integer results) { - DataSubmit ds = new DataSubmit(); - ds.setSubmitor("admin"); - List list = new ArrayList<>(); - Integer count = 0; - list = dataSubmitService.selectMySubmit(ds); - count = dataSubmitService.countMineSubmit(ds); - return new PageDataResult(count, list, (page - 1) * results); - - } - - /** - * 查询当前用户可以审批的所有导入请求 - * - * @param page 页码 - * @param results 每页显示的条数 - * @return 返回给前端分装好的结构体 - **/ - @ApiOperation(value = "当前用户名下需要审批及已审批的所有任务") - @PostMapping("/task") - public PageDataResult myApproves(Integer page, Integer results) { - DataSubmit ds = new DataSubmit(); - ds.setSubmitor("admin"); - List list = new ArrayList<>(); - Integer count = 0; - list = dataSubmitService.selectMyApprove(ds); - for (int i = 0; i < list.size(); i++) { - } - count = dataSubmitService.countMineApprov(ds); - return new PageDataResult(count, list, (page - 1) * results); -// return new PageDataResult(count,list); - } - - - /** - * 对已提交的文件和表单数据审批通过 - * - * @param map - * @return 返回执行结果 - **/ - @ApiOperation(value = "审批通过") - @PostMapping("/accept") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult acceptSubmit(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - DataFile dataFile = new DataFile(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); - String userName = null; - if ((adminUserService.getUserById(userId)) != null) { - userName = adminUserService.getUserById(userId).getSysUserName(); - } - for (int i = 0; i < ids.size(); i++) { - Integer id = Integer.parseInt(ids.get(i)); - dataFile = dataFileService.queryById(id.longValue()); - dataFile.setStatus("审批通过"); - dataFile.setApprover(userName); - dataFile.setApproveTime(new Date()); - if (dataFileService.updatebyId(dataFile) > 0) { - sum++; - } - } - if (sum == ids.size()) - return ResponseResult.success("已审批通过"); - return ResponseResult.error("审批失败"); - - } - - /** - * 对已提交的文件和表单数据审批拒绝 - * - * @param map - * @return 返回执行结果 - **/ - @ApiOperation(value = "拒绝请求") - @PostMapping("/reject") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult rejectSubmit(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - DataFile dataFile = new DataFile(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); - String userName = null; - if ((adminUserService.getUserById(userId)) != null) { - userName = adminUserService.getUserById(userId).getSysUserName(); - } - for (int i = 0; i < ids.size(); i++) { - Integer id = Integer.parseInt(ids.get(i)); - dataFile = dataFileService.queryById(id.longValue()); - dataFile.setStatus("审批拒绝"); - dataFile.setApprover(userName); - dataFile.setApproveTime(new Date()); - if (dataFileService.updatebyId(dataFile) > 0) { - String delFile = dataFile.getFilePath(); - File file = new File(delFile); - if (file.exists()) { - FileUtil.deleteDir(delFile); - } - sum++; - } - } - if (sum == ids.size()) - return ResponseResult.success("已审批拒绝"); - return ResponseResult.error("审批失败"); - } - - - /** - * 删除已提交的数据记录 - * - * @param map - * @return 返回执行结果 - **/ - @ApiOperation(value = "删除数据") - @PostMapping("/delcommon") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请删除的文件id", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult delData(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - DataFile dataFile = new DataFile(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); - System.out.println(userId); -// String userName = null; -// if ((adminUserService.getUserById(userId)) != null) { -// userName = adminUserService.getUserById(userId).getSysUserName(); -// } - - for (int i = 0; i < ids.size(); i++) { - System.out.println(ids.get(i)); - Long id = Long.parseLong(ids.get(i)); - dataFile = dataFileService.queryById(id); - String delFile = dataFile.getFilePath(); - File file = new File(delFile); - if (dataFileService.deleteById(id) > 0) { - if (file.exists()) { - FileUtil.deleteDir(delFile); - } - sum++; - } - } - if (sum == ids.size()) { - return ResponseResult.success("删除成功"); - } - return ResponseResult.error("删除失败"); - - } - - -// /** -// * @param page 页码 -// * @param results 每页显示条数 -// * @return 分页数据 -// * */ -// @ApiOperation(value = "所有待审批的数据") -// @PostMapping("/approvescommon") -// public PageDataResult myAprroves(@ApiParam(value = "页码") Integer page, @ApiParam(value = "每页数据条数") Integer results,@ApiParam(value = "编目id") Integer menuid) { -// if (null == page || page <= 0) -// page = 1; -// if (null == results || results <= 0) -// results = 10; -// DataFile ds = new DataFile(); -// List list = new ArrayList<>(); -// list = dataFileService.selectByStatusAndUser(ds); -// return new PageDataResult(dataFileService.countByStatusAndUser(ds), -// list, (page - 1) * results); -// } - - - /** - * 根据目录节点id和条件查询数据记录 - * - * @param dataFile 使用datdFile实体类接收多个参数 - * @return pdr 返回查询结果 - * 备注:无 - */ - @ApiOperation(value = "查询数据", notes = "至少传入page，和current两个参数以及menuId编目号") - @ApiImplicitParams({ - @ApiImplicitParam(name = "page", value = "页码", paramType = "body", dataType = "Integer", required = true, defaultValue = "1"), - @ApiImplicitParam(name = "results", value = "每页数据条数", paramType = "body", dataType = "Integer", required = true, defaultValue = "10"), - @ApiImplicitParam(name = "fileName", value = "文件名称", paramType = "body", defaultValue = ""), - @ApiImplicitParam(name = "fileTime", value = "文件年份", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "body", defaultValue = ""), - @ApiImplicitParam(name = "fileSecurity", value = "文件安全等级", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "region", value = "文件区域", paramType = "body", defaultValue = ""), - @ApiImplicitParam(name = "menuId", value = "目录节点", paramType = "body", dataType = "Integer", required = true, defaultValue = ""), - @ApiImplicitParam(name = "status", value = "审批状态", paramType = "body", dataType = "String", defaultValue = "") - }) - @PostMapping("/approvecommon") - public PageDataResult queryFilesByObj(@RequestBody DataFile dataFile) { - System.out.println(dataFile.getMenuId()); - Integer page = dataFile.getPage(); - Integer results = dataFile.getResults(); - if (dataFile.getTimeRange() != null && dataFile.getTimeRange().length == 2) { - dataFile.setStartTime(dataFile.getTimeRange()[0]); - dataFile.setEndTime(dataFile.getTimeRange()[1]); - } - - if (page == null || page <= 0) { - page = 1; - } - if (results == null || results <= 0) - results = 10; - - int offset = (page - 1) * results; - - List dataFileList = new ArrayList(); - dataFileList = dataFileService.queryFilesByObj(offset, results, dataFile); - - for (int i = 0; i < dataFileList.size(); i++) { - if (dataFileList.get(i).getRegion() != null && !dataFileList.get(i).getRegion().trim().isEmpty()) { - List regionList = Arrays.asList(dataFileList.get(i).getRegion().split(",")); - dataFileList.get(i).setRegionList(new ArrayList(regionList)); - } - } - - return new PageDataResult(dataFileService.countFilesByObj(dataFile), dataFileList, offset); - - } - - /** - * 根据目录节点id查询已通过的数据 - * - * @param map - * @return pdr返回查询结果 - * 备注:无 - */ - @ApiOperation(value = "根据目录节点id查询已通过的数据") - @ApiImplicitParams({ - @ApiImplicitParam(name = "menuId", value = "目录节点", paramType = "body", dataType = "Integer", required = true, defaultValue = ""), - }) - @PostMapping("/queryAccepted") - public PageDataResult queryAccepted(@RequestBody Map map) { - DataFile dataFile = new DataFile(); - Integer menuId = (Integer) map.get("menuId"); - dataFile.setMenuId(menuId); - dataFile.setStatus("审批通过"); - Integer page = dataFile.getPage(); - Integer results = dataFile.getResults(); - - if (page == null || page <= 0) { - page = 1; - } - if (results == null || results <= 0) - results = 10; - - int offset = (page - 1) * results; - - List dataFileList = new ArrayList(); - dataFileList = dataFileService.queryFilesByObj(offset, results, dataFile); - - - return new PageDataResult(dataFileService.countFilesByObj(dataFile), dataFileList, offset); - - } - - /** - * 提交文件和表单数据 - * - * @param dataFile 使用dataFile实体类接收多个参数 - * @return 返回提交结果 - */ - @ApiOperation(value = "提交数据") - @ApiImplicitParams({ - @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "fileSecurity", value = "文件等级", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "region", value = "区域", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "fileTime", value = "文件年份", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "fileDiscription", value = "文件描述", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "approver", value = "审批人", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "menuId", value = "编目号", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "menuName", value = "编目名称", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "title", value = "文件标识", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "gcs", value = "图像地理坐标系", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "scanLevel", value = "图像级别（1-20）", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "scale", value = "图像比例尺", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "lan", value = "经度（左上）", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "lon", value = "纬度（左上）", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "fileConfig", value = "文件标识别，数据标识", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"), - }) - @PostMapping("/subcommon") - public ResponseResult DataSub(@RequestBody DataFile dataFile) { - Integer userId = dataFile.getUserId(); - System.out.println(dataFile.getRegionList()); - if (dataFile.getRegionList() != null) { - String region = dataFile.getRegionList().toString(); - region = region.replace("[", ""); - region = region.replace("]", ""); - dataFile.setRegion(region); - } - System.out.println("vvvvvv" + userId); - String upCachePath = upLoadPath + "_user" + userId; - System.out.println(upCachePath); - System.out.println(upLoadPath); - System.out.println(upCachePath); - String fileName = null; - Integer count = 0; - dataFile.setStatus("未审批"); - if ((adminUserService.getUserById(userId)) != null) { - dataFile.setSubmitor(adminUserService.getUserById(userId).getSysUserName()); - } - DataFile dataFile_new = dataFile; - DataFile dataFile_new2 = dataFile; - String path_move = dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl(); - FileUtil.makeDir(path_move); -// dataSubmit.setPath(path); - File baseFile = new File(upCachePath); - if (baseFile == null) { - return ResponseResult.error("未上传文件"); - } - File[] files = baseFile.listFiles(); - File file = null; -// List pathListNew = new ArrayList<>(); - for (int i = 0; i < files.length; i++) { - file = files[i]; - if (file.isDirectory()) { - dataFile.setFileNumbers(FileUtil.getAllFile(upCachePath + File.separator + file.getName()).size()); - dataFile.setFileSize(FileUtil.FormetFileSize(FileUtils.sizeOfDirectory(file))); - fileName = FileUtil.getFileName(file.getName()); - file.renameTo(new File(upCachePath + File.separator + fileName)); - } else { - fileName = file.getName(); - dataFile.setFileSize(FileUtil.FormetFileSize(file.length())); - dataFile.setFileNumbers(1); - } - dataFile.setFileName(fileName); - String path = dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl() + File.separator + fileName; - dataFile.setFilePath(path); -// dataFile.setCreateTime(new Date()); - dataFile_new = dataFile; - if (dataFileService.insertDataFile(dataFile_new) >= 0) { - count++; - } - dataFile_new2 = dataFile_new; - dataFile_new2.setId(dataFile_new.getId() + i + 1); - dataFile_new.setId(dataFile_new2.getId()); - } - - if (FileUtil.copyFolder(upCachePath, path_move) && count == files.length) { - FileUtil.deleteDir(upCachePath); - return ResponseResult.success("表单信息提交成功！"); - } - - return ResponseResult.error("表单信息提交失败！"); - } - - - /** - * 目录/文件提交上传 - * - * @param file 目录，文件 - * @param userId 用户id - * @return 返回文件提交结果 - */ - @ApiOperation(value = "提交时文件上传") - @RequestMapping(value = "/uploadFile", method = RequestMethod.POST) - @ApiImplicitParams({ - @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"), - }) - public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile[] file, String userId) { -// String filepath = "/root/upLoad"; -// userId=""; - System.out.println(file.length); - String upCachePath = upLoadPath + "_user" + userId; - System.out.println(upCachePath); - String filepath = upCachePath; - String result = FileUtil.uploadFile(file, filepath); - if (!result.contains("上传失败")) - return ResponseResult.success(result); - return ResponseResult.error(result); - - } - - /** - * 文件更新上传 - * - * @param file 目录，文件 - * @param fileId 文件id - * @return 返回文件更新提交结果 - */ - @ApiOperation(value = "更新时文件上传") - @RequestMapping(value = "/updateFile", method = RequestMethod.POST) - @ApiImplicitParams({ - @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "fileId", value = "文件id", paramType = "body", dataType = "Integer"), - }) - public ResponseResult updateFile(@ApiParam(value = "二进制文件流") MultipartFile[] file, String fileId) { - String upCachePath = "/root/update" + "file" + fileId; - String filepath = upCachePath; - String result = FileUtil.uploadFile(file, filepath); - if (!result.contains("上传失败")) - return ResponseResult.success(result); - return ResponseResult.error(result); - } - - -// /** -// * 目录/文件上传 -// * @param file 目录，文件 -// * @return 返回提交结果 -// * */ -// @ApiOperation(value = "更新时文件上传") -// @RequestMapping(value = "/FileRename", method = RequestMethod.POST) -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""), -// @ApiImplicitParam(name = "fileId", value = "文件id", paramType = "body", dataType = "Integer"), -// }) -// public ResponseResult FileRename(String old_dir,String new_dir) { -// if(FileUtil.renameTo(old_dir,new_dir)==true){ -// return ResponseResult.success("成功"); -// } -// return ResponseResult.error("失败"); -// } - - - /** - * 下载文件文件，文件夹 - * - * @param fileIds 选择待下载文件的id - * @return 下载结果 - */ - @ApiOperation(value = "下载文件") - @ApiImplicitParams({ - @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"), - }) - @GetMapping("/downloadMulFile") - public String downloadMulFile(String[] fileIds, HttpServletResponse response) { -// System.out.println(fileIds.length+"xxxxxxxxx"); - - if (fileIds.length == 1) { - Long fileId = Long.parseLong(fileIds[0]); - System.out.println("文件号！！！！" + fileId); - String fileName = dataFileService.queryById(fileId).getFileName(); -// String filePath = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName(); - String filePath = dataFileService.queryById(fileId).getFilePath(); - if (!FileUtil.isDirectory(filePath)) { - FileUtil.downloadFile(response, fileName, filePath); - } - } - - String message = null; - String directory = "/root/load"; - File directoryFile = new File(directory); - if (!directoryFile.isDirectory() && !directoryFile.exists()) { - directoryFile.mkdirs(); - } - //设置最终输出zip文件的目录+文件名 - String zipFileName = "已下载文件" + ".zip"; - String strZipPath = directory + "/" + zipFileName; - File zipFile = new File(strZipPath); - //读取需要压缩的文件 - Long fileId = null; - String fileName = null; - - List fileNames = new ArrayList<>(); - List filePaths = new ArrayList<>(); - for (int i = 0; i < fileIds.length; i++) { - fileId = Long.parseLong(fileIds[i]); - if (dataFileService.queryById(fileId) != null) { - fileName = dataFileService.queryById(fileId).getFilePath(); -// fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName(); - if (FileUtil.isDirectory(fileName)) { - List stringList = FileUtil.getAllFile(fileName); - for (int j = 0; j < stringList.size(); j++) { - fileNames.add(stringList.get(j)); - filePaths.add(fileName.substring(0, fileName.lastIndexOf("/"))); -// filePaths.add(dataFileService.queryById(fileId).getFilePath()); - } - } else { - fileNames.add(fileName); - filePaths.add(fileName.substring(0, fileName.lastIndexOf("/"))); -// filePaths.add(dataFileService.queryById(fileId).getFilePath()); - } - } - } - - ZipOutputStream zipStream = null; - FileInputStream zipSource = null; - BufferedInputStream bufferStream = null; - try { - //构造最终压缩包的输出流 - zipStream = new ZipOutputStream(new FileOutputStream(zipFile)); - for (int i = 0; i < fileNames.size(); i++) { - //解码获取真实路径与文件名 -// String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8"); - String realFilePath = fileNames.get(i); - System.out.println(realFilePath); - File file = new File(realFilePath); - //TODO:未对文件不存在时进行操作，后期优化。 - if (file.exists()) { - zipSource = new FileInputStream(file);//将需要压缩的文件格式化为输入流 - /** - * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名, - * 文件名和之前的重复就会导致文件被覆盖 - */ -// ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字 - ZipEntry zipEntry = new ZipEntry(fileNames.get(i).replace(filePaths.get(i), ""));//在压缩目录中文件的名字 - zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中 - bufferStream = new BufferedInputStream(zipSource, 1024 * 10); - int read = 0; - byte[] buf = new byte[1024 * 10]; - while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) { - zipStream.write(buf, 0, read); - } - } else { - message = message + file.getName() + "不存在！" + "\n"; - System.out.println(file.getName() + "不存在！"); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - //关闭流 - try { - if (null != bufferStream) bufferStream.close(); - if (null != zipStream) { - zipStream.flush(); - zipStream.close(); - } - if (null != zipSource) zipSource.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - //判断系统压缩文件是否存在：true-把该压缩文件通过流输出给客户端后删除该压缩文件 false-未处理 - if (zipFile.exists()) { - System.out.println(zipFileName); - System.out.println(strZipPath); - FileUtil.downloadFile(response, zipFileName, strZipPath); - FileUtil.deleteDir(directory); - } - if (message == null) { - message = "全部文件下载成功！"; - } - return message; - - } - - - /** - * 清空文件提交上传缓冲区 - * - * @param userId 用户id - * @return 返回文件清空结果 - */ - @ApiOperation(value = "清空上传历史上传") - @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST) - @ApiImplicitParam(name = "userId", value = "当前用户id") - public ResponseResult clearUploadFile(String userId) { - String upCachePath = upLoadPath + "_user" + userId; - FileUtil.deleteDir(upCachePath); - File file = new File(upCachePath); - if (!file.exists()) { - return ResponseResult.success("历史上传清空成功"); - } - return ResponseResult.error("历史上传清空失败"); - } - - - /** - * 清空文件更新上传缓冲区 - * - * @param map - * @return 返回文件清空结果 - */ - @ApiOperation(value = "清空更新历史上传") - @RequestMapping(value = "/clearUpdate", method = RequestMethod.POST) - @ApiImplicitParam(name = "fileId", value = "文件id") - public ResponseResult clearUpdateile(@RequestBody Map map) { - Long fileId = Long.parseLong((String) map.get("fileId")); - String upCachePath = "/root/update" + "file" + fileId; - System.out.println(upCachePath); - FileUtil.deleteDir(upCachePath); - File file = new File(upCachePath); - if (!file.exists()) { - return ResponseResult.success("历史上传清空成功"); - } - return ResponseResult.error("历史上传清空失败"); - } - -// /** -// * 显示文件夹中文件详情 -// * @return 返回文件夹中文件结果 -// * */ -// @ApiOperation(value = "显示文件夹中的文件") -// @PostMapping("/showFiles") -// @ApiImplicitParam(name = "fileId", value = "文件id号", paramType = "body", dataType = "String") -// public ResponseResult showFiles(@RequestBody String fileId) { -// System.out.println(fileId); -// if(dataFileService.queryById(Long.parseLong(fileId))!=null){ -// String filePath = dataFileService.queryById(Long.parseLong(fileId)).getFilePath(); -// String fileName = dataFileService.queryById(Long.parseLong(fileId)).getFileName(); -// String whole_dir = filePath+File.separator+fileName; -// List stringList = FileUtil.getAllFile(whole_dir); -// List fileNames = new ArrayList(); -// for(int i=0;i map) { - Boolean flag = true; - Long fileId = Long.parseLong((String) map.get("fileId")); - String fileTime = (String) map.get("fileTime"); - String lan = (String) map.get("lan"); - String lon = (String) map.get("lon"); - String gcs = (String) map.get("gcs"); - String fileConfig = (String) map.get("fileConfig"); - String scale = (String) map.get("scale"); - String region = null; - if ((List) map.get("regionList") != null) { - region = ((List) map.get("regionList")).toString(); - } -// String region = (String)map.get("region"); - String area = (String) map.get("area"); - Integer scanLevel = ((Integer) map.get("scanLevel")); - Integer userId = ((Integer) map.get("userId")); - - DataFile dataFile = dataFileService.queryById(fileId); - String old_filePath = dataFile.getFilePath(); -// if((adminUserService.getUserById(userId))!=null){ -// String userName = adminUserService.getUserById(userId).getSysUserName(); -// dataFile.setApprover(userName); -// } - if (fileTime != null && StringUtils.isNotBlank(fileTime)) { - dataFile.setFileTime(fileTime); - } - if (fileConfig != null && fileConfig != dataFile.getFileConfig()) { - dataFile.setFileConfig(fileConfig); - } - if (region != null && !StringUtils.isNotBlank(region)) { - region = region.replace("[", ""); - region = region.replace("]", ""); - dataFile.setRegion(region); - } - if (area != null && area != dataFile.getArea()) { - dataFile.setArea(area); - } - if (region != null && region != dataFile.getRegion()) { - dataFile.setRegion(region); - } - - if (lan != null && lan != dataFile.getLan()) { - dataFile.setLan(lan); - } - if (lon != null && lon != dataFile.getLon()) { - dataFile.setLon(lon); - } - if (gcs != null && gcs != dataFile.getGcs()) { - dataFile.setGcs(gcs); - } - if (scale != null && scale != dataFile.getScale()) { - dataFile.setScale(scale); - } - if (scanLevel != null && scanLevel != dataFile.getScanLevel()) { - dataFile.setScanLevel(scanLevel); - } - String updateCachePath = "/root/update" + "file" + fileId; - System.out.println(updateCachePath); - System.out.println(updateCachePath); - File updateCache = new File(updateCachePath); - if (updateCache.exists()) { - File[] files = updateCache.listFiles(); - if (files.length > 1) { - return ResponseResult.error("上传文件或文件夹只允许一个,上传个数超出范围！"); - } - } - if (updateCache.exists() && flag == true) { - if (updateCache.listFiles().length == 1) { - FileUtil.deleteDir(dataFile.getFilePath()); - File[] files = updateCache.listFiles(); - String path_whole = dataFile.getFilePath(); - String path = path_whole.substring(0, path_whole.lastIndexOf("/")); - System.out.println(files[0].getName() + "!!!!!!!!!!!!!"); - if (files[0].getName().contains(".")) { - flag = files[0].renameTo(new File(path + File.separator + files[0].getName())); - } else { - String fileName = FileUtil.getFileName(files[0].getName()); - flag = files[0].renameTo(new File(updateCachePath + File.separator + fileName)); - if (flag) { - flag = FileUtil.copyFolder(updateCachePath, old_filePath.substring(0, old_filePath.lastIndexOf("/"))); - } - } - if (flag) { - if (!files[0].getName().contains(".")) { - dataFile.setFileName(FileUtil.getFileName(files[0].getName())); - } else { - dataFile.setFileName(files[0].getName()); - } - dataFile.setFilePath(path + File.separator + dataFile.getFileName()); - if (files[0].getName().contains(".")) { - dataFile.setFileSize(FileUtil.FormetFileSize(files[0].length())); - dataFile.setFileNumbers(1); - } else { - dataFile.setFileSize(FileUtil.FormetFileSize(FileUtils.sizeOfDirectory(new File(dataFile.getFilePath())))); - dataFile.setFileNumbers(FileUtil.getAllFile(dataFile.getFilePath()).size()); - } - - } - FileUtil.deleteDir(old_filePath); - FileUtil.deleteDir(updateCachePath); - } - } - if (dataFileService.updatebyId(dataFile) > 0) { -// FileUtil.deleteDir(old_filePath); - return ResponseResult.success("信息修改成功"); - } - return ResponseResult.error("信息修改失败"); - } - - -} - - -// /** -// * @param page 页码 -// * @param results 每页显示条数 -// * @return 分页数据 -// * */ -// @ApiOperation(value = "所有待审批的数据") -// @PostMapping("/approves") -// public PageDataResult myAprroves(@ApiParam(value = "页码") Integer page, @ApiParam(value = "每页数据条数") Integer results) { -// if (null == page || page <= 0) -// page = 1; -// if (null == results || results <= 0) -// results = 10; -// DataSubmit ds = new DataSubmit(); -// ds.setStatus(0); -// List list = new ArrayList<>(); -// list = dataSubmitService.selectReadyApprove(ds); -// List list_new = new ArrayList<>(); -// for (int i = 0; i < list.size(); i++) { -// String menuName = dataMenuService.queryById(list.get(i).getMenuid()).getMenuName(); -// list.get(i).setMenuName(menuName); -// } -// return new PageDataResult(dataSubmitService.countReadyApprove(ds), -// list, (page - 1) * results); -// } - - -// /** -// * 提交数据 -// // * @param dataSubmit 数据信息 -// * @return 返回提交结果 -// * */ -// @ApiOperation(value = "提交数据", notes = "id不传参数") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "id", value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false), -// @ApiImplicitParam(name = "subtype", value = "提交类型", paramType = "body", dataType = "String", defaultValue = ""), -// @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "body", dataType = "String", defaultValue = ""), -// @ApiImplicitParam(name = "plevel", value = "文件等级", paramType = "body", dataType = "Integer", defaultValue = ""), -// @ApiImplicitParam(name = "status", value = "文件状态", paramType = "body", dataType = "Integer", defaultValue = ""), -// @ApiImplicitParam(name = "submitor", value = "提交者", paramType = "body", dataType = "String", defaultValue = ""), -// @ApiImplicitParam(name = "approver", value = "审批人", paramType = "body", dataType = "String", defaultValue = ""), -// @ApiImplicitParam(name = "menuid", value = "编目号", paramType = "body", dataType = "Integer", defaultValue = ""), -// @ApiImplicitParam(name = "menuName", value = "编目名称", paramType = "body", dataType = "String", defaultValue = ""), -// @ApiImplicitParam(name = "year", value = "年份", paramType = "body", dataType = "Integer", defaultValue = ""), -// @ApiImplicitParam(name = "title", value = "标题", paramType = "body", dataType = "String", defaultValue = ""), -// @ApiImplicitParam(name = "area", value = "区域", paramType = "body", dataType = "String", defaultValue = ""), -// @ApiImplicitParam(name = "path", value = "提交路径(不传参)", paramType = "body", dataType = "String", defaultValue = ""), -// @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"), -// }) -// @PostMapping("/sub") -// public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit) { -// String userId=dataSubmit.getUserId(); -// String upCachePath=upLoadPath+"_user"+userId; -// System.out.println("文件类型"+dataSubmit.getFileType()); -// String fileName = null; -// Integer count = 0; -// dataSubmit.setSubtype("1"); -// dataSubmit.setStatus(0); -// dataSubmit.setApprover("审批人"); -// if((adminUserService.getUserById(Integer.parseInt(userId)))!=null){ -// dataSubmit.setSubmitor(adminUserService.getUserById(Integer.parseInt(userId)).getSysUserName()); -// } -// DataSubmit dataSubmit_new = dataSubmit; -// DataSubmit dataSubmit_new2 = dataSubmit; -// String path_move = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl(); -//// dataSubmit.setPath(path); -// File baseFile = new File(upCachePath); -// File[] files = baseFile.listFiles(); -// File file = null; -//// List pathListNew = new ArrayList<>(); -// for (int i = 0; i < files.length; i++) { -// file = files[i]; -// if (file.isDirectory()) { -// dataSubmit.setFileNumbers(FileUtil.getAllFile(upCachePath +File.separator+ file.getName()).size()); -// dataSubmit.setFileSize(FileUtil.FormetFileSize(FileUtils.sizeOfDirectory(file))); -// fileName = FileUtil.getFileName(file.getName()); -// file.renameTo(new File(upCachePath +File.separator+ fileName)); -// } else { -// fileName = file.getName(); -// dataSubmit.setFileSize(FileUtil.FormetFileSize(file.length())); -// dataSubmit.setFileNumbers(1); -// } -// dataSubmit.setTitle(fileName); -// String path = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl()+File.separator+fileName; -// dataSubmit.setPath(path); -// dataSubmit.setSubtime(new Date()); -// dataSubmit_new = dataSubmit; -// if (dataSubmitService.insertDataSubmit(dataSubmit_new) >= 0) { -// count++; -// } -// dataSubmit_new2 = dataSubmit_new; -// dataSubmit_new2.setId(dataSubmit_new.getId() + i + 1); -// dataSubmit_new.setId(dataSubmit_new2.getId()); -// } -// -// if (FileUtil.copyFolder(upCachePath, path_move) && count == files.length) { -// FileUtil.deleteDir(upCachePath); -// return ResponseResult.success("表单信息提交成功！"); -// } -// -// return ResponseResult.error("表单信息提交失败！"); -// } - - -// /** -// * 拒绝导入请求 -// * @param map -// * @return 返回执行结果 -// * **/ -// @ApiOperation(value = "拒绝请求") -// @PostMapping("/reject") -// @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = "") -// public ResponseResult rejectSubmit(@RequestBody Map map) { -// List ids = new ArrayList<>(); -// ids = (List) map.get("ids"); -// DataSubmit dataSubmit = null; -// int sum = 0; -// for (int i = 0; i < ids.size(); i++) { -// Integer id = ids.get(i); -// dataSubmit = dataSubmitService.queryById(id); -// if (dataSubmitService.rejectSubmit(dataSubmit) > 0) { -//// String delFile = dataSubmit.getPath() + File.separator + dataSubmit.getTitle(); -// String delFile = dataSubmit.getPath() ; -// System.out.println(delFile); -// FileUtil.deleteDir(delFile); -// sum = sum + 1; -// } -// } -// if (sum == ids.size()) -// return ResponseResult.success("已审批拒绝"); -// return ResponseResult.error("审批失败"); -// } - -// /** -// * 拒绝导入请求 -// * @return 返回执行结果 -// * **/ -// @ApiOperation(value = "审批通过") -// @PostMapping("/accept") -// @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = "") -// public ResponseResult acceptSubmit(@RequestBody Map map) { -// System.out.println(map); -// List ids = new ArrayList<>(); -// ids = (List) map.get("ids"); -// DataSubmit dataSubmit = null; -// DataFile dataFile = new DataFile(); -// DataFile new_dataFile = null; -// FileToMenu fileToMenu = new FileToMenu(); -// int sum = 0; -// for (int i = 0; i < ids.size(); i++) { -// Integer id = ids.get(i); -// dataSubmit = dataSubmitService.queryById(id); -// dataSubmit.setReviewTime(new Date()); -// System.out.println(dataSubmit); -// dataFile.setFileName(dataSubmit.getTitle()); -// dataFile.setFilePath(dataSubmit.getPath()); -// dataFile.setRegion(dataSubmit.getArea()); -//// dataFile.setFileYear(dataSubmit.getYear()); -// dataFile.setFileDiscription(dataSubmit.getFileDiscription()); -// dataFile.setFileNumbers(dataSubmit.getFileNumbers()); -// dataFile.setFileSize(dataSubmit.getFileSize()); -// dataFile.setFileSecurity(dataSubmit.getPlevel().toString()); -// dataFile.setApprover(dataSubmit.getApprover()); -// dataFile.setSubmitor(dataSubmit.getSubmitor()); -// dataFile.setFileType(dataSubmit.getFileType()); -// if (i != 0) { -// dataFile.setId(dataFile.getId() + i); -// } -// int flag_file = dataFileService.insertDataFile(dataFile); -// new_dataFile = dataFile; -// System.out.println(new_dataFile); -// fileToMenu.setFileId(new_dataFile.getId()); -// fileToMenu.setMenuId(dataSubmit.getMenuid()); -// int flag_filetomenu = fileToMenuService.insert(fileToMenu); -// if (flag_file > 0 && flag_filetomenu > 0) { -// if (dataSubmitService.acceptSubmit(dataSubmit) > 0) { -// sum = sum + 1; -// } -// } -// } -// if (sum == ids.size()) -// return ResponseResult.success("已审批通过"); -// return ResponseResult.error("审批失败"); -// } - - - diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java deleted file mode 100644 index 2248663c45d20a32c182128dc0b76a8e7627dbae..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java +++ /dev/null @@ -1,313 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.dto.DataMenuDTO; -import com.cetc32.dh.entity.DataFile; -import com.cetc32.dh.entity.DataMenu; -import com.cetc32.dh.service.DataMenuService; -import com.cetc32.dh.utils.FileUtil; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.io.File; -import java.util.*; - -/** - * 数据管理目录目录、编目操作类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@Slf4j -@RestController -@RequestMapping("/rest/datamng/menu") -public class DataMenuController { - - @Autowired - private DataMenuService dataMenuService; - - - /** - * 统计编目节点的个数 - * - * @return 返回查询个数结果 - * 备注:无 - */ - @PostMapping(value = "/count") - public ResponseResult count() { - Integer count = dataMenuService.count(); - return ResponseResult.success(count); - } - - /** - * 插入编目节点 - * - * @param dataMenu - * @return 返回插入节点 - * 备注:无 - */ - //@PostMapping(value = "/insert") - public ResponseResult insert(DataMenu dataMenu) { -// DataMenu dataMenu=new DataMenu(2L,"test7",2L,"test7","test7"); - Integer count = dataMenuService.insertDataMenu(dataMenu); - return ResponseResult.success(count); - } - - /** - * 根据编目id查询目录节点 - * - * @param id - * @return 返回查询结果 - * 备注:无 - */ - //@PostMapping(value = "/select") - public ResponseResult select(Long id) { - - DataMenu dataMenu = dataMenuService.queryById(id); - if (dataMenu == null) { - return ResponseResult.error("没有id=" + id + "的datamenu！"); - } - return ResponseResult.success(dataMenu); - } - - /** - * 根据编目id删除目录节点(单个) - * - * @param id - * @return 返回删除结果 - * 备注:无 - */ - //@PostMapping(value = "/deleteOne") - public ResponseResult delete(Long id) { - Integer count = dataMenuService.deleteById(id); - return ResponseResult.success(count); - } - - /** - * 查询父节点为pid的所有编目节点 - * - * @param pid - * @return 返回查询结果 - * 备注:无 - */ - //@PostMapping(value = "/queryByPid") - public ResponseResult queryByPid(Long pid) { - DataMenu dataMenu = dataMenuService.queryByPid(pid); - return ResponseResult.success(dataMenu); - } - - - /** - * 查询目录树节点中以id为父节点的所有编目节点 - * - * @param id - * @return 返回查询结果 - * 备注:无 - */ - //@PostMapping(value = "/queryMenusByPIdSatisfyId") - public ResponseResult queryMenusByPIdSatisfyId(Long id) { - List dataMenuList = dataMenuService.queryByPIdSatisfyId(id); - return ResponseResult.success(dataMenuList); - } - - /** - * 添加一个编目节点 - * - * @param dataMenu - * @return 返回添加结果 - * 备注:无 - */ - @ApiOperation(value = "新增编目") - @PostMapping(value = "/addOneMenu") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pid", value = "父编目号", paramType = "body", dataType = "Integer", required = true), - @ApiImplicitParam(name = "menuName", value = "编目名称", paramType = "body", dataType = "String", required = true), - @ApiImplicitParam(name = "htmlUrl", value = "前端网页Url", paramType = "body", dataType = "String", required = true), - @ApiImplicitParam(name = "icon", value = "编目图表", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "discription", value = "编目描述", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"), - }) - public ResponseResult addOneMenu(@RequestBody DataMenu dataMenu) { -// dataMenu = new DataMenu(null, "test7", null, "test15", "test15"); - HashMap hashMap = new HashMap(); - if (dataMenu.getPid() == null) { - dataMenu.setPid(0L); - } - if (dataMenu.getPid() == 0) { - dataMenu.setAddkids(true); - } else { - dataMenu.setAddkids(false); - } - String path = dataMenuService.queryById(dataMenu.getPid()).getUrl(); - String url = path + File.separator + dataMenu.getMenuName(); - dataMenu.setUrl(url); - UUID uuid = UUID.randomUUID(); - dataMenu.setKey(uuid.toString()); - dataMenu.setDisabled(false); - List dataMenuList = dataMenuService.queryByPIdSatisfyId(dataMenu.getPid()); - for (int i = 0; i < dataMenuList.size(); i++) { - if (dataMenu.getMenuName().equals(dataMenuList.get(i).getMenuName())) { - return ResponseResult.error("已经存在添加同根同名目录，不能添加！"); - } - } - String message = dataMenuService.addDataMenu(dataMenu); - if (message.contains("成功")) { - hashMap.put("key", uuid); - Long id = (dataMenuService.queryByKey(uuid.toString())).getId(); - hashMap.put("id", id); - String file_path = dataMenuService.queryById(id).getUrl(); - FileUtil.makeDir(file_path); - return ResponseResult.success(hashMap); - } - return ResponseResult.error("添加失败！"); - } - - /** - * 根据编目节点id，更新编目节点 - * - * @param dataMenu - * @return 返回更新结果 - * 备注:无 - */ - //@PostMapping(value = "/updateDataMenu") - public ResponseResult updateDataMenu(DataMenu dataMenu) { -// dataMenu=new DataMenu(5L,"test5",1L,"test5","test5555"); - Integer count = dataMenuService.updatebyId(dataMenu); - return ResponseResult.success(count); - } - - /** - * 根据目录节点id，删除目录树(包括子树) - * - * @param map - * @return 返回删除结果 - * 备注:无 - */ - @ApiOperation(value = "删除目录树") - @PostMapping(value = "/deleteMenuTree") - @ApiImplicitParams({ - @ApiImplicitParam(name = "keys", value = "删除的编目keys", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult deleteDataMenuTree(@RequestBody Map map) { - List keys = new ArrayList<>(); - keys = (List) map.get("keys"); - String messsage = ""; - int result = 0; - for (int i = 0; i < keys.size(); i++) { - if (dataMenuService.queryByKey(keys.get(i)) == null) { - result++; - continue; - } - Long id = (dataMenuService.queryByKey(keys.get(i))).getId(); - Integer childNum = dataMenuService.countMenuChild(id); - String dirPath = dataMenuService.queryById(id).getUrl(); - String name = dataMenuService.queryById(id).getMenuName(); - Integer count = dataMenuService.deleteMenuTree(id); - if (count == childNum + 1) { - FileUtil.deleteDir(dirPath); - result++; - messsage = messsage + "成功删除目录" + name + "及其子目录\n"; - } else { - messsage = messsage + "删除目录" + name + "及其子目录失败\n"; - } - } - if (result == keys.size()) { - messsage = messsage + "成功删除所选目录及其子目录！"; - return ResponseResult.success(messsage); - } else { - messsage = messsage + "删除目录失败！"; - return ResponseResult.error(messsage); - } - - - } - - /** - * 根据编目key查找id - * - * @param map - * @return 返回查找结果 - * 备注:无 - */ - @ApiOperation(value = "编目key到id转换") - @PostMapping(value = "/keytoid") - @ApiImplicitParams({ - @ApiImplicitParam(name = "key", value = "删除的编目key", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult keytoid(@RequestBody Map map) { - String key = (String) map.get("key"); - if (dataMenuService.queryByKey(key) != null) { - Long id = dataMenuService.queryByKey(key).getId(); - return ResponseResult.success(id); - } - return ResponseResult.error("请输入正确的key！"); - - - } - - /** - * 根据目录节点id展示目录结构 - * - * @param map - * @return 返回展示结果 - * 备注:无 - */ - @ApiOperation(value = "显示目录树") - @PostMapping(value = "/showMenuTree") - public ResponseResult showMenuTree(@RequestBody Map map) { - Long id; - if (map.get("id") == null) { - id = 0L; - } else { - id = ((Integer) map.get("id")).longValue(); - } - List result = new ArrayList(); - DataMenuDTO dataMenuDTO = dataMenuService.getMenuTree(id); - - result = dataMenuDTO.getChildren(); - - Collections.sort(result, new Comparator() { - public int compare(DataMenuDTO o1, DataMenuDTO o2) { - return Integer.parseInt(o1.getValue()) - Integer.parseInt(o2.getValue()); - } - }); - - return ResponseResult.success(dataMenuDTO.getChildren()); - } - - /** - * (目录名称)编目名称和编目id - * - * @return 返回编目名称和编目id - */ - public ResponseResult menuIdName() { - List dataMenuList = dataMenuService.selectAll(); - List hashMapList = new ArrayList<>(); - for (int i = 0; i < dataMenuList.size(); i++) { - Map hashmap = new HashMap<>(); - hashmap.put("value", dataMenuList.get(i).getId().toString()); - hashmap.put("label", dataMenuList.get(i).getMenuName()); - hashMapList.add(hashmap); - } - return ResponseResult.success(hashMapList); - } -} - - diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java b/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java deleted file mode 100644 index 4656dc5df231202438b4dc8e3a7d37c100f8ce58..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java +++ /dev/null @@ -1,265 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.DataPlp; -import com.cetc32.dh.service.AdminUserService; -import com.cetc32.dh.service.DataPlpService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * 数据管理目录点线面数据操作类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@RestController -@RequestMapping("/rest/plp/") -public class DataPlpController { - - @Autowired - DataPlpService dataPlpService; - - @Autowired - AdminUserService adminUserService; - - /** - * 提交点线面数据 - * - * @param dataPlp 点线面数据实体类 - * @return 返回提交结果 - */ - @ApiOperation(value = "提交点线面数据") - @ApiImplicitParams({ - @ApiImplicitParam(name = "fileType", value = "数据类型", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "security", value = "数据安全等级", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "region", value = "区域", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "fileTime", value = "文件年份", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "description", value = "数据描述", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "approver", value = "审批人", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "points", value = "点线面点集", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "photoByte", value = "照片流", paramType = "body", dataType = "byte", defaultValue = ""), - @ApiImplicitParam(name = "fileConfig", value = "文件标识别，数据标识", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "用户id", paramType = "body", dataType = "Integer"), - }) - @PostMapping("/subplp") - public ResponseResult DataSub(@RequestBody DataPlp dataPlp) { - System.out.println("dataplp!!!!!!!!!!!"); - if ((adminUserService.getUserById(dataPlp.getUserId())) != null) { - dataPlp.setSubmitor(adminUserService.getUserById(dataPlp.getUserId()).getSysUserName()); - } - dataPlp.setStatus("未审批"); - dataPlp.setCreateTime(new Date()); - if (dataPlpService.insertOne(dataPlp) > 0) { - return ResponseResult.success("表单信息提交成功！"); - } - return ResponseResult.error("表单信息提交失败！"); - } - - - /** - * 根据编目节点id查询通过的点线面数据 - * - * @param map - * @return 返回查询结果 - * 备注:无 - */ - @ApiOperation(value = "查询已通过的点线面数据") - @ApiImplicitParams({ - @ApiImplicitParam(name = "menuId", value = "编目节点", paramType = "body", dataType = "Integer", required = true, defaultValue = ""), - }) - @PostMapping("/plpqueryAccepted") - public PageDataResult plpQueryAccepted(@RequestBody Map map) { - DataPlp dataPlp = new DataPlp(); - Integer menuId = (Integer) map.get("menuId"); - dataPlp.setMenuId(menuId); - dataPlp.setStatus("审批通过"); - Integer page = dataPlp.getPage(); - Integer results = dataPlp.getResults(); - if (null == page || page <= 0) - page = 1; - if (null == results || results <= 0) - results = 10; - - int offset = (page - 1) * results; - - return new PageDataResult(dataPlpService.countFilesByObj(dataPlp), - dataPlpService.queryFilesByObj(offset, results, dataPlp), - offset); - } - - /** - * 根据输入条件查询点线面数据 - * - * @param dataPlp - * @return 返回查询结果 - * 备注:无 - */ - @ApiOperation(value = "显示满足输入条件的点线面数据", notes = "至少传入page，和current两个参数以及menuId编目号") - @ApiImplicitParams({ - @ApiImplicitParam(name = "page", value = "页码", paramType = "body", dataType = "Integer", required = true, defaultValue = "1"), - @ApiImplicitParam(name = "results", value = "每页数据条数", paramType = "body", dataType = "Integer", required = true, defaultValue = "10"), - @ApiImplicitParam(name = "fileName", value = "文件名称", paramType = "body", defaultValue = ""), - @ApiImplicitParam(name = "fileYear", value = "文件年份", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "body", defaultValue = ""), - @ApiImplicitParam(name = "fileSecurity", value = "文件安全等级", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "region", value = "文件区域", paramType = "body", defaultValue = ""), - @ApiImplicitParam(name = "menuId", value = "目录节点", paramType = "body", dataType = "Integer", required = true, defaultValue = ""), - @ApiImplicitParam(name = "status", value = "审批状态", paramType = "body", dataType = "String", defaultValue = "") - }) - - @PostMapping("/approvesplp") - public PageDataResult myAprroves(@RequestBody DataPlp dataPlp) { - Integer page = dataPlp.getPage(); - Integer results = dataPlp.getResults(); - if (dataPlp.getTimeRange() != null && dataPlp.getTimeRange().length == 2) { - dataPlp.setStartTime(dataPlp.getTimeRange()[0]); - dataPlp.setEndTime(dataPlp.getTimeRange()[1]); - } - if (null == page || page <= 0) - page = 1; - if (null == results || results <= 0) - results = 10; - - int offset = (page - 1) * results; - - return new PageDataResult(dataPlpService.countFilesByObj(dataPlp), - dataPlpService.queryFilesByObj(offset, results, dataPlp), - offset); - } - - /** - * 根据编目节点id查询审批通过的点线面数据 - * - * @param map - * @return 返回查询结果 - **/ - @ApiOperation(value = "审批通过的点线面数据") - @PostMapping("/acceptplp") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult acceptSubmit(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - DataPlp dataPlp = new DataPlp(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); - String userName = null; - if ((adminUserService.getUserById(userId)) != null) { - userName = adminUserService.getUserById(userId).getSysUserName(); - } - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - dataPlp = dataPlpService.queryById(id); - dataPlp.setStatus("审批通过"); - dataPlp.setApprover(userName); - dataPlp.setApproveTime(new Date()); - if (dataPlpService.updateById(dataPlp) > 0) { - sum++; - } - } - if (sum == ids.size()) - return ResponseResult.success("已审批通过"); - return ResponseResult.error("审批失败"); - - } - - - /** - * 审批拒绝导入的点线面数据 - * - * @param map - * @return 返回执行结果 - **/ - @ApiOperation(value = "审批拒绝点线面数据") - @PostMapping("/rejectplp") - @ApiImplicitParams({ - @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"), - }) - public ResponseResult rejectSubmit(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - DataPlp dataPlp = new DataPlp(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); - String userName = null; - if ((adminUserService.getUserById(userId)) != null) { - userName = adminUserService.getUserById(userId).getSysUserName(); - } - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - dataPlp = dataPlpService.queryById(id); - dataPlp.setStatus("审批拒绝"); - dataPlp.setApprover(userName); - dataPlp.setApproveTime(new Date()); - if (dataPlpService.updateById(dataPlp) > 0) { - sum++; - } - } - if (sum == ids.size()) - return ResponseResult.success("已审批拒绝"); - return ResponseResult.error("审批失败"); - } - - - /** - * 删除的点线面数据 - * - * @param map - * @return 返回执行结果 - **/ - @ApiOperation(value = "删除点线面数据") - @PostMapping("/delplp") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请删除的文件id", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult delPlpData(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); - String userName = null; - if ((adminUserService.getUserById(userId)) != null) { - userName = adminUserService.getUserById(userId).getSysUserName(); - } - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - if (dataPlpService.deleteById(id) > 0) { - sum++; - } - } - if (sum == ids.size()) { - return ResponseResult.success("删除成功"); - } - return ResponseResult.error("删除失败"); - } - - -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java b/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java deleted file mode 100644 index 9f29227175eb63e8b4339b53b177df359e952b20..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java +++ /dev/null @@ -1,389 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.DataTrace; -import com.cetc32.dh.service.AdminUserService; -import com.cetc32.dh.service.DataTraceService; -import com.cetc32.dh.utils.FileUtil; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** - * 数据管理目录轨迹数据操作类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@RestController -@RequestMapping("/rest/trace/") -public class DataTraceController { - - @Autowired - DataTraceService dataTraceService; - @Autowired - AdminUserService adminUserService; - - - /** - * 提交轨迹数据 - * - * @param dataTrace 轨迹数据实体类 - * @return 返回提交结果 - */ - @ApiOperation(value = "提交轨迹数据") - @ApiImplicitParams({ - @ApiImplicitParam(name = "security", value = "数据安全等级", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "deviceid", value = "设备ID", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "fileTime", value = "文件年份", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "description", value = "数据描述", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "approver", value = "审批人", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "points", value = "点线面点集", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "flag", value = "标志位", paramType = "body", dataType = "Boolean", defaultValue = ""), - @ApiImplicitParam(name = "fileConfig", value = "文件标识别，数据标识", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"), - @ApiImplicitParam(name = "encrylongitude", value = "偏移经度", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "enccrylatitude", value = "偏移纬度", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "linkid", value = "linkid", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "coordinateerror", value = "精度", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "locsource", value = "数据源", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "direction", value = "方向", paramType = "body", dataType = "Integer"), - @ApiImplicitParam(name = "speed", value = "速度", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "lon", value = "经度", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "lat", value = "纬度", paramType = "body", dataType = "String"), - }) - @PostMapping("/subtrace") - public ResponseResult DataSub(@RequestBody DataTrace dataTrace) { - dataTrace.setStatus("未审批"); - if ((adminUserService.getUserById(dataTrace.getUserId())) != null) { - dataTrace.setSubmitor(adminUserService.getUserById(dataTrace.getUserId()).getSysUserName()); - } - dataTrace.setCreateTime(new Date()); - if (dataTraceService.insertOne(dataTrace) > 0) { - return ResponseResult.success("表单信息提交成功！"); - } - return ResponseResult.error("表单信息提交失败！"); - } - - /** - * 查看满足输入条件的轨迹数据 - * - * @param dataTrace 轨迹数据实体 - * @return 返回查询结果 - */ - @ApiOperation(value = "满足输入条件的轨迹数据") - @PostMapping("/approvestrace") - public PageDataResult myAprroves(@RequestBody DataTrace dataTrace) { - Integer page = dataTrace.getPage(); - Integer results = dataTrace.getResults(); - if (dataTrace.getTimeRange() != null && dataTrace.getTimeRange().length == 2) { - dataTrace.setStartTimeCompare(dataTrace.getTimeRange()[0]); - dataTrace.setEndTimeCompare(dataTrace.getTimeRange()[1]); - System.out.println(dataTrace.getStartTimeCompare()); - System.out.println(dataTrace.getEndTimeCompare()); - } - - if (null == page || page <= 0) - page = 1; - if (null == results || results <= 0) - results = 10; - - int offset = (page - 1) * results; - - return new PageDataResult(dataTraceService.countFilesByObj(dataTrace), - dataTraceService.queryFilesByObj(offset, results, dataTrace), - offset); - } - - /** - * 根据编目节点id查询已通过的数据 - * - * @param map - * @return 返回查询结果 - * 备注:无 - */ - @ApiOperation(value = "查询已通过的数据") - @ApiImplicitParams({ - @ApiImplicitParam(name = "menuId", value = "编目节点", paramType = "body", dataType = "Integer", required = true, defaultValue = ""), - }) - @PostMapping("/traceQueryAccepted") - public PageDataResult traceQueryAccepted(@RequestBody Map map) { - DataTrace dataTrace = new DataTrace(); - Integer menuId = (Integer) map.get("menuId"); - dataTrace.setMenuId(menuId); - dataTrace.setStatus("审批通过"); - Integer page = dataTrace.getPage(); - Integer results = dataTrace.getResults(); - - if (null == page || page <= 0) - page = 1; - if (null == results || results <= 0) - results = 10; - - int offset = (page - 1) * results; - - return new PageDataResult(dataTraceService.countFilesByObj(dataTrace), - dataTraceService.queryFilesByObj(offset, results, dataTrace), - offset); - } - - - /** - * 审批通过已导入的轨迹数据 - * - * @param map - * @return 返回执行结果 - **/ - @ApiOperation(value = "审批通过导入的轨迹数据") - @PostMapping("/accepttrace") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult acceptSubmit(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - DataTrace dataTrace = new DataTrace(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); - String userName = null; - if ((adminUserService.getUserById(userId)) != null) { - userName = adminUserService.getUserById(userId).getSysUserName(); - } - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - dataTrace = dataTraceService.queryById(id); - dataTrace.setStatus("审批通过"); - dataTrace.setApproveTime(new Date()); - dataTrace.setApprover(userName); - if (dataTraceService.updateById(dataTrace) > 0) { - sum++; - } - } - if (sum == ids.size()) - return ResponseResult.success("已审批通过"); - return ResponseResult.error("审批失败"); - - } - - - /** - * 审批拒绝导入的轨迹数据 - * - * @param map - * @return 返回执行结果 - **/ - @ApiOperation(value = "审批拒绝导入的轨迹数据") - @PostMapping("/rejecttrace") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请时审批的记录id", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult rejectSubmit(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - DataTrace dataTrace = new DataTrace(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); - String userName = null; - if ((adminUserService.getUserById(userId)) != null) { - userName = adminUserService.getUserById(userId).getSysUserName(); - } - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - dataTrace = dataTraceService.queryById(id); - dataTrace.setStatus("审批拒绝"); - dataTrace.setApprover(userName); - dataTrace.setApproveTime(new Date()); - if (dataTraceService.updateById(dataTrace) > 0) { - sum++; - } - } - if (sum == ids.size()) - return ResponseResult.success("已审批拒绝"); - return ResponseResult.error("审批失败"); - } - - - /** - * 删除轨迹数据记录 - * - * @param map - * @return 返回执行结果 - **/ - @ApiOperation(value = "删除轨迹数据") - @PostMapping("/deltrace") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请删除的文件id", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", defaultValue = ""), - }) - public ResponseResult delTraceData(@RequestBody Map map) { - System.out.println(map); - List ids = new ArrayList<>(); - int sum = 0; - ids = (List) map.get("ids"); - Integer userId = (Integer) map.get("userId"); -// String userName = null; -// if ((adminUserService.getUserById(userId)) != null) { -// userName = adminUserService.getUserById(userId).getSysUserName(); -// } - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - if (dataTraceService.deleteById(id) > 0) { - sum++; - } - } - if (sum == ids.size()) { - return ResponseResult.success("删除成功"); - } - return ResponseResult.error("删除失败"); - } - - - /** - * 下载轨迹数据文件 - * - * @param fileIds 待下载文件id - * @return 返回下载结果 - */ - @ApiOperation(value = "下载轨迹数据文件") - @ApiImplicitParams({ - @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"), - }) - @GetMapping("/downloadMulFile") - public String downloadMulFile(String[] fileIds, HttpServletResponse response) { -// System.out.println(fileIds.length+"xxxxxxxxx"); - - if (fileIds.length == 1) { - Integer fileId = Integer.parseInt(fileIds[0]); - System.out.println("文件号！！！！" + fileId); - String fileName = dataTraceService.queryById(fileId).getFileName(); -// String filePath = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName(); - String filePath = dataTraceService.queryById(fileId).getFilePath(); - if (!FileUtil.isDirectory(filePath)) { - FileUtil.downloadFile(response, fileName, filePath); - } - } - - String message = null; - String directory = "/root/load"; - File directoryFile = new File(directory); - if (!directoryFile.isDirectory() && !directoryFile.exists()) { - directoryFile.mkdirs(); - } - //设置最终输出zip文件的目录+文件名 - String zipFileName = "已下载文件" + ".zip"; - String strZipPath = directory + "/" + zipFileName; - File zipFile = new File(strZipPath); - //读取需要压缩的文件 - Integer fileId = null; - String fileName = null; - - List fileNames = new ArrayList<>(); - List filePaths = new ArrayList<>(); - for (int i = 0; i < fileIds.length; i++) { - fileId = Integer.parseInt(fileIds[i]); - if (dataTraceService.queryById(fileId) != null) { - fileName = dataTraceService.queryById(fileId).getFilePath(); -// fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName(); - if (FileUtil.isDirectory(fileName)) { - List stringList = FileUtil.getAllFile(fileName); - for (int j = 0; j < stringList.size(); j++) { - fileNames.add(stringList.get(j)); - filePaths.add(fileName.substring(0, fileName.lastIndexOf("/"))); -// filePaths.add(dataFileService.queryById(fileId).getFilePath()); - } - } else { - fileNames.add(fileName); - filePaths.add(fileName.substring(0, fileName.lastIndexOf("/"))); -// filePaths.add(dataFileService.queryById(fileId).getFilePath()); - } - } - } - - ZipOutputStream zipStream = null; - FileInputStream zipSource = null; - BufferedInputStream bufferStream = null; - try { - //构造最终压缩包的输出流 - zipStream = new ZipOutputStream(new FileOutputStream(zipFile)); - for (int i = 0; i < fileNames.size(); i++) { - //解码获取真实路径与文件名 -// String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8"); - String realFilePath = fileNames.get(i); - System.out.println(realFilePath); - File file = new File(realFilePath); - //TODO:未对文件不存在时进行操作，后期优化。 - if (file.exists()) { - zipSource = new FileInputStream(file);//将需要压缩的文件格式化为输入流 - /** - * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名, - * 文件名和之前的重复就会导致文件被覆盖 - */ -// ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字 - ZipEntry zipEntry = new ZipEntry(fileNames.get(i).replace(filePaths.get(i), ""));//在压缩目录中文件的名字 - zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中 - bufferStream = new BufferedInputStream(zipSource, 1024 * 10); - int read = 0; - byte[] buf = new byte[1024 * 10]; - while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) { - zipStream.write(buf, 0, read); - } - } else { - message = message + file.getName() + "不存在！" + "\n"; - System.out.println(file.getName() + "不存在！"); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - //关闭流 - try { - if (null != bufferStream) bufferStream.close(); - if (null != zipStream) { - zipStream.flush(); - zipStream.close(); - } - if (null != zipSource) zipSource.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - //判断系统压缩文件是否存在：true-把该压缩文件通过流输出给客户端后删除该压缩文件 false-未处理 - if (zipFile.exists()) { - System.out.println(zipFileName); - System.out.println(strZipPath); - FileUtil.downloadFile(response, zipFileName, strZipPath); - FileUtil.deleteDir(directory); - } - if (message == null) { - message = "全部文件下载成功！"; - } - return message; - - } - - -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java deleted file mode 100644 index aae3bc9f6dc413a7d8df0753924814345e66b361..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java +++ /dev/null @@ -1,504 +0,0 @@ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.dto.DemandDTO; -import com.cetc32.dh.dto.DemandSubmitDTO; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.entity.DemandSubmit; -import com.cetc32.dh.entity.vDemand; -import com.cetc32.dh.service.AdminUserService; -import com.cetc32.dh.service.DemandSubmitService; -import com.cetc32.dh.utils.FileUtil; -import com.github.pagehelper.PageHelper; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.*; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 需求管理类 - * @author: hubin - * @version: 1.0 - * @date: 2020/11/30 - * 备注:无 - */ -@RestController -@RequestMapping("/demandsubmit") -public class DemanSubmitController extends BaseController{ - @Autowired - DemandSubmitService demandSubmitService; - - @Autowired - AdminUserService adminUserService; - - @Value("${myPath}") - String myPath; - - /** - *展示所有需求 - * @return PageDateResult - */ - @ApiOperation(value = "展示所有需求") - @ApiImplicitParams({ - @ApiImplicitParam(name="classify", value="需求分类",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="searchname",value="需求名称",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="people",value="上报人",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name = "starttime", value = "开始时间", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name ="endtime",value = "结束时间", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name="page",value = "页码",dataType = "Integer",defaultValue = "0"), - @ApiImplicitParam(name="result",value = "每页数据条数",dataType = "Integer",defaultValue = "10"), - @ApiImplicitParam(name="status",value = "状态",dataType = "String",defaultValue = ""), - }) - @PostMapping("/options") - public PageDataResult demandsubmitAll(@RequestBody vDemand vdemand, @RequestParam(defaultValue = "0",required = false) Integer page, @RequestParam(defaultValue = "10",required = false) Integer results){ - if(StringUtils.isBlank(vdemand.classify)&&StringUtils.isBlank(vdemand.name)&&StringUtils.isBlank(vdemand.people) - &&StringUtils.isBlank(vdemand.starttime)&&StringUtils.isBlank(vdemand.endtime)&&StringUtils.isBlank(vdemand.status)){ - List demandlist = new ArrayList<>(); - Integer count = 0; - demandlist = demandSubmitService.findAll(); - count = demandSubmitService.countDemand(); - return new PageDataResult(count,demandlist,page * results); - }else{ - String frontfirst = vdemand.getStarttime(); - String endTime = vdemand.getEndtime(); - Date firstdate =null,secondDate = null; - DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); - if(StringUtils.isNotBlank(vdemand.getName())) - vdemand.setName("%"+vdemand.getName()+"%"); - if(vdemand.getStarttime()!=null&&vdemand.getEndtime()!=null){ - try{ - firstdate = format1.parse(frontfirst); - secondDate = format1.parse(endTime); - vdemand.setSqlstarttime(firstdate); - vdemand.setSqlendtime(secondDate); - }catch (ParseException e) { - e.printStackTrace(); - } - } - List demandlist = new ArrayList<>(); - Integer count = 0; - demandlist = demandSubmitService.queryFilesByObj(vdemand); - count = demandSubmitService.queryFilesByObj(vdemand).size(); - return new PageDataResult(count,demandlist,page * results); - } - } - - /** - * 新增需求 - * @param demandDTO - * @return ResponseResult - */ - @ApiOperation(value="新增需求") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name="projectName",value = "项目名称",paramType = "body",dataType = "String" ,defaultValue = ""), - @ApiImplicitParam(name="demandName",value = "需求名称",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandDes",value = "需求描述",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="status",value = "状态",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="reporter",value = "报告人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="departmentid",value = "部门索引",paramType = "body",dataType = "Integer",defaultValue = ""), - @ApiImplicitParam(name="approver",value="人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="getApproveFront",value = "前端传来的时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="getEndtimeFront",value = "前端传来的结束时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandClassify",value = "需求分类",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandAttachment",value = "附件",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="areachoice",value = "范围选择",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="userid",value = "当前操作的用户id",paramType = "body",dataType = "Integer",defaultValue = ""), - }) - @PostMapping("/insertselect") - public ResponseResult insertselect(@RequestBody DemandDTO demandDTO) { - DemandSubmit demandSubmit = new DemandSubmit(); - BeanUtils.copyProperties(demandDTO,demandSubmit); - Integer userid = demandDTO.getUserid(); - if(demandSubmit.getProjectName() == null || demandSubmit.getDemandName()==null||demandSubmit.getDemandClassify()==null - ||demandSubmit.getGetEndtimeFront()==null){ - return ResponseResult.error("传入空值！"); - } - String entime = demandSubmit.getGetEndtimeFront(); - DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); - Date date = new Date(); - try{ - date = format1.parse(entime); - }catch (ParseException e) { - e.printStackTrace(); - } - demandSubmit.setEndtime(date); - String upCachePath=myPath+"_user"+userid; - BaseAdminUser adminUser=getCurrentUserId(); - String userName =null; - if((adminUserService.getUserById(userid))!=null){ - userName = adminUserService.getUserById(userid).getSysUserName(); - } - demandSubmit.setReporter(userName); - String status="未审批"; - Date d= new Date(); - String timestamp = String.valueOf(d.getTime()); - String path = myPath+"admin"+timestamp; - demandSubmit.setStatus(status); - Date create = new Date(); - demandSubmit.setCreattime(create); - if(FileUtil.copyFolder(upCachePath, path)){ - FileUtil.deleteDir(upCachePath); - }else { - return ResponseResult.error("upload fail"); - } - demandSubmit.setDemandAttachment(path); - if(demandSubmitService.insertSelective(demandSubmit)>0){ - return new ResponseResult("创建成功！"); - }; - return ResponseResult.error("wrong"); - } - - /** - *选择指定偏移量的需求 - * @param pagesize - * @param pagenum - * @return PageDataResult - */ - @ApiOperation(value = "选择指定偏移量的需求") - @PostMapping("/selectbylimit") - public PageDataResult selectbylimit(@ApiParam(value = "页码") Integer pagesize, @ApiParam(value = "每页数据条数") Integer pagenum){ - PageDataResult pdr = new PageDataResult(); - if(pagenum == null || pagenum == 0){ - pagenum =1; - } - if (pagesize == null || pagesize == 0) - pagesize = 10; - pdr.setList(demandSubmitService.selectByLimit((pagenum - 1) * pagesize, pagesize)); - pdr.setTotals(demandSubmitService.countDemand()); - return pdr; - } - - /** - * 选择指定索引的需求 - * @param id - * @return ResponseResult - */ - @ApiOperation(value = "选择指定索引的需求") - @ApiImplicitParam(name="id",value = "索引",dataType = "Integer",defaultValue = "") - @PostMapping("/selectbykey") - public ResponseResult selsectbykey(Integer id){ - if(id == null){ - return ResponseResult.error("id为空！"); - } - ResponseResult pdr = new ResponseResult(); - pdr.setObj(this.demandSubmitService.selectByPrimaryKey(id)); - return pdr; - } - - /** - * 删除指定的需求 - * @param id - * @return ResponseResult - */ - @ApiOperation(value = "删除指定索引的需求") - @ApiImplicitParam(name="id",value = "索引",dataType = "Integer",defaultValue = "") - @PostMapping("/deletebykey") - public ResponseResult deletebyprimarykey(Integer id){ - if(id == null) - return ResponseResult.error("传入值为空！"); - demandSubmitService.deleteByPrimaryKey(id); - return new ResponseResult("Success"); - } - - /** - * 更新指定的需求 - * @param demandSubmit - * @return ResponseResult - */ - @ApiOperation(value="更新需求") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "记录id号", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name="projectName",value = "项目名称",paramType = "body",dataType = "String" ,defaultValue = ""), - @ApiImplicitParam(name="demandName",value = "需求名称",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandDes",value = "需求描述",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="status",value = "状态",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="reporter",value = "报告人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="departmentid",value = "部门索引",paramType = "body",dataType = "Integer",defaultValue = ""), - @ApiImplicitParam(name="approver",value="人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="getApproveFront",value = "前端传来的时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="getEndtimeFront",value = "前端传来的结束时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandClassify",value = "需求分类",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandAttachment",value = "附件",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="areachoice",value = "范围选择",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="creattime",value = "创建时间",paramType = "body",dataType = "Timestamp",defaultValue = ""), - @ApiImplicitParam(name="useid",value = "对应的用户id",paramType = "body",dataType = "Integer",defaultValue = ""), - }) - @PostMapping("/updateselect") - public ResponseResult updateselect(@RequestBody DemandSubmit demandSubmit) { - if(demandSubmit == null){ - return ResponseResult.error("传入值为空！"); - } - String entime = demandSubmit.getGetEndtimeFront(); - if(StringUtils.isNotBlank(entime)){ - DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); - Date date = new Date(); - try{ - date = format1.parse(entime); - }catch (ParseException e) { - e.printStackTrace(); - } - demandSubmit.setEndtime(date); - } - demandSubmitService.updateByPrimaryKeySelective(demandSubmit); - return new ResponseResult("Success"); - } - - /** - * 模糊查询 - * @param pageNum - * @param pageSize - * @param keyword - * @return PageDataResult - */ - @ApiOperation(value="查询接口") - @PostMapping("/search") - @ApiImplicitParam(name="keyword",value = "关键词",dataType = "String",defaultValue = "") - public PageDataResult demandSubmitSearch(@ApiParam(value = "页码") Integer pageNum, @ApiParam(value = "每页数据条数") Integer pageSize, String keyword) { - - PageDataResult pdr = new PageDataResult(); - if (pageNum == null || pageNum == 0) { - pageNum = 1; - } - if (pageSize == null || pageSize == 0) - pageSize = 10; - - if(keyword.equals("all")){ - pdr.setTotals(demandSubmitService.countDemand()); - PageHelper.startPage(pageNum, pageSize); - pdr.setList(demandSubmitService.findAll()); - }else { - pdr.setTotals(demandSubmitService.findByKeyWord(keyword).size()); - PageHelper.startPage(pageNum, pageSize); - pdr.setList(demandSubmitService.findByKeyWord(keyword)); - } - - return pdr; - } - - /** - * 目录/文件上传 - * @param file 目录，文件 - * @return 返回提交结果 - * */ - @ApiOperation(value = "文件上传") - @RequestMapping(value = "/uploadFile", method = RequestMethod.POST) - @ApiImplicitParams({ - @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "用户id", paramType = "body", dataType = "Integer"), - }) - public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile[] file, Integer userid) { -// String filepath = "/root/upLoad"; - String upCachePath=myPath+"_user"+userid; - String filepath = upCachePath; - String result = FileUtil.uploadFile(file, filepath); - if (!result.contains("上传失败")) - return ResponseResult.success(result); - return ResponseResult.error(result); - - } - - - /** - * 文件上传缓冲区清空 - * @return 返回文件清空结果 - * */ - @ApiOperation(value = "清空历史上传") - @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST) - @ApiImplicitParam(name = "userId", value = "当前用户id") - public ResponseResult clearUploadFile(String userId) { - String upCachePath=myPath+"_user"+userId; - FileUtil.deleteDir(upCachePath); - File file = new File(upCachePath); - if (!file.exists()) { - return ResponseResult.success("历史上传清空成功"); - } - return ResponseResult.error("历史上传清空失败"); - } - - /** - * 获取当前用户下的所有需求 - * @return PageDataResult - */ - @PostMapping("/getdemand") - public PageDataResult getUserAll(){ - BaseAdminUser adminUser = getCurrentUserId(); - String name = adminUser.getSysUserName(); - PageDataResult pdr = new PageDataResult(); - pdr.setTotals(demandSubmitService.countMineSubmit(name)); - pdr.setList(demandSubmitService.selectMySubmit(name)); - return pdr; - } - - /** - * 单个需求通过 - * @param id - * @param status - * @return - */ - @PostMapping("/acceptdemand") - public ResponseResult acceptDemand(Integer id,String status){ - DemandSubmit demandSubmit = demandSubmitService.selectByPrimaryKey(id); - demandSubmit.setStatus(status); - demandSubmitService.updateByPrimaryKeySelective(demandSubmit); - return new ResponseResult("done"); - } - - - /** - * 单个需求拒绝 - * @param id - * @param status - * @return - */ - @PostMapping("/rejectdemand") - public ResponseResult rejectDemand(Integer id,String status){ - DemandSubmit demandSubmit = demandSubmitService.selectByPrimaryKey(id); - demandSubmit.setStatus(status); - demandSubmitService.updateByPrimaryKeySelective(demandSubmit); - return new ResponseResult("done"); - } - - - /** - * 多个需求通过 - * @return 返回执行结果 - * **/ - @ApiOperation(value = "批量审批通过") - @PostMapping("/accept") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请的记录id", dataType = "Map", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "当前操作的用户id", dataType = "Map", defaultValue = "") - }) - public ResponseResult acceptMany(@RequestBody Map map) { - List ids = new ArrayList<>(); - ids = (List) map.get("ids"); - DemandSubmit demandSubmit = new DemandSubmit(); - String staus = "审批通过"; - Integer userId = (Integer)map.get("userid"); - String userName = null; - if((adminUserService.getUserById(userId))!=null){ - userName = adminUserService.getUserById(userId).getSysUserName(); - } - int sum = 0; - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - demandSubmit = demandSubmitService.selectByPrimaryKey(id); - demandSubmit.setApprover(userName); - Date appt = new Date(); - demandSubmit.setApproceTime(appt); - demandSubmit.setStatus(staus); - if (demandSubmitService.updateByPrimaryKeySelective(demandSubmit) > 0) { - sum = sum + 1; - } - } - if (sum == ids.size()) - return ResponseResult.success("已通过"); - return ResponseResult.error("失败"); - } - - /** - * 多个需求通过拒绝 - * @return 返回执行结果 - * **/ - @ApiOperation(value = "批量审批拒绝") - @PostMapping("/refuse") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请的记录id", dataType = "Map", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "当前操作的用户id", dataType = "Map", defaultValue = "") - }) - public ResponseResult refuseMany(@RequestBody Map map) { - List ids = new ArrayList<>(); - ids = (List) map.get("ids"); - DemandSubmit demandSubmit = new DemandSubmit(); - Integer userId = (Integer)map.get("userid"); - String userName = null; - if((adminUserService.getUserById(userId))!=null){ - userName = adminUserService.getUserById(userId).getSysUserName(); - } - String staus = "审批拒绝"; - int sum = 0; - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - demandSubmit = demandSubmitService.selectByPrimaryKey(id); - demandSubmit.setStatus(staus); - if (demandSubmitService.updateByPrimaryKeySelective(demandSubmit) > 0) { - sum = sum + 1; - } - } - if (sum == ids.size()) - return ResponseResult.success("已拒绝！"); - return ResponseResult.error("失败"); - } - - - - - /** - * 下载功能 - * @return 下载后的文件名 - * **/ - @ApiOperation(value = "下载") - @GetMapping("/download") - @ApiImplicitParam(name = "id", value = "需求的记录id", dataType = "Integer", defaultValue = "") - public String download(Integer id, HttpServletRequest request, HttpServletResponse response) throws Exception{ - DemandSubmit demandSubmit= demandSubmitService.selectByPrimaryKey(id); - String path = demandSubmit.getDemandAttachment(); - // path是指欲下载的文件的路径。 - -// // 取得文件名。 -// String filename = file.getName(); -// // 取得文件的后缀名。 -// String ext = filename.substring(filename.lastIndexOf(".") + 1).toUpperCase(); - String zipPath = FileUtil.downloadAllAttachment(path,request,response); - String filename = zipPath.substring(zipPath.lastIndexOf(File.separator)+1,zipPath.length()); - FileUtil.downloadFile(response,filename,zipPath); - FileUtil.deleteDir(zipPath); - return filename; - - } - - /** - * 更新指定的需求 - * @param demandSubmitDTO - * @return ResponseResult - */ - @ApiOperation(value="根据状态获取需求id和name") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "记录id号", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name="demandName",value = "需求名称",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandStatus",value = "状态",paramType = "body",dataType = "String",defaultValue = ""), - }) - @PostMapping("/searchbystatus") - public PageDataResult searchStatus(@RequestBody DemandSubmitDTO demandSubmitDTO, @RequestParam(defaultValue = "0",required = false) Integer page, @RequestParam(defaultValue = "10",required = false) Integer results){ - if(demandSubmitDTO.getId()==null&&StringUtils.isBlank(demandSubmitDTO.getDeamndName()) - &&StringUtils.isBlank(demandSubmitDTO.getDemandStatus())){ - demandSubmitDTO.setDemandStatus("1"); - List demandSubmitDTOS = demandSubmitService.searchbystatus(demandSubmitDTO); - Integer count = demandSubmitService.searchbystatus(demandSubmitDTO).size(); - return new PageDataResult(count,demandSubmitDTOS,page * results); - }else { - List demandSubmitDTOS = demandSubmitService.searchbystatus(demandSubmitDTO); - Integer count = demandSubmitService.searchbystatus(demandSubmitDTO).size(); - return new PageDataResult(count,demandSubmitDTOS,page * results); - } - } -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/DemandTaskCommonController.java b/src/main/java/com/cetc32/dh/controller/rest/DemandTaskCommonController.java deleted file mode 100644 index fcb232ffcc413aba0ffae3e301a17dbe6f4b00c3..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/DemandTaskCommonController.java +++ /dev/null @@ -1,228 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.*; -import com.cetc32.dh.service.DemandSubmitService; -import com.cetc32.dh.service.EstimateTaskService; -import com.cetc32.dh.service.ProductdemandService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 任务管理接口 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@Slf4j -@RestController -@RequestMapping("/rest/datamanage/demandtask") -public class DemandTaskCommonController { - @Autowired - DemandSubmitService demandSubmitService; - @Autowired - EstimateTaskService estimateTaskService; - @Autowired - ProductdemandService productdemandService; - - /** - * 统计今日提交的生产需求个数 - * - * @return 返回查询个数结果 - * 备注:无 - */ - @PostMapping(value = "/todaydemandsub") - public ResponseResult countTodayDemand() { - vDemand vdemand = new vDemand(); - int count; - LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点 - String td_start = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - LocalDateTime today_end = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);//当天最晚点 - String td_end = today_end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - vdemand.setTd_start(td_start); - vdemand.setTd_end(td_end); - count = demandSubmitService.queryFilesByObj(vdemand).size(); - return ResponseResult.success(count); - } - - /** - * 统计今日下发/审批/截止任务个数 - * @param map message 区分的任务类型的信息 - * @return 返回查询个数结果 - * 备注:无 - */ - @PostMapping(value = "/todaytask") - public ResponseResult countTodayTask(@RequestBody Map map) { - String message = (String) map.get("message"); - if (message == null || !(message.equals("下发任务") || message.equals("审批任务") || message.equals("截止任务"))) { - return ResponseResult.error("请输入正确的message!"); - } - vProduct vproduct = new vProduct(); - vEstimate vestimate = new vEstimate(); - int count; - LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点 - String td_start = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - LocalDateTime today_end = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);//当天最晚点 - String td_end = today_end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - vproduct.setTd_start(td_start); - vproduct.setTd_end(td_end); - vestimate.setTd_start(td_start); - vestimate.setTd_end(td_end); - if (message != null) { - vproduct.setMessage(message); - vestimate.setMessage(message); - } - count = productdemandService.queryFilesByObj(vproduct).size(); - count += estimateTaskService.queryFilesByObj(vestimate).size(); - return ResponseResult.success(count); - } - - /** - * 评估任务数和生产任务数之比 - * - * @return 返回结果 - * 备注:无 - */ - @PostMapping(value = "/demandpercent") - public ResponseResult demandPercent() { - ArrayList list = new ArrayList(); - vDemand vdemand_product = new vDemand(); - vDemand vdemand_estimate = new vDemand(); - int vProduct_num; - int vEstimate_num; - HashMap hashMap = new HashMap(); - HashMap hashMap1 = new HashMap(); - vdemand_product.setClassify("生产任务"); - vdemand_estimate.setClassify("评估任务"); - vProduct_num = demandSubmitService.queryFilesByObj(vdemand_product).size(); - vEstimate_num = demandSubmitService.queryFilesByObj(vdemand_estimate).size(); - hashMap.put("name", "生产需求"); - hashMap.put("value", vProduct_num); - list.add(hashMap); - hashMap1.put("name", "评估需求"); - hashMap1.put("value", vEstimate_num); - list.add(hashMap1); - return ResponseResult.success(list); - } - - /** - * 评估需求数和生产需求数之比 - * - * @return 返回结果 - * 备注:无 - */ - @PostMapping(value = "/taskpercent") - public ResponseResult taskPercent() { - ArrayList list = new ArrayList(); - vProduct vproduct = new vProduct(); - vEstimate vestimate = new vEstimate(); - int vProduct_num; - int vEstimate_num; - HashMap hashMap = new HashMap(); - HashMap hashMap1 = new HashMap(); - vProduct_num = productdemandService.queryFilesByObj(vproduct).size(); - vEstimate_num = estimateTaskService.queryFilesByObj(vestimate).size(); - hashMap.put("name", "生产任务"); - hashMap.put("value", vProduct_num); - list.add(hashMap); - hashMap1.put("name", "评估任务"); - hashMap1.put("value", vEstimate_num); - list.add(hashMap1); - return ResponseResult.success(list); - } - - /** - * 近七日每日任务统计数 - * - * @return 返回结果 - * 备注:无 - */ - @PostMapping(value = "/sevenDayTotal") - public ResponseResult sevenDayTotal() { - ArrayList list_day = new ArrayList(); - ArrayList list_count = new ArrayList(); - HashMap hashMap = new HashMap(); - String message = "下发任务"; - vProduct vproduct = new vProduct(); - vEstimate vestimate = new vEstimate(); - vproduct.setMessage(message); - vestimate.setMessage(message); - for (int i = 6; i >= 0; i--) { - int count = 0; - LocalDateTime today_start = LocalDateTime.of(LocalDate.now().minusDays(i), LocalTime.MIN);//当天零点 - String td_start = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - LocalDateTime today_end = LocalDateTime.of(LocalDate.now().minusDays(i), LocalTime.MAX);//当天最晚点 - String td_end = today_end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - String td = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - vproduct.setTd_start(td_start); - vproduct.setTd_end(td_end); - vestimate.setTd_start(td_start); - vestimate.setTd_end(td_end); - count = productdemandService.queryFilesByObj(vproduct).size(); - count += estimateTaskService.queryFilesByObj(vestimate).size(); - list_day.add(td); - list_count.add(count); - } - hashMap.put("day", list_day); - hashMap.put("data", list_count); - return ResponseResult.success(hashMap); - } - - - /** - * 未审批任务、需求获取接口 - * @param map message 区分不同需求是任务接口的信息 - * @return 返回结果 - * 备注:无 - */ - @PostMapping(value = "/unaprrove") - public PageDataResult unaprrove(@RequestBody Map map) { - String message = (String) map.get("message"); - ArrayList list = new ArrayList(); - vDemand vdemand = new vDemand(); - vProduct vproduct = new vProduct(); - vEstimate vestimate = new vEstimate(); - vdemand.setStatus("未审批"); - vproduct.setStatus("未审批"); - vestimate.setStatus("未审批"); - if (message != null && message.equals("未审批需求")) { - List vDemandList = demandSubmitService.queryFilesByObj(vdemand); - return new PageDataResult(vDemandList, vDemandList.size(), 200); - } else if (message != null && message.equals("未审批任务")) { - List vProductsList = productdemandService.queryFilesByObj(vproduct); - for (Productdemand productdemand : vProductsList) { - list.add(productdemand); - } - List vEstimateList = estimateTaskService.queryFilesByObj(vestimate); - for (EstimateTask estimateTask : vEstimateList) { - list.add(estimateTask); - } - return new PageDataResult(list, list.size(), 200); - } else { - return new PageDataResult(null, 0, -1); - } - } - - -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java index 2be21dc4ad9d74081a275d7a7ee5b21c4aabb784..fcbcf9dbbe94e8caf8375da526e9243f332e3702 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java @@ -1,36 +1,37 @@ package com.cetc32.dh.controller.rest; -import com.cetc32.dh.beans.ResultUserInfoDe; import com.cetc32.dh.common.response.PageDataResult; +import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.dto.AreaCommonDTO; import com.cetc32.dh.dto.CommonTreeDTO; import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.entity.Department; import com.cetc32.dh.entity.NumberS; -import com.cetc32.dh.service.DepartmentService; import com.cetc32.dh.service.impl.AdminUserServiceImpl; import com.cetc32.dh.service.impl.DepartmentServiceImpl; +import com.cetc32.webutil.common.annotations.LoginRequired; +import com.cetc32.webutil.common.annotations.LoginSkipped; import com.github.pagehelper.PageHelper; -import com.google.inject.internal.cglib.core.$CollectionUtils; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import io.swagger.models.Response; import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; import org.bouncycastle.crypto.tls.MACAlgorithm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.spring.web.readers.operation.ResponseMessagesReader; -import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - +@LoginRequired @RestController @RequestMapping("/department/") -public class DepartmentController extends BaseController{ +public class DepartmentController{ @Autowired DepartmentServiceImpl departmentService; @@ -58,7 +59,7 @@ public class DepartmentController extends BaseController{ @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "查询ID（key值）下的范围树,非必填，默认查询全部", dataType = "Integer"), }) - @RequestMapping(value = "/tree", method = RequestMethod.GET) + @GetMapping(value = "/tree") public ResponseResult departmentTree(Integer id) { if (id ==null ){ id = 1; @@ -80,13 +81,13 @@ public class DepartmentController extends BaseController{ @ApiImplicitParam(name = "organizationid",defaultValue = "组织id", paramType = "body", dataType = "Integer"), }) @PostMapping("/add") - public ResponseResult insertselect(@RequestBody Department department){ - if(department == null || StringUtils.isBlank(department.getName())){ - return ResponseResult.error("传入值不能为空！"); + public ResponseData insertselect(@RequestBody Department department){ + if(department == null || department.getName().isEmpty()){ + return ResponseData.error("传入值不能为空！"); } if(departmentService.findByID(department.getOrganizationid())==null) { - return ResponseResult.error("上级部门不存在！"); + return ResponseData.error("上级部门不存在！"); } department.setName(department.getName().trim()); List dp=departmentService.findByParentID(department.getOrganizationid()); @@ -95,12 +96,12 @@ public class DepartmentController extends BaseController{ .collect(Collectors.toList()); if(result1.size()>0) { - return ResponseResult.error("同级已存在重复名字！"); + return ResponseData.error("同级已存在重复名字！"); } if(departmentService.insert(department)>0){ - return ResponseResult.success("新增成功！"); + return ResponseData.success("新增成功！"); } - return ResponseResult.error("新增失败"); + return ResponseData.error("新增失败"); } @ApiOperation(value = "删除部门") @@ -108,26 +109,26 @@ public class DepartmentController extends BaseController{ @ApiImplicitParam(name = "id",defaultValue = "组织id", dataType = "Integer") }) @PostMapping("/delete") - public ResponseResult deleteById(@RequestBody Map delId){ + public ResponseData deleteById(@RequestBody Map delId){ Integer id= delId.getOrDefault("id",null); if(id==null){ - return ResponseResult.error("缺少参数：id"); + return ResponseData.error("缺少参数：id"); } List dp=departmentService.findByParentID(id); if(dp.size()>0) { - return ResponseResult.error("请先删除子部门！"); + return ResponseData.error("请先删除子部门！"); } BaseAdminUser user_info=new BaseAdminUser(); user_info.setDepartment(id); if(userService.findUserByCondition(user_info).size()>0) { - return ResponseResult.error("请先删除部门内人员！"); + return ResponseData.error("请先删除部门内人员！"); } if(departmentService.deleteById(id)>0){ - return ResponseResult.success("删除成功！"); + return ResponseData.success("删除成功！"); } - return ResponseResult.error("删除失败"); + return ResponseData.error("删除失败"); } @ApiOperation(value = "更新部门") @ApiImplicitParams({ @@ -137,12 +138,12 @@ public class DepartmentController extends BaseController{ @ApiImplicitParam(name = "organizationid",defaultValue = "组织id", paramType = "body", dataType = "Integer"), }) @PostMapping("/update") - public ResponseResult updateselect(@RequestBody Department department){ - if(department == null || StringUtils.isBlank(department.getName())){ - return ResponseResult.error("name 不能为空！"); + public ResponseData updateselect(@RequestBody Department department){ + if(department == null){ + return ResponseData.error("传入值不能为空！"); } departmentService.updateByPrimaryKeySelective(department); - return new ResponseResult("更新成功"); + return new ResponseData("更新成功"); } // @ApiOperation(value = "部门搜索") @@ -205,17 +206,15 @@ public class DepartmentController extends BaseController{ if(id == null){ return ResponseResult.error("id为空！"); } - ResponseResult pdr = new ResponseResult(); - pdr.setObj(this.departmentService.selectByPrimaryKey(id)); - return pdr; + return ResponseResult.success(this.departmentService.selectByPrimaryKey(id)); } @RequestMapping("/deletebykey") - public ResponseResult deletebyprimarykey(Integer id){ + public ResponseData deletebyprimarykey(Integer id){ if(id == null) - return ResponseResult.error("传入值为空！"); + return ResponseData.error("传入值为空！"); departmentService.deleteByPrimaryKey(id); - return new ResponseResult("Success"); + return new ResponseData("Success"); } diff --git a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java deleted file mode 100644 index 65a5f9643fa87b1e75540c61d081eba4dcbada27..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java +++ /dev/null @@ -1,437 +0,0 @@ -package com.cetc32.dh.controller.rest; - -import com.alibaba.fastjson.JSONObject; -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.dto.EstimateDTO; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.entity.EstimateTask; -import com.cetc32.dh.entity.vEstimate; -import com.cetc32.dh.service.AdminUserService; -import com.cetc32.dh.service.EstimateTaskService; -import com.cetc32.dh.utils.FileUtil; -import com.github.pagehelper.PageHelper; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import io.swagger.models.auth.In; -import net.sf.json.JSONArray; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.authz.annotation.RequiresRoles; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; - -@RestController -@RequestMapping("/estimatetask/") -public class EstimateTaskController extends BaseController{ - @Autowired - EstimateTaskService estimateTaskService; - - @Autowired - AdminUserService adminUserService; - - @Value("${myPath}") - String myPath; - - - /** - *展示所有评估任务 - * @return PageDateResult - */ - @ApiOperation(value = "展示所有评估任务") - @ApiImplicitParams({ - @ApiImplicitParam(name="classify", value="评估任务分类",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="name",value="评估任务名称",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="astatus",value="审批状态",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="page",value = "页码",dataType = "Integer",defaultValue = "0"), - @ApiImplicitParam(name="result",value = "每页数据条数",dataType = "Integer",defaultValue = "10"), - }) - @PostMapping("/options") - public PageDataResult organizationAll(@RequestBody vEstimate vEstimate,@RequestParam(defaultValue = "0",required = false) Integer page, @RequestParam(defaultValue = "10",required = false) Integer results){ - if((StringUtils.isBlank(vEstimate.classify)||vEstimate.classify.equals("全部分类"))&&StringUtils.isBlank(vEstimate.name)&&StringUtils.isBlank(vEstimate.astatus)&&StringUtils.isBlank(vEstimate.creator)){ - List estimateTasks = estimateTaskService.findAll(); - Integer count = estimateTaskService.countEstimate(); - return new PageDataResult(count,estimateTasks,page * results); - }else { - if(StringUtils.isNotBlank(vEstimate.getName())) - vEstimate.setName("%"+vEstimate.getName()+"%"); - if(vEstimate.classify.equals("全部分类")){ - vEstimate.classify=null; - } - List estimateTasks = estimateTaskService.queryFilesByObj(vEstimate); - Integer count = estimateTaskService.queryFilesByObj(vEstimate).size(); - return new PageDataResult(count,estimateTasks,page * results); - } - } - - /** - * 新增评估任务 - * @param estimateDTO - * @return ResponseResult - */ - @ApiOperation(value="新增评估任务") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name="name",value = "任务名称",paramType = "body",dataType = "String" ,defaultValue = ""), - @ApiImplicitParam(name="taskClassify",value = "评估任务类型",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="taskType",value = "评估任务服务选择类型",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="taskPath",value = "评估任务附件路径",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="starttimefront",value = "前端传过来的任务开始时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="endtimefront",value = "前端传过来的任务结束时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="creator",value="任务创建人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="creattimefront",value = "前端传来的创建时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="status",value = "状态",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="approver",value = "审批人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandid",value = "对应的需求id",paramType = "body",dataType = "Integer",defaultValue = ""), - @ApiImplicitParam(name = "frontyear",value = "前端传来的时间数组",paramType = "body" ,dataType = "List",defaultValue = ""), - @ApiImplicitParam(name = "approvtime",value = "时间",paramType = "body" ,dataType = "Timestamp",defaultValue = ""), - @ApiImplicitParam(name="useid",value = "对应的用户id",paramType = "body",dataType = "Integer",defaultValue = ""), - }) - @PostMapping("/insertselect") - public ResponseResult insertselect(@RequestBody EstimateDTO estimateDTO){ - EstimateTask estimateTask = new EstimateTask(); - BeanUtils.copyProperties(estimateDTO,estimateTask); - Integer userid= estimateDTO.getUserid(); - if(StringUtils.isBlank(estimateTask.getName())||StringUtils.isBlank(estimateTask.getTaskClassify())){ - return ResponseResult.error("传入空值！"); - } - List handletime = estimateTask.getFrontyear(); - String starttime1 = handletime.get(0); - String endtime1 = handletime.get(1); - DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); - Date startdate = new Date(); - Date enddate = new Date(); - Date createtime=null; - try{ - startdate = format1.parse(starttime1); - enddate = format1.parse(endtime1); - }catch (ParseException e) { - e.printStackTrace(); - } - - estimateTask.setStarttime(startdate); - estimateTask.setEndtime(enddate); - String upCachePath=myPath+"_user"+userid; - BaseAdminUser adminUser=getCurrentUserId(); - String userName =null; - if((adminUserService.getUserById(userid))!=null){ - userName = adminUserService.getUserById(userid).getSysUserName(); - } - estimateTask.setCreator(userName); - String status="未审批"; - Date d= new Date(); - String timestamp = String.valueOf(d.getTime()); - String path = myPath+"admin"+timestamp; - estimateTask.setStatus(status); - Date creat = new Date(); - estimateTask.setCreattime(creat); - if(!estimateTask.getTaskClassify().equals("服务")){ - if(FileUtil.copyFolder(upCachePath, path)){ - FileUtil.deleteDir(upCachePath); - }else { - return ResponseResult.error("upload fail"); - } - estimateTask.setTaskPath(path); - } - if(estimateTaskService.insertSelective(estimateTask)>0){ - return new ResponseResult("创建成功！"); - } - return ResponseResult.error("wrong"); - } - - @PostMapping("/selectbylimit") - public PageDataResult selectbylimit(@RequestParam("pageSize") Integer pagesize, @RequestParam("pageNum") Integer pagenum){ - PageDataResult pdr = new PageDataResult(); - if(pagenum == null || pagenum == 0){ - pagenum =1; - } - if (pagesize == null || pagesize == 0) - pagesize = 10; - pdr.setList(estimateTaskService.selectByLimit((pagenum - 1) * pagesize, pagesize)); - pdr.setTotals(estimateTaskService.countEstimate()); - return pdr; - } - - @PostMapping("/selectbykey") - public ResponseResult selsectbykey(Integer id){ - if(id == null){ - return ResponseResult.error("id为空！"); - } - ResponseResult pdr = new ResponseResult(); - pdr.setObj(this.estimateTaskService.selectByPrimaryKey(id)); - return pdr; - } - - @PostMapping("/deletebykey") - public ResponseResult deletebyprimarykey(Integer id){ - if(id == null) - return ResponseResult.error("传入值为空！"); - estimateTaskService.deleteByPrimaryKey(id); - return new ResponseResult("Success"); - } - - @PostMapping("/updateselect") - public ResponseResult updateselect(EstimateTask record){ - if(record == null){ - return ResponseResult.error("传入值为空！"); - } - estimateTaskService.updateByPrimaryKeySelective(record); - return new ResponseResult("Success"); - } - - @PostMapping("/search") - public PageDataResult CircuitSearch(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String keyword) { - - PageDataResult pdr = new PageDataResult(); - if (pageNum == null || pageNum == 0) { - pageNum = 1; - } - if (pageSize == null || pageSize == 0) - pageSize = 10; - - pdr.setTotals(estimateTaskService.findByKeyWord(keyword).size()); - PageHelper.startPage(pageNum, pageSize); - pdr.setList(estimateTaskService.findByKeyWord(keyword)); - return pdr; - } - - @PostMapping("/gettask") - public PageDataResult getUserTask(){ - BaseAdminUser adminUser = getCurrentUserId(); - String name = adminUser.getSysUserName(); - PageDataResult pdr = new PageDataResult(); - pdr.setTotals(estimateTaskService.countMineSubmit(name)); - pdr.setList(estimateTaskService.selectMySubmit(name)); - return pdr; - } - - @PostMapping("/accepttask") - public ResponseResult acceptDemand(Integer id,String status){ - EstimateTask estimateTask = estimateTaskService.selectByPrimaryKey(id); - estimateTask.setStatus(status); - estimateTaskService.updateByPrimaryKeySelective(estimateTask); - return new ResponseResult("done"); - } - - - @PostMapping("/rejectproduct") - public ResponseResult rejectDemand(Integer id,String status){ - EstimateTask estimateTask = estimateTaskService.selectByPrimaryKey(id); - estimateTask.setStatus(status); - estimateTaskService.updateByPrimaryKeySelective(estimateTask); - return new ResponseResult("done"); - } - - /** - * 目录/文件上传 - * @param file 目录，文件 - * @return 返回提交结果 - * */ - @ApiOperation(value = "文件上传") - @RequestMapping(value = "/uploadFile", method = RequestMethod.POST) - @ApiImplicitParams({ - @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "用户id", paramType = "body", dataType = "Integer"), - }) - public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile[] file, String userid) { -// String filepath = "/root/upLoad"; - String upCachePath=myPath+"_user"+userid; - String filepath = upCachePath; - String result = FileUtil.uploadFile(file, filepath); - if (!result.contains("上传失败")) - return ResponseResult.success(result); - return ResponseResult.error(result); - - } - - - /** - * 文件上传缓冲区清空 - * @return 返回文件清空结果 - * */ - @ApiOperation(value = "清空历史上传") - @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST) - @ApiImplicitParam(name = "userId", value = "当前用户id") - public ResponseResult clearUploadFile(String userId) { - String upCachePath=myPath+"_user"+userId; - FileUtil.deleteDir(upCachePath); - File file = new File(upCachePath); - if (!file.exists()) { - return ResponseResult.success("历史上传清空成功"); - } - return ResponseResult.error("历史上传清空失败"); - } - - /** - * 多个任务通过 - * @return 返回执行结果 - * **/ - @ApiOperation(value = "批量审批通过") - @PostMapping("/accept") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请的记录id", dataType = "Map", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "当前操作的用户id", dataType = "Map", defaultValue = "") - }) - public ResponseResult acceptMany(@RequestBody Map map){ - List ids = new ArrayList<>(); - ids = (List) map.get("ids"); - EstimateTask estimateTask = new EstimateTask(); - String staus = "审批通过"; - Integer userId = (Integer)map.get("userid"); - String userName = null; - if((adminUserService.getUserById(userId))!=null){ - userName = adminUserService.getUserById(userId).getSysUserName(); - } - int sum = 0; - for (int i = 0; i < ids.size(); i++){ - Integer id = ids.get(i); - estimateTask = estimateTaskService.selectByPrimaryKey(id); - estimateTask.setStatus(staus); - Date apptime = new Date(); - estimateTask.setApprover(userName); - estimateTask.setApprovtime(apptime); - if(estimateTaskService.updateByPrimaryKeySelective(estimateTask)>0){ - sum = sum + 1; - } - } - if (sum == ids.size()) - return ResponseResult.success("已通过"); - return ResponseResult.error("失败"); - } - - /** - * 多个任务拒绝 - * @return 返回执行结果 - * **/ - @ApiOperation(value = "批量审批拒绝") - @PostMapping("/refuse") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请的记录id", dataType = "Map", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "当前操作的用户id", dataType = "Map", defaultValue = "") - }) - public ResponseResult rejectMany(@RequestBody Map map){ - List ids = new ArrayList<>(); - ids = (List) map.get("ids"); - EstimateTask estimateTask = new EstimateTask(); - String staus = "审批拒绝"; - Integer userId = (Integer)map.get("userid"); - String userName = null; - if((adminUserService.getUserById(userId))!=null){ - userName = adminUserService.getUserById(userId).getSysUserName(); - } - int sum = 0; - for (int i = 0; i < ids.size(); i++){ - Integer id = ids.get(i); - estimateTask = estimateTaskService.selectByPrimaryKey(id); - estimateTask.setStatus(staus); - Date apptime = new Date(); - estimateTask.setApprover(userName); - estimateTask.setApprovtime(apptime); - if(estimateTaskService.updateByPrimaryKeySelective(estimateTask)>0){ - sum = sum + 1; - } - } - if (sum == ids.size()) - return ResponseResult.success("已拒绝！"); - return ResponseResult.error("失败"); - } - - /** - * 下载功能 - * @return 下载后的文件名 - * **/ - @ApiOperation(value = "下载") - @GetMapping("/download") - @ApiImplicitParam(name = "id", value = "需求的记录id", dataType = "Integer", defaultValue = "") - public String download(Integer id, HttpServletRequest request, HttpServletResponse response) throws Exception{ - EstimateTask estimateTask = estimateTaskService.selectByPrimaryKey(id); - String path = estimateTask.getTaskPath(); - String zipPath = FileUtil.downloadAllAttachment(path,request,response); - String filename = zipPath.substring(zipPath.lastIndexOf(File.separator)+1,zipPath.length()); - FileUtil.downloadFile(response,filename,zipPath); - FileUtil.deleteDir(zipPath); - return filename; - } - - /* - *获取所有的服务名 - * @return List - */ - @ApiOperation(value="获取所有的服务名") - @PostMapping("/getservice") - public List getAllService(){ - String classify = "服务"; - List getnames = estimateTaskService.allservice(classify); - return getnames; - } - - @ApiOperation(value = "获取所有的分类") - @PostMapping("/getclassify") - public List getAllclassify(){ - List results = new ArrayList<>(); - results.add("全部分类"); - List getclassify = estimateTaskService.alltaskclassify(); - for (int i = 0;i listMap = JSONObject.parseArray(jsonStr, HashMap.class); -// -// return ResponseResult.success(listMap); -// } catch (IOException e) { -// e.printStackTrace(); -// return ResponseResult.error("获取失败"); -// } - String dir ="src/main/resources/config/ServiceAll.json" ; - - try { - File file = new File(dir); - if (!file.exists()) { - file.createNewFile(); - } - String str= FileUtils.readFileToString(file, "UTF-8"); - List maps= (List) JSONArray.fromObject(str); - return ResponseResult.success(maps); - } catch (IOException e) { - e.printStackTrace(); - return ResponseResult.error("解析失败！"); - } - } -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java b/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java deleted file mode 100644 index 39372bd7eb6041f1e2d39b61a6106446947258a5..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.Organization; -import com.cetc32.dh.service.OrganizationService; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/organization/") -public class OrganizationController extends BaseController{ - @Autowired - OrganizationService organizationService; - - @RequestMapping("/options") - public PageDataResult organizationAll(){ - PageDataResult pdr = new PageDataResult(); - pdr.setTotals(organizationService.countOrganization()); - pdr.setList(organizationService.findAll()); - return pdr; - } - - @RequestMapping("/insertselect") - public ResponseResult insertselect(Organization organization){ - if(organization == null){ - return ResponseResult.error("传入值为空！"); - } - if(organizationService.insertSelectie(organization)>0){ - return new ResponseResult("Success"); - } - return ResponseResult.error("wrong"); - } - - @RequestMapping("/selectbylimit") - public PageDataResult selectbylimit(@RequestParam("pageSize") Integer pagesize, @RequestParam("pageNum") Integer pagenum){ - PageDataResult pdr = new PageDataResult(); - if(pagenum == null || pagenum == 0){ - pagenum =1; - } - if (pagesize == null || pagesize == 0) - pagesize = 10; - pdr.setList(organizationService.selectByLimit((pagenum - 1) * pagesize, pagesize)); - pdr.setTotals(organizationService.countOrganization()); - return pdr; - } - - @RequestMapping("/selectbykey") - public ResponseResult selsectbykey(Integer id){ - if(id == null){ - return ResponseResult.error("id为空！"); - } - ResponseResult pdr = new ResponseResult(); - pdr.setObj(this.organizationService.selectByPrimaryKey(id)); - return pdr; - } - - @RequestMapping("/deletebykey") - public ResponseResult deletebyprimarykey(Integer id){ - if(id == null) - return ResponseResult.error("传入值为空！"); - organizationService.deleteByPrimaryKey(id); - return new ResponseResult("Success"); - } - - @RequestMapping("/updateselect") - public ResponseResult updateselect(Organization record){ - if(record == null){ - return ResponseResult.error("传入值为空！"); - } - organizationService.updateByPrimaryKeySelective(record); - return new ResponseResult("Success"); - } - - @RequestMapping("/search") - public PageDataResult CircuitSearch(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String keyword) { - - PageDataResult pdr = new PageDataResult(); - if (pageNum == null || pageNum == 0) { - pageNum = 1; - } - if (pageSize == null || pageSize == 0) - pageSize = 10; - - pdr.setTotals(organizationService.findByKeyWord(keyword).size()); - PageHelper.startPage(pageNum, pageSize); - pdr.setList(organizationService.findByKeyWord(keyword)); - return pdr; - } -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java deleted file mode 100644 index c2c8bc7b00cc2e2a72affdded590a2542d79c5f8..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ /dev/null @@ -1,278 +0,0 @@ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.beans.DataCollected; -import com.cetc32.dh.beans.ReqSubmit; -import com.cetc32.dh.beans.TraceUpload; -import com.cetc32.dh.common.response.ResponseData; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.common.utils.JWTUtil; -import com.cetc32.dh.entity.*; -import com.cetc32.dh.service.*; -import com.cetc32.dh.service.AdminUserService; - -import io.swagger.annotations.ApiOperation; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.IOException; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; -import java.util.UUID; - -@RestController -@RequestMapping("/rest") -public class OtherInterfaceController extends BaseController{ - - @Autowired - DataFileService dataFileService; - - @Autowired - DemandSubmitService demandSubmitServiceImppl; - - @Autowired - ProductdemandService productdemandService; - - @Autowired - EstimateTaskService estimateTaskService; - - @Autowired - DataTraceService dataTraceService; - - @Autowired - DataPlpService dataPlpService; - - @Autowired - AdminUserService adminUserService; - - @Value("${upLoadPath}") - String upLoadPath; - - @ApiOperation(value = "生产业务需求上报") - @PostMapping("/req/submit") - public ResponseData reqSubmit(ReqSubmit req) - { - DemandSubmit submit=new DemandSubmit(); - submit.setProjectName(req.getProject()); - submit.setArea(req.getArea()); - submit.setDepartmentid(req.getDepartment()); - submit.setDemandDes(req.getDescription()); - submit.setEndtime(req.getDuedate()); - submit.setDemandName(req.getName()); - submit.setReporter(req.getUsername()); - submit.setDemandAttachment(null); - Date create = new Date(); - submit.setCreattime(create); - MultipartFile file=req.getFile(); - - if(!file.isEmpty()) - { - String upCachePath=upLoadPath+"_req_submit_"+req.getUsername(); - String randomStr = UUID.randomUUID().toString(); - String oldFileName = file.getOriginalFilename(); - String newFileName = randomStr + oldFileName.substring(oldFileName.lastIndexOf(".")); - File nfile = new File(upCachePath,newFileName); - if(!nfile.getParentFile().exists()){ - nfile.getParentFile().mkdirs(); - } - try { - file.transferTo(nfile); - submit.setDemandAttachment(nfile.getAbsolutePath()); - } catch (IOException e) { - return ResponseData.error("上报失败"); - } - } - if(demandSubmitServiceImppl.insertSelective(submit)>0) - { - return ResponseData.success("上报成功"); - } - return ResponseData.error("上报失败"); - } - - @ApiOperation(value = "生产任务状态反馈") - @PostMapping("/callback/product") - public ResponseData callbackProduct(@RequestBody Map req, String token) - { - if(JWTUtil.verify(token)) - { - if(JWTUtil.getExpire(token)*1000>System.currentTimeMillis()) - { -// if()TODO redis校验？ - try { - - Integer taskid=req.get("taskid")==null?null:Integer.parseInt(req.get("taskid")) ; - String status=req.get("status"); - if(taskid!=null && status!=null) - { - Productdemand submit=productdemandService.selectByPrimaryKey(taskid); - if(submit!=null) - { - submit.setStatus(status); - if(productdemandService.updateByPrimaryKeySelective(submit)>0) - { - return ResponseData.success("状态反馈成功"); - } - else - { - return ResponseData.error("插入失败！"); - } - }else - { - return ResponseData.error("taskid不存在！"); - } - } - else - { - return ResponseData.error("taskid 和 status不能为空！"); - } - } - catch (NumberFormatException ex) { - return ResponseData.error("状态反馈失败！"); - } - } - } - return ResponseData.error("token认证失败"); - } - @ApiOperation(value = "评估任务状态反馈") - @PostMapping("/callback/evaluation") - public ResponseData callbackEvaluation(@RequestBody Map req, String token) - { - if(JWTUtil.verify(token)) - { - if(JWTUtil.getExpire(token)*1000>System.currentTimeMillis()) - { -// if()TODO redis校验？ - try { - - Integer taskid=req.get("taskid")==null?null:Integer.parseInt(req.get("taskid")) ; - String status=req.get("status"); - if(taskid!=null && status!=null) - { - EstimateTask submit=estimateTaskService.selectByPrimaryKey(taskid); - if(submit!=null) - { - submit.setStatus(status); - if(estimateTaskService.updateByPrimaryKeySelective(submit)>0) - { - return ResponseData.success("状态反馈成功"); - } - else - { - return ResponseData.error("插入失败！"); - } - }else - { - return ResponseData.error("taskid不存在！"); - } - } - else - { - return ResponseData.error("taskid 和 status不能为空！"); - } - } - catch (NumberFormatException ex) { - return ResponseData.error("状态反馈失败！"); - } - } - } - return ResponseData.error("token认证失败"); - } - - @ApiOperation(value = "数据获取",notes = "数据获取获取指定时间空间数据") - @GetMapping(value = "/export/ploygon") - public ResponseData DataPloygon(@RequestBody Map map) { - SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd" ); - Date startTime; - Date endTime; - try { - startTime=map.get("starttime")==null?null:sdf.parse((String)map.get("starttime")); - endTime=map.get("endtime")==null?null:sdf.parse((String)map.get("endtime")); - } catch (ParseException e) { - - return ResponseData.error("日期格式有误（允许格式为：yyyy-MM-dd）"); - } - String polygon=map.get("polygon")==null?null:(String) map.get("polygon"); - if(polygon==null) - { - return ResponseData.error("缺少参数 polygon "); - } - return ResponseData.success(dataPlpService.selectPloygon(startTime,endTime,polygon)); - } - - - - - @PostMapping("/import/trajectory") - public ResponseResult DataTrajectory(@RequestBody TraceUpload trace) { - DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - DataTrace dt =new DataTrace(); - dt.setFileSize(trace.getSize()); - try { - dt.setEndTime(format.parse(trace.getEndtime())); - dt.setStartTime(format.parse(trace.getStarttime())); - } catch (ParseException e) { - return ResponseResult.error(" starttime 或 endtime有误！"); - } - - dt.setFilePath(trace.getPath()); - dt.setFileConfig(trace.getTitle()); - if(dataTraceService.insertOne(dt)>0) - { - return ResponseResult.success("上报成功！"); - } - return ResponseResult.error("上报失败！"); - - } - - @ApiOperation(value = "成果数据上报") - @PostMapping("/import/gain") - public ResponseData DataGain(@RequestBody DataFile dataFile) { - if(dataFileService.insertGain(dataFile)>0) - { - return ResponseData.success(); - } - return ResponseData.error("上报失败！"); - - } - - - @ApiOperation(value = "采集数据上报") - @PostMapping("/import/collection") - public ResponseData DataCollection(@RequestBody DataCollected data) { - if(data.getEventtype()==null) - { - String p=data.getPoints().toUpperCase(); - if(p.startsWith("POINT")) - { - data.setEventtype("POINT".toLowerCase()); - } - if(p.startsWith("LINESTRING")) - { - data.setEventtype("LINESTRING".toLowerCase()); - } - if(p.startsWith("POLYGON")) - { - data.setEventtype("POLYGON".toLowerCase()); - } - } - if((adminUserService.getUserById(data.getUserid()))!=null){ - data.setSubmitor(adminUserService.getUserById(data.getUserid()).getSysUserName()); - } - - if(dataPlpService.insertCollected(data)>0) - { - return ResponseData.success(); - } - return ResponseData.error("上报失败！"); - - } - - - -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java b/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java deleted file mode 100644 index 07e58f7e837bff762c1716d03bb69f1a39448683..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java +++ /dev/null @@ -1,528 +0,0 @@ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.dto.EditJsonDTO; -import com.cetc32.dh.dto.EstimateDTO; -import com.cetc32.dh.dto.GetData; -import com.cetc32.dh.dto.ProductDTO; -import com.cetc32.dh.entity.*; -import com.cetc32.dh.service.AdminUserService; -import com.cetc32.dh.service.ProductdemandService; -import com.cetc32.dh.utils.FileUtil; -import com.github.pagehelper.PageHelper; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import net.sf.json.JSONArray; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import com.alibaba.fastjson.JSONObject; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; - - -/** - * 生产任务管理类 - * @author: hubin - * @version: 1.0 - * @date: 2020/11/30 - * 备注:无 - */ -@RestController -@RequestMapping("/productdemand") -public class ProductDemandController extends BaseController { - @Autowired - ProductdemandService productdemandService; - @Autowired - AdminUserService adminUserService; - - @Value("${myPath}") - String myPath; - - @Value("${flowPath}") - String flowPath; - - /** - *展示所有评估任务 - * @return PageDateResult - */ - @ApiOperation(value = "展示所有生产任务") - @ApiImplicitParams({ - @ApiImplicitParam(name="classify", value="生产任务分类",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="name",value="生产任务名称",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="astatus",value="审批状态",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="page",value = "页码",dataType = "Integer",defaultValue = "0"), - @ApiImplicitParam(name="result",value = "每页数据条数",dataType = "Integer",defaultValue = "10"), - }) - @PostMapping("/options") - public PageDataResult productsubmitAll(@RequestBody vProduct vProduct,@RequestParam(defaultValue = "0",required = false) Integer page, @RequestParam(defaultValue = "10",required = false) Integer results) { - if(StringUtils.isBlank(vProduct.classify)&&StringUtils.isBlank(vProduct.name)&&StringUtils.isBlank(vProduct.astatus)&&StringUtils.isBlank(vProduct.creator)){ - List productdemands = productdemandService.findAll(); - Integer count = productdemandService.countProduct(); - return new PageDataResult(count,productdemands,page * results); - }else { - if(StringUtils.isNotBlank(vProduct.getName())) - vProduct.setName("%"+vProduct.getName()+"%"); - List productdemands = productdemandService.queryFilesByObj(vProduct); - Integer count = productdemandService.queryFilesByObj(vProduct).size(); - return new PageDataResult(count,productdemands,page * results); - } - } - - /** - * 新增生产任务 - * - * @param productDTO - * @return ResponseResult - */ - @ApiOperation(value = "新增生产任务") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name = "name", value = "任务名称", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "demandClassify", value = "生产任务类型", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "demandyear", value = "生产数据年份", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "taskdocument", value = "生产任务附件路径", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "starttimefront", value = "前端传过来的任务开始时间", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "endtimefront", value = "前端传过来的任务结束时间", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "status", value = "状态", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "approver", value = "审批人", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "demandid", value = "对应的需求id", paramType = "body", dataType = "Integer", defaultValue = ""), - @ApiImplicitParam(name = "creator", value = "任务创建人", paramType = "body", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name = "fronttime",value = "前端传来的时间数组",paramType = "body" ,dataType = "List",defaultValue = ""), - @ApiImplicitParam(name="creattime",value = "创建时间",paramType = "body",dataType = "Timestamp",defaultValue = ""), - @ApiImplicitParam(name = "approvtime",value = "时间",paramType = "body" ,dataType = "Timestamp",defaultValue = ""), - @ApiImplicitParam(name="useid",value = "对应的用户id",paramType = "body",dataType = "Integer",defaultValue = ""), - @ApiImplicitParam(name="flow",value = "流程编排对应的json",paramType = "body",dataType = "JsonObject",defaultValue = ""), - }) - @PostMapping("/insertselect") - public ResponseResult insertselect(@RequestBody ProductDTO productDTO) throws IOException{ - Productdemand productdemand = new Productdemand(); - BeanUtils.copyProperties(productDTO,productdemand); - Integer userid = productDTO.getUserid(); - List regions = productDTO.getTaskdocuments(); - String region = String.join(",",regions); - productdemand.setTaskdocument(region); - JSONObject json = productDTO.getFlow(); - if (StringUtils.isBlank(productdemand.getName())) { - return ResponseResult.error("传入值为空！"); - } - List handletime = productdemand.getFronttime(); - String starttime1 = handletime.get(0); - String endtime1 = handletime.get(1); - String demandfront = productDTO.getDemanddata(); - DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); - Date startdate = new Date(); - Date enddate = new Date(); - Date demandy = new Date(); - try { - startdate = format1.parse(starttime1); - enddate = format1.parse(endtime1); - demandy = format1.parse(demandfront); - } catch (ParseException e) { - e.printStackTrace(); - } - String uuid = UUID.randomUUID().toString().replaceAll("-",""); - String filename=uuid+".json"; - try { - FileUtil.wirteText(json.toJSONString(),flowPath+ filename); - } - catch (RuntimeException ex) - { - ex.printStackTrace(); - return ResponseResult.error("File Write Error"); - } - productdemand.setFlowresult(flowPath+filename); - productdemand.setStarttime(startdate); - productdemand.setEndtime(enddate); - productdemand.setDemandyear(demandy); - String upCachePath = myPath + "_user" + userid; - BaseAdminUser adminUser = getCurrentUserId(); - String userName =null; - if((adminUserService.getUserById(userid))!=null){ - userName = adminUserService.getUserById(userid).getSysUserName(); - } - productdemand.setCreator(userName); - String status = "未审批"; - Date d = new Date(); - String timestamp = String.valueOf(d.getTime()); - String path = myPath + "admin" + timestamp; - productdemand.setStatus(status); - Date creat= new Date(); - productdemand.setCreattime(creat); -// if (FileUtil.copyFolder(upCachePath, path)) { -// FileUtil.deleteDir(upCachePath); -// } else { -// return ResponseResult.error("upload fail"); -// } -// productdemand.setTaskdocument(path); - if (productdemandService.insertSelective(productdemand) > 0) { - return new ResponseResult("创建成功！"); - } - ; - return ResponseResult.error("wrong"); - } - - /** - * 选择指定偏移量的生产任务 - * - * @param pagesize - * @param pagenum - * @return PageDataResult - */ - @PostMapping("/selectbylimit") - public PageDataResult selectbylimit(@RequestParam("pageSize") Integer pagesize, @RequestParam("pageNum") Integer pagenum) { - PageDataResult pdr = new PageDataResult(); - if (pagenum == null || pagenum == 0) { - pagenum = 1; - } - if (pagesize == null || pagesize == 0) - pagesize = 10; - pdr.setList(productdemandService.selectByLimit((pagenum - 1) * pagesize, pagesize)); - pdr.setTotals(productdemandService.countProduct()); - return pdr; - } - - /** - * 选择指定索引的生产任务 - * - * @param id - * @return ResponseResult - */ - @PostMapping("/selectbykey") - public ResponseResult selsectbykey(Integer id) { - if (id == null) { - return ResponseResult.error("id为空！"); - } - ResponseResult pdr = new ResponseResult(); - pdr.setObj(this.productdemandService.selectByPrimaryKey(id)); - return pdr; - } - - /** - * 删除指定的生产任务 - * - * @param id - * @return ResponseResult - */ - @PostMapping("/deletebykey") - public ResponseResult deletebyprimarykey(Integer id) { - if (id == null) - return ResponseResult.error("传入值为空！"); - productdemandService.deleteByPrimaryKey(id); - return new ResponseResult("Success"); - } - - /** - * 更新指定的生产任务 - * - * @param productdemand - * @return ResponseResult - */ - @PostMapping("/updateselect") - public ResponseResult updateselect(Productdemand productdemand) { - if (productdemand == null) { - return ResponseResult.error("传入值为空！"); - } - productdemandService.updateByPrimaryKeySelective(productdemand); - return new ResponseResult("Success"); - } - - /** - * 模糊查询 - * - * @param pageNum - * @param pageSize - * @param keyword - * @return PageDataResult - */ - @PostMapping("/search") - public PageDataResult CircuitSearch(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String keyword) { - - PageDataResult pdr = new PageDataResult(); - if (pageNum == null || pageNum == 0) { - pageNum = 1; - } - if (pageSize == null || pageSize == 0) - pageSize = 10; - - pdr.setTotals(productdemandService.findByKeyWord(keyword).size()); - PageHelper.startPage(pageNum, pageSize); - pdr.setList(productdemandService.findByKeyWord(keyword)); - return pdr; - } - - /** - * 获取当前用户下的所有生产任务 - * - * @return PageDataResult - */ - @PostMapping("/getproduct") - public PageDataResult getUserproduct() { - BaseAdminUser adminUser = getCurrentUserId(); - String name = adminUser.getSysUserName(); - PageDataResult pdr = new PageDataResult(); - pdr.setTotals(productdemandService.countMineSubmit(name)); - pdr.setList(productdemandService.selectMySubmit(name)); - return pdr; - } - - /** - * 单个生产任务通过 - * - * @param id - * @param status - * @return - */ - @PostMapping("/acceptproduct") - public ResponseResult acceptDemand(Integer id, String status) { - Productdemand productdemand = productdemandService.selectByPrimaryKey(id); - productdemand.setStatus(status); - productdemandService.updateByPrimaryKeySelective(productdemand); - return new ResponseResult("done"); - } - - - /** - * 单个生产任务拒绝 - * - * @param id - * @param status - * @return - */ - @PostMapping("/rejectproduct") - public ResponseResult rejectDemand(Integer id, String status) { - Productdemand productdemand = productdemandService.selectByPrimaryKey(id); - productdemand.setStatus(status); - productdemandService.updateByPrimaryKeySelective(productdemand); - return new ResponseResult("done"); - } - - - /** - * 目录/文件上传 - * - * @param file 目录，文件 - * @return 返回提交结果 - */ - @ApiOperation(value = "文件上传") - @RequestMapping(value = "/uploadFile", method = RequestMethod.POST) - @ApiImplicitParams({ - @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "用户id", paramType = "body", dataType = "Integer"), - }) - public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile[] file, String userid) { -// String filepath = "/root/upLoad"; - String upCachePath = myPath + "_user" + userid; - String filepath = upCachePath; - String result = FileUtil.uploadFile(file, filepath); - if (!result.contains("上传失败")) - return ResponseResult.success(result); - return ResponseResult.error(result); - - } - - - /** - * 文件上传缓冲区清空 - * - * @return 返回文件清空结果 - */ - @ApiOperation(value = "清空历史上传") - @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST) - @ApiImplicitParam(name = "userId", value = "当前用户id") - public ResponseResult clearUploadFile(String userId) { - String upCachePath = myPath + "_user" + userId; - FileUtil.deleteDir(upCachePath); - File file = new File(upCachePath); - if (!file.exists()) { - return ResponseResult.success("历史上传清空成功"); - } - return ResponseResult.error("历史上传清空失败"); - } - - - /** - * 多个任务通过 - * - * @return 返回执行结果 - **/ - @ApiOperation(value = "批量审批通过") - @PostMapping("/accept") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请的记录id", dataType = "Map", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "当前操作的用户id", dataType = "Map", defaultValue = "") - }) - public ResponseResult acceptMany(@RequestBody Map map) { - List ids = new ArrayList<>(); - ids = (List) map.get("ids"); - Productdemand productdemand = new Productdemand(); - String staus = "审批通过"; - Integer userId = (Integer)map.get("userid"); - String userName = null; - if((adminUserService.getUserById(userId))!=null){ - userName = adminUserService.getUserById(userId).getSysUserName(); - } - int sum = 0; - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - productdemand = productdemandService.selectByPrimaryKey(id); - Date apptime = new Date(); - productdemand.setApprover(userName); - productdemand.setApprovtime(apptime); - productdemand.setStatus(staus); - if (productdemandService.updateByPrimaryKeySelective(productdemand) > 0) { - sum = sum + 1; - } - } - if (sum == ids.size()) - return ResponseResult.success("已通过"); - return ResponseResult.error("失败"); - } - - - /** - * 多个任务拒绝 - * - * @return 返回执行结果 - **/ - @ApiOperation(value = "批量审批拒绝") - @PostMapping("/refuse") - @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "申请的记录id", dataType = "Map", defaultValue = ""), - @ApiImplicitParam(name = "userid", value = "当前操作的用户id", dataType = "Map", defaultValue = "") - }) - public ResponseResult rejectMany(@RequestBody Map map) { - List ids = new ArrayList<>(); - ids = (List) map.get("ids"); - Productdemand productdemand = new Productdemand(); - String staus = "审批未通过"; - Integer userId = (Integer)map.get("userid"); - String userName = null; - if((adminUserService.getUserById(userId))!=null){ - userName = adminUserService.getUserById(userId).getSysUserName(); - } - int sum = 0; - for (int i = 0; i < ids.size(); i++) { - Integer id = ids.get(i); - productdemand = productdemandService.selectByPrimaryKey(id); - Date apptime = new Date(); - productdemand.setApprover(userName); - productdemand.setApprovtime(apptime); - productdemand.setStatus(staus); - if (productdemandService.updateByPrimaryKeySelective(productdemand) > 0) { - sum = sum + 1; - } - } - if (sum == ids.size()) - return ResponseResult.success("已拒绝！"); - return ResponseResult.error("失败"); - } - - /** - * 下载功能 - * @return 下载后的文件名 - * **/ - @ApiOperation(value = "下载") - @GetMapping("/download") - @ApiImplicitParam(name = "id", value = "需求的记录id", dataType = "Integer", defaultValue = "") - public String download(Integer id, HttpServletRequest request, HttpServletResponse response) throws Exception{ - Productdemand productdemand = productdemandService.selectByPrimaryKey(id); - String path = productdemand.getTaskdocument(); - String zipPath = FileUtil.downloadAllAttachment(path,request,response); - String filename = zipPath.substring(zipPath.lastIndexOf(File.separator)+1,zipPath.length()); - FileUtil.downloadFile(response,filename,zipPath); - FileUtil.deleteDir(zipPath); - return filename; - } - - /** - *新建接口 - * @return PageDateResult - */ - @ApiOperation(value = "封装数据") - @PostMapping("/packagedata") - @ApiImplicitParam(name = "data" , value = "传递的数据" ,dataType = "String" ,defaultValue = "") - public ResponseResult packageData(String data){ - Map map = new HashMap<>(); - return ResponseResult.success(map); - } - - /** - *新建接口 - * @return PageDateResult - */ - @ApiOperation(value = "获取数据") - @PostMapping("/getData") - @ApiImplicitParam(name = "data" , value = "传递的数据" ,dataType = "String" ,defaultValue = "") - public ResponseResult getData(@RequestBody List data){ - Map map = new HashMap<>(); - map = productdemandService.PackageData(data); - return ResponseResult.success(map); - } - - /** - * 获取编排的Json - * @return ResponseResult - */ - @ApiOperation(value = "获取Json" ) - @PostMapping("/getJson") - @ApiImplicitParam(name = "id" ,value = "传递的id" ,dataType = "Integer" ,defaultValue = "") - public ResponseResult getJson(@RequestBody Map did) throws IOException{ - Integer id=(Integer)did.get("id"); - Productdemand pro = productdemandService.selectByPrimaryKey(id); - String dir =pro.getFlowresult() ; - String fileContent = FileUtil.readText(dir).replaceAll("=",":"); - JSONObject json = JSONObject.parseObject(fileContent); - ResponseResult pdr = new ResponseResult(); - pdr.setObj(json); - return pdr; - } - - /** - * 更新编排的Json - * @return ResponseResult - */ - @ApiOperation(value = "编辑Json" ) - @PostMapping("/editJson") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id" ,value = "传递的id" ,dataType = "Integer" ,defaultValue = ""), - @ApiImplicitParam(name = "editOne" ,value = "传递的新Json" ,dataType = "JsonObjecr" ,defaultValue = "") - }) - public ResponseResult editJson(@RequestBody EditJsonDTO editJsonDTO) throws IOException{ - Integer id = editJsonDTO.getId(); - Productdemand pro = productdemandService.selectByPrimaryKey(id); - String dir =pro.getFlowresult() ; - FileUtil.deleteDir(dir); - JSONObject json =editJsonDTO.getEditOne() ; - - String uuid = UUID.randomUUID().toString().replaceAll("-",""); - String filename=uuid+".json"; - try { - FileUtil.wirteText(json.toJSONString(),flowPath+ filename); - } - catch (RuntimeException ex) - { - ex.printStackTrace(); - return ResponseResult.error("File Write Error"); - } - pro.setFlowresult(flowPath+filename); - if(productdemandService.updateByPrimaryKeySelective(pro)>0){ - return new ResponseResult("编辑更新成功！"); - } - return ResponseResult.error("wrong"); - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/controller/rest/SearchOptionsController.java b/src/main/java/com/cetc32/dh/controller/rest/SearchOptionsController.java deleted file mode 100644 index e1a871a4cd2349580a6bea7e982dd31fe215aab7..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/rest/SearchOptionsController.java +++ /dev/null @@ -1,386 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - - -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.Options; -import com.cetc32.dh.service.DataFileService; -import com.cetc32.dh.service.OptionsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import java.util.*; - -/** - * 数据管理文件目录视图类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@Api(value = "Data File Info") -@Slf4j -@RestController -@RequestMapping("/rest/file/") -public class SearchOptionsController { - - - @Autowired - public OptionsService optionsService; - @Autowired - public DataFileService dataFileService; - - /** - * 查询数据库中所有的审批 - * - * @return List - */ - @ApiOperation(value = "查询所有文件年份", notes = "不需要传参数") - @PostMapping("/AllYear") - public ResponseResult distinctAllYear() { - List optionsList = optionsService.selectByCategory("file_time"); - List hashMapList = new ArrayList<>(); - Map hashmap = new HashMap<>(); - hashmap.put("value", "全部文件年份"); - hashmap.put("label", "全部文件年份"); - hashMapList.add(hashmap); - for (int i = 0; i < optionsList.size(); i++) { - Map hashmap2 = new HashMap<>(); - hashmap2.put("value", optionsList.get(i).getValue()); - hashmap2.put("label", optionsList.get(i).getValueName()); - hashMapList.add(hashmap2); - } - return ResponseResult.success(hashMapList); - } - - - /** - * 查询数据库中所有的审批 - * - * @return List - */ - @ApiOperation(value = "查询审批状态", notes = "不需要传参数") - @PostMapping("/Allstatus") - public ResponseResult optStatus() { - List optionsList = optionsService.selectByCategory("status"); - List hashMapList = new ArrayList<>(); - Map hashmap = new HashMap<>(); - hashmap.put("value", "全部审批状态"); - hashmap.put("label", "审批"); - hashMapList.add(hashmap); - for (int i = 0; i < optionsList.size(); i++) { - Map hashmap2 = new HashMap<>(); - hashmap2.put("value", optionsList.get(i).getValue()); - hashmap2.put("label", optionsList.get(i).getValueName()); - hashMapList.add(hashmap2); - } - return ResponseResult.success(hashMapList); - } - - - /** - * 查询options中所有的不同区域 - * - * @return List - */ - @ApiOperation(value = "查询所有区域", notes = "不需要传参数") - @PostMapping("/AllRegion") - - public ResponseResult distinctAllRegion() { - List optionsList = optionsService.selectByCategory("region"); - List hashMapList = new ArrayList<>(); - Map hashmap = new HashMap<>(); - hashmap.put("value", "全部区域"); - hashmap.put("label", "全部区域"); - hashMapList.add(hashmap); - for (int i = 0; i < optionsList.size(); i++) { - Map hashmap2 = new HashMap<>(); - hashmap2.put("value", optionsList.get(i).getValue()); - hashmap2.put("label", optionsList.get(i).getValueName()); - hashMapList.add(hashmap2); - } - Map hashmap3 = new HashMap<>(); - hashmap3.put("value", "其他"); - hashmap3.put("label", "其他"); - hashMapList.add(hashmap3); - - return ResponseResult.success(hashMapList); - } - - - - /** - * 查询数据库中所有的不同文件类型 - * - * @return List - */ - @ApiOperation(value = "查询文件类型", notes = "不需要传参数") - @PostMapping("/AllFtype") - public ResponseResult optFType() { - List optionsList = optionsService.selectByCategory("file_type"); - List hashMapList = new ArrayList<>(); - Map hashmap = new HashMap<>(); - hashmap.put("value", "全部类型"); - hashmap.put("label", "全部类型"); - hashMapList.add(hashmap); - for (int i = 0; i < optionsList.size(); i++) { - Map hashmap2 = new HashMap<>(); - hashmap2.put("value", optionsList.get(i).getValue()); - hashmap2.put("label", optionsList.get(i).getValueName()); - hashMapList.add(hashmap2); - } - return ResponseResult.success(hashMapList); - } - - - - -/** - * - *提示： 待保留代码部分 - * 作者：肖小霞 - - @ApiImplicitParams({ - @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"), - }) - @PostMapping("/downloadFiles") public ResponseResult downloadFiles(@RequestBody String fileIds) { - // Long fileId=15L; - // List multipartFileList = new ArrayList(); - String clientIp = ""; - HttpServletRequest request = null; - try { - request = - ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest(); - } catch (Exception e) { - System.out.println("Can not get current IP."); - } - clientIp = request.getRemoteAddr().toString(); - System.out.println(clientIp); - String savePath = clientIp + "/root/downLoad"; - System.out.println(savePath); - List results = new ArrayList<>(); - Long fileId = Long.parseLong(fileIds); - String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName(); - System.out.println(fileName); - String res = FileUtil.downloadFile(fileName, savePath); - results.add(res); - - - return ResponseResult.success(results); - } - - - @ApiImplicitParams({ - @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "String"), - }) - @RequestMapping("/downloadOneFile") public String downloadAlone(String fileIds, HttpServletResponse response) { - Long fileId = Long.parseLong(fileIds); - String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName(); - File file = new File(fileName); - System.out.println(fileName); - if (!file.exists()) { - System.out.println("文件 :" + File.separator + dataFileService.queryById(fileId).getFileName() + "不存在!"); - } - - response.setHeader("Content-Type","application/octet-stream"); - //设置下载的文件的名称-该方式已解决中文乱码问题 - try { - response.setHeader("Content-Disposition","attachment;filename=" + new String( dataFileService.queryById(fileId).getFileName().getBytes("gb2312"), "ISO8859-1" )); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - byte[] buffer = new byte[1024]; - FileInputStream fis = null; - BufferedInputStream bis = null; - try { - fis = new FileInputStream(file); - bis = new BufferedInputStream(fis); - OutputStream os = response.getOutputStream(); - int i = bis.read(buffer); - while (i != -1) { - os.write(buffer, 0, i); - i = bis.read(buffer); - } - System.out.println("Download successfully!"); - return dataFileService.queryById(fileId).getFileName() + "下载成功！"; - - } catch (Exception e) { - System.out.println("Download failed!"); - return dataFileService.queryById(fileId).getFileName() + "下载失败！"; - - } finally { - if (bis != null) { - try { - bis.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (fis != null) { - try { - fis.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - - - - // 查询数据库中所有的不同年份 - - @ApiOperation(value = "查询所有年份", notes = "不需要传参数") - @PostMapping("/AllYear") - //@RequestMapping(value="/AllYear",method = RequestMethod.POST) - public ResponseResult distinctAllYear() { - List vfileMenuList = vfileMenuService.distinctAllYear(); - List yearList = new ArrayList(); - for (int i = 0; i < vfileMenuList.size(); i++) { - yearList.add(vfileMenuList.get(i).getFileYear()); - } - Collections.sort(yearList); - Collections.reverse(yearList); - List resultList = new ArrayList(); - resultList.add("全部年份"); - for (int i = 0; i < yearList.size(); i++) { - resultList.add(yearList.get(i).toString()); - } - - return ResponseResult.success(resultList); - } - - - // 查询数据库中所有的不同区域 - - @ApiOperation(value = "查询所有区域", notes = "不需要传参数") - @PostMapping("/AllRegion") public ResponseResult distinctAllRegion() { - List vfileMenuList = vfileMenuService.distinctAllRegion(); - List regionList = new ArrayList(); - - for (int i = 0; i < vfileMenuList.size(); i++) { - regionList.add(vfileMenuList.get(i).getRegion()); - } - Collections.sort(regionList); - - List resultList = new ArrayList(); - resultList.add("全部区域"); - for (int i = 0; i < regionList.size(); i++) { - resultList.add(regionList.get(i)); - } - return ResponseResult.success(resultList); - } - **/ - - -/** - * - * 文件下载代码 - - public String downloadMulFile2(String[] fileIds,HttpServletResponse response) { - - if(fileIds.length==1){ - Long fileId =Long.parseLong(fileIds[0]); - String fileName= dataFileService.queryById(fileId).getFileName(); - String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName(); - FileUtil.downloadFile(response,fileName,filePath); - } - - String message= null; - String directory = "/root/load"; - File directoryFile = new File(directory); - if (!directoryFile.isDirectory() && !directoryFile.exists()) { - directoryFile.mkdirs(); - } - //设置最终输出zip文件的目录+文件名 - String zipFileName = "已下载文件" + ".zip"; - String strZipPath = directory + "/" + zipFileName; - File zipFile = new File(strZipPath); - //读取需要压缩的文件 - Long fileId =null; - String fileName=null; - - List fileNames = new ArrayList<>(); - for(int i=0;i list =new ArrayList<>(); + list.add(sysInfo); + sysInfoService.insertOrUpdate(list); + /*String[] ps = formSysInfo.getPermission().split("S"); + List list =new ArrayList<>(); + for(String p: ps){ + if(StringUtils.isBlank(p)) + continue; + list.add(new SysInfo("S"+p,formSysInfo.getSysname(),formSysInfo.getSysurl())); + }*/ + //sysInfoService.insertOrUpdate(list); + logger.debug(formSysInfo.getSysurl()); + logger.debug(formSysInfo.getSysname()); + logger.debug(formSysInfo.getPermission()); + return ResponseData.success(); + + } + @LoginSkipped + @GetMapping("/tree") + public ResponseData sysInfoTree2(){ + List sysInfos = sysInfoService.selectAll(); + HashSet data = new HashSet<>(); + for(SysInfo sys : sysInfos){ + HashSet nodes =new HashSet<>(); + String[] ps = sys.getpCode().split("S"); + for(String s : ps){ + if(StringUtils.isBlank(s)) + continue; + nodes.add(new TreeData(s.substring(3),"S"+s,"S"+s)); + } + TreeData root =new TreeData(nodes, + sys.getSysName(), + sys.getSysCode(), + sys.getSysCode()); + data.add(root); + } + TreeData broot= new TreeData(data,"全部","000","000"); + List ret = new ArrayList<>(); + ret.add(broot); + return ResponseData.success(ret); + } + @Deprecated + /* @LoginSkipped + @GetMapping("/tree")*/ + public ResponseData sysInfoTree(){ + List sysInfos = sysInfoService.selectAll(); + List data = new ArrayList<>(); + for(SysInfo sys : sysInfos){ + TreeData root =new TreeData(Sets.newHashSet( + new TreeData(sys.getpCode().substring(4),sys.getpCode(),sys.getpCode())), + sys.getSysName(), + sys.getSysCode(), + sys.getSysCode()); + //root.addChildren(); + if(data.size()>0){ + TreeData parent = null; + for(TreeData leaf:data){ + parent = leaf.getParentOf(root); + if(null != parent){ + break; + } + } + if(null != parent){ + parent.addChildren(root); + }else + data.add(root); + }else { + data.add(root); + } + } + return ResponseData.success(data); + } + + /*** + * 应用访问统计次数接口 + * 传入参数为系统code形如S001 ，S002 ，S003等 + * @param sysCode 系统编码 + * ***/ + @PostMapping("/access") + public ResponseData statisticUserAccess(@RequestBody Map map){ // + String sysCode = (String) map.get("sysCode"); + if(StringUtils.isBlank(sysCode)){ + return ResponseData.error("无效的系统代码"); + } + sysInfoService.updateUserAccessCount(sysCode); + return ResponseData.success(); + } + + /*** + * 当前用户的常用6个应用 + * ***/ + @GetMapping("/top6") + public ResponseData mytop6app(){ + List userVisits = new ArrayList<>(); + List result = sysInfoService.selectMyHotAppTop6(); + //前六个应用的图标icons + String[] icons ={"barcode","radar-chart","database","profile","layout","deployment-unit"}; + if(null != result && result.size() >= 6){ + for(int i=0;i<6;i++){ + result.get(i).setIcon(icons[i]); + } + return ResponseData.success(result); + } + if(null != result) + userVisits.addAll(result); + /*** + * 此处需要根据用户角色对应权限信息选择对应的App + * **/ + //To Do + + List list = sysInfoService.selectAllMyApps(null,null,null); + for(SysInfo s :list){ + if( !userVisits.contains(s)){ //此处使用containsy因为重写了BaseSysInfos的hashCode根equals方法 + userVisits.add(s); + if(userVisits.size()>=6) + break; + } + } + for(int i=0;i<6;i++){ + userVisits.get(i).setIcon(icons[i]); + } + //To Do End + return ResponseData.success(userVisits); + } + /*** + * 当前用户的可用应用 + * ***/ + @GetMapping("/app/all") + public PageDataResult myAllapp(Integer limit,Integer page,String keyWord){ + if (page == null || page <= 0) { + page = 1; + } + if (limit == null || limit <= 0) + limit = 10; + int offset = (page - 1) * limit; + //To Do End + keyWord=StringUtils.trim(keyWord); + + return new PageDataResult(sysInfoService.countAllMyApps(keyWord),sysInfoService.selectAllMyApps(limit,offset,keyWord),offset); +// return ResponseData.success(sysInfoService.countAllMyApps(keyWord),sysInfoService.selectAllMyApps(limit,offset,keyWord)); + } + /*** + * 当前用户的常用应用个数 + * ***/ + @GetMapping("/app/total") + public ResponseData myAllappCount(String keyWord){ + //To Do End + return ResponseData.success(sysInfoService.countAllMyApps(keyWord)); + } + /*** + * 当前用户的应用热度 + * ***/ + @GetMapping("/hot") + public ResponseData mytHotApps(){ + List result = sysInfoService.selectMyHotApp(); + if(null != result) + return ResponseData.success(result); + return ResponseData.error("没有热度App相关记录"); + } + + /*** + * 当前所有应用累计访问次数 + * ***/ + @GetMapping("/access/count") + public ResponseData appAccessCount(){ + return ResponseData.success(sysInfoService.countAllAppAccess()); + } + /*** + * 当前用户7日访问次数 + * ***/ + @GetMapping("/access/7days") + public ResponseData access7days(){ + return ResponseData.success(sysInfoService.selectLatest7Days()); + } + + + @Autowired + public void setSysInfoService(SysInfoService sysInfoService) { + this.sysInfoService = sysInfoService; + } +} diff --git a/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java b/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java new file mode 100644 index 0000000000000000000000000000000000000000..3d1890680c0cbed05c44ca96d374130f9aa38813 --- /dev/null +++ b/src/main/java/com/cetc32/dh/controller/rest/UserAuditController.java @@ -0,0 +1,370 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description：用户信息统计接口 + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/4/9 上午11:05 + ******************************************************************************/ +package com.cetc32.dh.controller.rest; + +import com.cetc32.dh.beans.ResultUserRole; +import com.cetc32.dh.beans.StatisticBean; +import com.cetc32.dh.common.response.ResponseData; +import com.cetc32.dh.entity.BaseAdminUser; +import com.cetc32.dh.service.ActiveUserService; +import com.cetc32.dh.service.AdminUserService; +import com.cetc32.webutil.common.annotations.LoginRequired; +import com.cetc32.webutil.common.annotations.LoginSkipped; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.cetc32.dh.entity.Department; +import com.cetc32.dh.service.AdminRoleService; +import com.cetc32.dh.service.DepartmentService; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Random; +@LoginRequired +@RestController +@RequestMapping("/rest/audit/user") +public class UserAuditController { + AdminUserService adminUserService; + ActiveUserService activeUserService; + AdminRoleService adminRoleService; + DepartmentService departmentService; + + + /*** + * @Description 统计WEB 端用户在线数量，统计策略登陆时间大于登出时间或者只有登陆时间 + * 且登陆时间在2小时内认为该用户在线 + * @return 反回总用户数 + * **/ + @GetMapping("/online") + public ResponseData onlineCount(){ + long totalUser = adminUserService.countUserByCondition(null); + return ResponseData.success(100); + } + + /*** + * @Description 统计当前用户总数 正常状态的用户总数，不包括已删除的和待审核的用户数 + * @return 反回总用户数 + * **/ + @GetMapping("/total") + public ResponseData total(){ + //long totalUser = + BaseAdminUser baseAdminUser = new BaseAdminUser(); + baseAdminUser.setUserStatus(1); + return ResponseData.success(adminUserService.countUserByCondition(baseAdminUser)); + } + + /*** + * @Description 统计当前总访问量 + * @return 反回总用户数 + * **/ + @GetMapping("/access") + public ResponseData accesstotal(){ + //long totalUser = + return ResponseData.success(adminUserService.countUserByCondition(null)); + } + + /*** + * @Description 统计当前未曾审批用户数 + * @return 反回总用户数 + * **/ + @GetMapping("/approve") + public ResponseData approve(){ + //long totalUser = + BaseAdminUser baseAdminUser = new BaseAdminUser(); + baseAdminUser.setUserStatus(-1); + return ResponseData.success(adminUserService.countUserByCondition(baseAdminUser)); + } + /** + * @Description 统计原理基于连续登陆失败3次认为是异常账号 + * @return 返回访问异常人员数量 + * **/ + @GetMapping("/risk") + public ResponseData risk(){ + //long totalUser = + BaseAdminUser baseAdminUser = new BaseAdminUser(); + baseAdminUser.setUserStatus(-1); + return ResponseData.success(adminUserService.countUserByCondition(baseAdminUser)); + } + + + /** + * @Description 统计每类角色的用户数 没有使用泛化查询 + * @return 返回每类角色的用户数 + * **/ + //@GetMapping("/roleusernumOld") + @Deprecated + public ResponseData roleUserNumOld(){ + HashMap hashMap_user = new HashMap<>(); + ArrayList list = new ArrayList(); + int roid_int; + List baseAdminUserList = adminUserService.getAllUserList(); + List resultUserRoleList =adminRoleService.getRoleList(); + for (BaseAdminUser baseAdminUser:baseAdminUserList) { + if (baseAdminUser.getRoleId() == null) { + if (!hashMap_user.containsKey(null)) { + hashMap_user.put(null, 1); + } else { + hashMap_user.put(null, hashMap_user.get(null) + 1); + } + continue; + } + String[] roleList = baseAdminUser.getRoleId().split(","); + for (String roleId : roleList) { + try{ + roid_int=Integer.parseInt(roleId); + }catch (Exception e){ + e.printStackTrace(); + continue; + } + if (!hashMap_user.containsKey(roid_int)) { + hashMap_user.put(roid_int, 1); + } else { + hashMap_user.put(roid_int, hashMap_user.get(roid_int )+ 1); + } + } + } + + + for (ResultUserRole resultUserRole:resultUserRoleList) { + HashMap hashMap_role = new HashMap<>(); + hashMap_role.put("id",resultUserRole.getId()); + hashMap_role.put("name",resultUserRole.getRoleName()); + if(hashMap_user.containsKey(resultUserRole.getId())){ + hashMap_role.put("value",hashMap_user.get(resultUserRole.getId())); + }else { + hashMap_role.put("value",0); + } + list.add(hashMap_role); + } + HashMap hashMap_role = new HashMap<>(); + hashMap_role.put("id",null); + hashMap_role.put("name","其他角色"); + hashMap_role.put("value",hashMap_user.get(null)); + list.add(hashMap_role); + return ResponseData.success(list); + } + + + /** + * @Description 统计每个部门的用户数 没有使用泛化查询 + * @return 返回每个部门的用户数 + * **/ + //@GetMapping("/departUserNumOld") + @Deprecated + public ResponseData departUserNumOld(){ + HashMap hashMap_user = new HashMap<>(); + ArrayList list = new ArrayList(); + int departid_int; + List baseAdminUserList = adminUserService.getAllUserList(); + List departmentList =departmentService.getDepartmentList(); + + for (BaseAdminUser baseAdminUser:baseAdminUserList) { + if (baseAdminUser.getDepartment() == null) { + if (!hashMap_user.containsKey(null)) { + hashMap_user.put(null, 1); + } else { + hashMap_user.put(null, hashMap_user.get(null) + 1); + } + continue; + } + String[] departments = baseAdminUser.getDepartment().split(","); + for (String department : departments) { + try{ + departid_int=Integer.parseInt(department); + }catch (Exception e){ + e.printStackTrace(); + continue; + } + if (!hashMap_user.containsKey(departid_int)) { + hashMap_user.put(departid_int, 1); + } else { + hashMap_user.put(departid_int, hashMap_user.get(departid_int) + 1); + } + } + } + + for (Department department:departmentList) { + HashMap hashMap_role = new HashMap<>(); + hashMap_role.put("id",department.getId()); + hashMap_role.put("name",department.getName()); + if(hashMap_user.containsKey(department.getId())){ + hashMap_role.put("value",hashMap_user.get(department.getId())); + }else { + hashMap_role.put("value",0); + } + list.add(hashMap_role); + } + HashMap hashMap_department = new HashMap<>(); + hashMap_department.put("id",null); + hashMap_department.put("name","其他部门"); + hashMap_department.put("value",hashMap_user.get(null)); + list.add(hashMap_department); + return ResponseData.success(list); + } + + /** + * @Description 统计每类角色的用户数 + * @return 返回每类角色的用户数 + * **/ + //@GetMapping("/roleusernum") + public ResponseData roleUserNum(){ + int num; + BaseAdminUser baseAdminUser =new BaseAdminUser(); + ArrayList list = new ArrayList(); + List resultUserRoleList =adminRoleService.getRoleList(); + for (ResultUserRole resultUserRole:resultUserRoleList) { + HashMap hashMap_role = new HashMap<>(); + hashMap_role.put("id",resultUserRole.getId()); + hashMap_role.put("name",resultUserRole.getRoleName()); + baseAdminUser.setRoleId(resultUserRole.getId()); + num=adminUserService.countUserByCondition(baseAdminUser); + hashMap_role.put("value",num); + list.add(hashMap_role); + } + return ResponseData.success(list); + } + /** + * @Description 统计每类角色的用户数 + * @return 返回每类角色的用户数 + * **/ + @GetMapping("/roleusernum") + public ResponseData cntUserByRole(){ + List list = adminRoleService.countByRole(); + return ResponseData.success(list); + } + + /** + * @Description 统计每类角色的用户数 + * @return 返回每类角色的用户数 + * **/ + //@GetMapping("/departUsernum") + public ResponseData departUserNum(){ + int num; + BaseAdminUser baseAdminUser =new BaseAdminUser(); + ArrayList list = new ArrayList(); + List departmentList =departmentService.getDepartmentList(); + for (Department department:departmentList) { + HashMap hashMap_depart = new HashMap<>(); + hashMap_depart.put("id",department.getId()); + hashMap_depart.put("name",department.getName()); + baseAdminUser.setDepartment(department.getId()); + num=adminUserService.countUserByCondition(baseAdminUser); + hashMap_depart.put("value",num); + list.add(hashMap_depart); + } + return ResponseData.success(list); + } + /** + * @Description 统计每类角色的用户数 + * @return 返回每类角色的用户数 + * @Athor xuwenyuan + * @Date 2021.05.25 + * **/ + @GetMapping("/departUsernum") + //@GetMapping("/cnt/department") + public ResponseData cntDepartment(){ + List list = departmentService.countByDeparment(); + return ResponseData.success(list); + } + + /** + * @Description 统计当前在线人数 + * @return 返回在线人员数量 + * **/ + @GetMapping("/onlinesum") + public ResponseData onlinesum(){ + + int count = adminUserService.getLoginUser(); + return ResponseData.success(count); + } + + + /** + * @Description 统计累计登陆次数 + * @return 返回int + * **/ + @GetMapping("/logincount") + public ResponseData logincount(){ + + int webCount = adminUserService.getWebLoginCount(); + int appCount = adminUserService.getAppLoginCount(); + int all = webCount+appCount; + + return ResponseData.success(all); + } + + + /** + * @Description 统计登陆失败人数 + * @return 返回int + * **/ + @GetMapping("/loginfailedcount") + public ResponseData loginfailedcount(){ + return ResponseData.success(adminUserService.failedCount()); + } + + /** + * 实现策略，针对当天分时间，当前时间小时向下却整数之前的，直接重ActiveUserService中获取，之后的实时从BaseAdminUser中获取 + * 7天15天30天的策略相同 + * @Descripton 统计近n天活跃用户 + * @Return 查询到的统计信息 + * **/ + @GetMapping("/active") + public ResponseData activeUser(Integer n){ +// List ids = new ArrayList<>(); +// n = (Integer) map.get("ids"); + if(n==null ||n<=0){ + return ResponseData.fail("无效的请求参数"); + } + switch(n){ + case 1:{ + return ResponseData.success(activeUserService.listActiveUser(23, "HOUR")); + } + case 7: case 15: case 30: default:{ + return ResponseData.success(activeUserService.listActiveUser(n-1, "DAY")); + } + } + } + + @GetMapping("/applogin") + public ResponseData applogin(){ + return ResponseData.success(adminUserService.getAppLoginUser()); + } + + @Autowired + public void setAdminUserService(AdminUserService adminUserService) { + this.adminUserService = adminUserService; + } + + @Autowired + public void setActiveUserService(ActiveUserService activeUserService) { + this.activeUserService = activeUserService; + } + + @Autowired + public void setAdminRoleService(AdminRoleService adminRoleService) { + this.adminRoleService = adminRoleService; + } + + @Autowired + public void setDepartmentService(DepartmentService departmentService) { + this.departmentService = departmentService; + } + + /** + * @Description 统计生产作业人员人数 + * 假接口待补充 + * @return ResponseData + * **/ + @GetMapping("/productuser") + public ResponseData productuser(){ + return ResponseData.success((new Random()).nextInt(50)); + } +} diff --git a/src/main/java/com/cetc32/dh/controller/system/PermissionController.java b/src/main/java/com/cetc32/dh/controller/system/PermissionController.java deleted file mode 100644 index 4539239738e18173ac0917b7f9f8da9bff81b339..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/system/PermissionController.java +++ /dev/null @@ -1,154 +0,0 @@ -/** - * @Description: 权限管理 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.controller.system; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.service.AdminPermissionService; -import org.apache.shiro.SecurityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Title: PermissionController - * @Description: 权限管理 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/29 18:16 - */ -@Controller -@RequestMapping("permission") -public class PermissionController { - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private AdminPermissionService permissionService; - - /** - * 功能描述: 跳到权限管理 - * @return: String - * @auther: youqing - * @date: 2018/11/30 9:22 - */ - @RequestMapping("permissionManage") - public String permissionManage() { - logger.info("进入权限管理"); - return "/permission/permissionManage"; - } - - /** - * 功能描述: 获取权限菜单列表 - * @param pageNum - * @param pageSize - * @return: PageDataResult - * @auther: youqing - * @date: 2018/11/30 10:30 - */ - @PostMapping("permissionList") - @ResponseBody - public PageDataResult permissionList(@RequestParam("pageNum") Integer pageNum, - @RequestParam("pageSize") Integer pageSize){ - logger.info("获取权限菜单列表"); - PageDataResult pdr = new PageDataResult(); - try { - if(null == pageNum) { - pageNum = 1; - } - if(null == pageSize) { - pageSize = 10; - } - // 获取服务类目列表 - pdr = permissionService.getPermissionList(pageNum ,pageSize); - logger.info("权限菜单列表查询=pdr:" + pdr); - - } catch (Exception e) { - e.printStackTrace(); - logger.error("权限菜单列表查询异常！", e); - } - return pdr; - } - - /** - * 功能描述: 获取根权限菜单列表 - * @return: List - * @auther: youqing - * @date: 2018/11/30 11:35 - */ - @GetMapping("parentPermissionList") - @ResponseBody - public List parentPermissionList(){ - logger.info("获取根权限菜单列表"); - return permissionService.parentPermissionList(); - } - - /** - * 功能描述:设置权限[新增或更新] - * @param permission - * @return: Map - * @auther: youqing - * @date: 2018/11/30 9:42 - */ - @PostMapping("setPermission") - @ResponseBody - public Map setPermission(BaseAdminPermission permission) { - logger.info("设置权限[新增或更新]！permission:" + permission); - Map data = new HashMap(); - if(permission.getId() == null){ - //新增权限 - data = permissionService.addPermission(permission); - }else{ - //修改权限 - data = permissionService.updatePermission(permission); - } - return data; - } - - /** - * 功能描述: 删除权限菜单 - * @param id - * @return: Map - * @auther: youqing - * @date: 2018/11/30 12:02 - */ - @PostMapping("del") - @ResponseBody - public Map del(@RequestParam("id") Long id) { - logger.info("删除权限菜单！id:" + id); - Map data = new HashMap<>(); - //删除服务类目类型 - data = permissionService.del(id); - return data; - } - - /** - * 功能描述: 获取登陆用户的权限 - * @return: Map - * @auther: youqing - * @date: 2018/12/4 9:48 - */ - @GetMapping("getUserPerms") - @ResponseBody - public Map getUserPerms(){ - logger.info("获取登陆用户的权限"); - Map data = new HashMap<>(); - BaseAdminUser user = (BaseAdminUser) SecurityUtils.getSubject().getPrincipal(); - data = permissionService.getUserPerms(user); - return data; - } - -} diff --git a/src/main/java/com/cetc32/dh/controller/system/RoleController.java b/src/main/java/com/cetc32/dh/controller/system/RoleController.java deleted file mode 100644 index 84a41d450a92e61fcb2077486977f60dc202a992..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/system/RoleController.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * @Description: 角色管理 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.controller.system; - -import com.cetc32.dh.service.AdminRoleService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Title: RoleController - * @Description: 角色管理 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/21 13:43 - */ -@Controller -@RequestMapping("role") -public class RoleController { - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private AdminRoleService adminRoleService; - - /** - * 跳转到角色管理 - * @return String - */ - @RequestMapping("/roleManage") - public String toPage() { - logger.info("进入角色管理"); - return "/role/roleManage"; - } - -// /** -// * 功能描述: 获取角色列表 -// * @param pageNum -// * @param pageSize -// * @return: PageDataResult -// * @auther: youqing -// * @date: 2018/11/21 14:29 -// */ -// @RequestMapping(value = "/getRoleList", method = RequestMethod.GET) -// @ResponseBody -// public PageDataResult getRoleList(@RequestParam("pageNum") Integer pageNum, -// @RequestParam("pageSize") Integer pageSize) { -// logger.info("获取角色列表"); -// PageDataResult pdr = new PageDataResult(); -// try { -// if(null == pageNum) { -// pageNum = 1; -// } -// if(null == pageSize) { -// pageSize = 10; -// } -// // 获取角色列表 -// pdr = adminRoleService.getRoleList(pageNum ,pageSize); -// logger.info("角色列表查询=pdr:" + pdr); -// -// } catch (Exception e) { -// e.printStackTrace(); -// logger.error("角色列表查询异常！", e); -// } -// return pdr; -// } -// -// /** -// * 功能描述: 获取角色列表 -// * @return: List -// * @auther: youqing -// * @date: 2018/12/3 13:22 -// */ -// @GetMapping("getRoles") -// @ResponseBody -// public List getRoles(){ -// logger.info("获取角色列表"); -// return adminRoleService.getRoles(); -// } -// -// /** -// *述: 设置角色[新增或更新] -// * @param role -// * @return: Map -// * @auther: youqing -// * @date: 2018/12/3 10:54 -// */ -// @PostMapping("setRole") -// @ResponseBody -// public Map setRole(BaseAdminRole role) { -// logger.info("设置角色[新增或更新]！role:" + role); -// Map data = new HashMap(); -// if(role.getId() == null){ -// //新增角色 -// data = adminRoleService.addRole(role); -// }else{ -// //修改角色 -// data = adminRoleService.updateRole(role); -// } -// return data; -// } -// -// -// /** -// * 功能描述: 删除/恢复角色 -// * @param id -// * @param status -// * @return: Map -// * @auther: youqing -// * @date: 2018/11/21 16:00 -// */ -// @PostMapping("updateRoleStatus") -// @ResponseBody -// public Map updateRoleStatus(@RequestParam("id") int id, @RequestParam("status") Integer status) { -// logger.info("删除/恢复角色！id:" + id+" status:"+status); -// Map data = new HashMap<>(); -// if(status == 0){ -// //删除角色 -// data = adminRoleService.delRole(id,status); -// }else{ -// //恢复角色 -// data = adminRoleService.recoverRole(id,status); -// } -// return data; -// } - -} diff --git a/src/main/java/com/cetc32/dh/controller/system/UserController.java b/src/main/java/com/cetc32/dh/controller/system/UserController.java deleted file mode 100644 index 70069fe6468f17318faa219dbd2cf639bb4a4c56..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/controller/system/UserController.java +++ /dev/null @@ -1,272 +0,0 @@ -/** - * @Description: 用户控制 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.controller.system; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.dto.LoginDTO; -import com.cetc32.dh.dto.UserSearchDTO; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.service.AdminUserService; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.DisabledAccountException; -import org.apache.shiro.authc.UnknownAccountException; -import org.apache.shiro.authc.UsernamePasswordToken; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.subject.Subject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import java.util.HashMap; -import java.util.Map; - -/** - * @Title: UserController - * @Description: 系统用户管理 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/20 15:17 - */ -@Controller -@RequestMapping("user") -public class UserController { - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private AdminUserService adminUserService; - - /** - * 功能描述: 登入系统 - * @param request - * @param loginDTO - * @param session - * @return:Map - * @auther: youqing - * @date: 2018/11/22 15:47 - */ - @RequestMapping("/login") - @ResponseBody - public Map login(HttpServletRequest request, LoginDTO loginDTO, HttpSession session){ - logger.info("进行登陆"); - Map data = new HashMap(); - // 使用 shiro 进行登录 - Subject subject = SecurityUtils.getSubject(); - String userName = loginDTO.getUsername().trim(); - String password = loginDTO.getPassword().trim(); - String rememberMe = loginDTO.getRememberMe(); - String host = request.getRemoteAddr(); - - //获取token - UsernamePasswordToken token = new UsernamePasswordToken(userName, password,host); - - // 设置 remenmberMe 的功能 - if (rememberMe != null && rememberMe.equals("on")) { - token.setRememberMe(true); - } - - try { - subject.login(token); - // 登录成功 - BaseAdminUser user = (BaseAdminUser) subject.getPrincipal(); - - session.setAttribute("user", user.getSysUserName()); - String tokens = request.getParameter("token"); - data.put("code",1); -// data.put("url","/view/experiment/list"); - //data.put("url","/desktop"); - data.put("message","登陆成功"); - data.put("token",token); - data.put("tokens",tokens); -// data.put("subject",subject); -// data.put("session",session); - logger.info(user.getSysUserName()+"登陆成功"); - } catch (UnknownAccountException e) { - data.put("code",0); - data.put("message",userName+"账号不存在"); - logger.error(userName+"账号不存在"); - return data; - }catch (DisabledAccountException e){ - data.put("code",0); - data.put("message",userName+"账号异常"); - logger.error(userName+"账号异常"); - return data; - } - catch (AuthenticationException e){ - data.put("code",0); - data.put("message",userName+"密码错误"); - logger.error(userName+"密码错误"); - return data; - } - - return data; - } - - /** - * 功能描述: 修改密码 - * @param pwd - * @param isPwd - * @return:Map - * @auther: youqing - * @date: 2018/11/22 17:26 - */ - @RequestMapping("setPwd") - @ResponseBody - public Map setP(String pwd, String isPwd){ - logger.info("进行密码重置"); - Map data = new HashMap(); - if(!pwd.equals(isPwd)){ - data.put("code",0); - data.put("message","两次输入的密码不一致!"); - logger.error("两次输入的密码不一致!"); - return data; - } - //获取当前登陆的用户信息 - BaseAdminUser user = (BaseAdminUser) SecurityUtils.getSubject().getPrincipal(); - int result = adminUserService.updatePwd(user.getSysUserName(),pwd); - if(result == 0){ - data.put("code",0); - data.put("msg","修改密码失败！"); - logger.error("用户修改密码失败！"); - return data; - } - data.put("code",1); - data.put("msg","修改密码成功！"); - logger.info("用户修改密码成功！"); - return data; - } - - /** - * 功能描述: 跳到系统用户列表 - * @return:String - * @auther: youqing - * @date: 2018/11/21 13:50 - */ - @RequestMapping("/userManage") - public String userManage() { - return "/user/userManage"; - } - - /** - * 功能描述: 分页查询用户列表 - * @param pageNum - * @param pageSize - * @param userSearch - * @return:PageDataResult - * @auther: youqing - * @date: 2018/11/21 11:10 - */ - @RequestMapping(value = "/getUserList", method = RequestMethod.POST) - @ResponseBody - public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum, - @RequestParam("pageSize") Integer pageSize,/*@Valid PageRequest page,*/ UserSearchDTO userSearch) { - /*logger.info("分页查询用户列表！搜索条件：userSearch：" + userSearch + ",pageNum:" + page.getPageNum() - + ",每页记录数量pageSize:" + page.getPageSize());*/ - PageDataResult pdr = new PageDataResult(); - try { - if(null == pageNum) { - pageNum = 1; - } - if(null == pageSize) { - pageSize = 10; - } - // 获取用户列表 - pdr = adminUserService.getUserList(userSearch, pageNum ,pageSize); - logger.info("用户列表查询=pdr:" + pdr); - - } catch (Exception e) { - e.printStackTrace(); - logger.error("用户列表查询异常！", e); - } - return pdr; - } - - /** - * 功能描述: 新增和更新系统用户 - * @param user - * @return:Map - * @auther: youqing - * @date: 2018/11/22 10:14 - */ - @RequestMapping(value = "/setUser", method = RequestMethod.POST) - @ResponseBody - public Map setUser(BaseAdminUser user) { - logger.info("设置用户[新增或更新]！user:" + user); - Map data = new HashMap(); - if(user.getId() == null){ - data = adminUserService.addUser(user); - }else{ - data = adminUserService.updateUser(user); - } - return data; - } - - - /** - * 功能描述: 删除/恢复 用户 - * @param id - * @param status - * @return:Map - * @auther: youqing - * @date: 2018/11/22 11:59 - */ - @RequestMapping(value = "/updateUserStatus", method = RequestMethod.POST) - @ResponseBody - public int updateUserStatus(@RequestParam("id") Integer id, @RequestParam("status") Integer status) { - logger.info("删除/恢复用户！id:" + id+" status:"+status); - int data=0; - if(status == 0){ - //删除用户 - data = adminUserService.delUser(id,status); - } -// else{ -// //恢复用户 -//// data = adminUserService.recoverUser(id,status); -// } - return data; - } - - /** - * 功能描述: 根据权限查询用户列表 - * @param pageNum - * @param pageSize - * @param roleId - * @return:PageDataResult - * @auther: hubin - * @date: 2020/10/23 - */ - @RequestMapping(value = "/getUserRole", method = RequestMethod.POST) - @ResponseBody - public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum, - @RequestParam("pageSize") Integer pageSize,Integer roleId){ - PageDataResult pdr = new PageDataResult(); - try { - if(null == pageNum) { - pageNum = 1; - } - if(null == pageSize) { - pageSize = 10; - } - // 获取用户列表 - pdr = adminUserService.getUserRole(roleId, pageNum ,pageSize); - logger.info("用户列表查询=pdr:" + pdr); - - } catch (Exception e) { - e.printStackTrace(); - logger.error("用户列表查询异常！", e); - } - return pdr; - } - -} diff --git a/src/main/java/com/cetc32/dh/controller/views/IndexController.java b/src/main/java/com/cetc32/dh/controller/views/IndexController.java index eccc17b3235e7b3e34fc7f3ca94a166bf46b8f21..948ea436f8eff98fb55a8eef75f600d63ab4d35f 100644 --- a/src/main/java/com/cetc32/dh/controller/views/IndexController.java +++ b/src/main/java/com/cetc32/dh/controller/views/IndexController.java @@ -1,23 +1,108 @@ package com.cetc32.dh.controller.views; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.subject.Subject; +import com.cetc32.dh.entity.BaseAdminUser; +import com.cetc32.dh.service.AdminUserService; +import com.cetc32.webutil.common.annotations.LoginSkipped; +import com.cetc32.webutil.common.util.CookieUtil; +import com.cetc32.webutil.common.util.JWTUtil; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +/** + * SSO认证中心登陆页面，注册页面视图控制器材 + * @author root + * 更新 2021.5.14 /logout，修复token失效后执行空指针异常问题 + * **/ @Controller +@LoginSkipped public class IndexController { - + @Autowired + AdminUserService adminUserService; + @Value("${eip}") + String eip="http://www.baidu.com/"; private Logger logger = LoggerFactory.getLogger(this.getClass()); - @RequestMapping("logout") - public String logout(){ - logger.info("退出系统"); - Subject subject = SecurityUtils.getSubject(); - subject.logout(); // shiro底层删除session的会话信息 - return "redirect:login"; + @RequestMapping({"/index","/"}) + public String index(String ReturnUrl, ModelMap map, HttpServletRequest req){ + if(ReturnUrl==null) + ReturnUrl=eip; + String token=CookieUtil.getCookieValue(req,"token",true); + ReturnUrl=getSimpleUrl(ReturnUrl); + if(StringUtils.isNotBlank(token) && (System.currentTimeMillis()/1000L)0 && end>0 && start0) + ReturnUrl = ReturnUrl.substring(0,start); + return ReturnUrl; + } + + @GetMapping({"/register","/new"}) + public String register(String ReturnUrl, ModelMap map, HttpServletRequest req){ + if(ReturnUrl==null) + ReturnUrl=eip; + System.out.println(ReturnUrl); + map.put("ReturnUrl", ReturnUrl); + map.put("originUrl", req.getRequestURL()); + return "register"; + } + @GetMapping({"/changepwd","/chpwd"}) + public String changepwd(String ReturnUrl, ModelMap map, HttpServletRequest req){ + if(ReturnUrl==null) + ReturnUrl=eip; + System.out.println(ReturnUrl); + map.put("ReturnUrl", ReturnUrl); + map.put("originUrl", req.getRequestURL()); + return "changepwd"; } } diff --git a/src/main/java/com/cetc32/dh/controller/views/OpenPageController.java b/src/main/java/com/cetc32/dh/controller/views/OpenPageController.java index 40e86a735e9df2d4b948c4e302af89b864df3dad..ee541db61a6e2f6dc0d2a2a492e0a61fdf07aab4 100644 --- a/src/main/java/com/cetc32/dh/controller/views/OpenPageController.java +++ b/src/main/java/com/cetc32/dh/controller/views/OpenPageController.java @@ -14,6 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; @RequestMapping("/open/") public class OpenPageController { @GetMapping String api(){ - return "api"; + return ""; } } diff --git a/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java b/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java index dcb354ea299183f3d0f26171b938b794e11483f8..83347ab261f2f77915d54b80f5899a8abae534e2 100644 --- a/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java +++ b/src/main/java/com/cetc32/dh/dto/AdminUserDTO.java @@ -16,7 +16,6 @@ import lombok.Data; /** * @Title: AdminUserDTO * @Description: - * @author: youqing * @version: 1.0 * @date: 2020/12/3 12:13 */ diff --git a/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java b/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java deleted file mode 100644 index 3110311bf215e56915779aa7a441f961282f504b..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java +++ /dev/null @@ -1,215 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ - -package com.cetc32.dh.dto; - -import java.io.Serializable; -import java.util.List; - -/** - * 数据管理编目节点扩展实体类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -public class DataMenuDTO implements Serializable { - - /** - * 名称 - */ - private String title; - - /** - * 键 - */ - private String key; - - /** - * 值 - */ - private String value; - - /** - * 前端页面url - */ - private String htmlUrl; - - /** - * 前端页面图形标识 - */ - private String icon; - - /** - * 编目是否可更改 - */ - private Boolean disabled; - - /** - * 是否可以添加子节点 - */ - private Boolean addkids; - - - /** - * 子编目节点 - */ - private List children; - - /** - * 无参构造函数 - */ - public DataMenuDTO() { - } - - /** - * 获取名称 - * - * @return title - 名称 - */ - public String getTitle() { - return title; - } - - /** - * 设置名称 - * - * @param title 名称 - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * 获取键 - * - * @return key - 键 - */ - public String getKey() { - return key; - } - - /** - * 设置键 - * - * @param key 键 - */ - public void setKey(String key) { - this.key = key; - } - - /** - * 获取值 - * - * @return value - 值 - */ - public String getValue() { - return value; - } - - /** - * 设置值 - * - * @return value - 值 - */ - public void setValue(String value) { - this.value = value; - } - - /** - * 获取前端页面url - * - * @return htmlUrl - 前端页面url - */ - public String getHtmlUrl() { - return htmlUrl; - } - - /** - * 设置前端页面url - * - * @param htmlUrl 前端页面url - */ - public void setHtmlUrl(String htmlUrl) { - this.htmlUrl = htmlUrl; - } - - /** - * 获取前端页面图形标识 - * - * @return icon - 前端页面图形标识 - */ - public String getIcon() { - return icon; - } - - /** - * 设置前端页面图形标识 - * - * @param icon 前端页面图形标识 - */ - public void setIcon(String icon) { - this.icon = icon; - } - - /** - * 获取编目子节点 - * - * @return - children - */ - public List getChildren() { - return children; - } - - /** - * 设置编目子节点 - * - * @param children - */ - public void setChildren(List children) { - this.children = children; - } - - /** - * 获取前端编目可更改信息 - * - * @return icon - 前端编目更改信息 - */ - public Boolean getDisabled() { - return disabled; - } - - /** - * 设置前端编目更改信息 - * - * @param disabled 前端页编目更改信息 - */ - public void setDisabled(Boolean disabled) { - this.disabled = disabled; - } - - /** - * 获取前端编目可更改信息 - * - * @return icon - 前端编目更改信息 - */ - public Boolean getAddkids() { - return addkids; - } - - /** - * 设置前端编目更改信息 - * - * @param addkids 前端页编目更改信息 - */ - public void setAddkids(Boolean addkids) { - this.addkids = addkids; - } - - -} diff --git a/src/main/java/com/cetc32/dh/dto/DemandDTO.java b/src/main/java/com/cetc32/dh/dto/DemandDTO.java deleted file mode 100644 index f578f025f8fbf82e7093d423bbb8532e7b5d6ab3..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/dto/DemandDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cetc32.dh.dto; - -import com.cetc32.dh.entity.DemandSubmit; - -public class DemandDTO extends DemandSubmit { - private String username; - - private Integer userid; - - public Integer getUserid() { - return userid; - } - - public void setUserid(Integer userid) { - this.userid = userid; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } -} diff --git a/src/main/java/com/cetc32/dh/dto/DemandSubmitDTO.java b/src/main/java/com/cetc32/dh/dto/DemandSubmitDTO.java deleted file mode 100644 index 1501711585a1673abcb4a40f496170ea799c7812..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/dto/DemandSubmitDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cetc32.dh.dto; - -import com.cetc32.dh.entity.NumberS; -import org.apache.commons.lang3.StringUtils; - -public class DemandSubmitDTO extends NumberS { - private Integer id; - - private String deamndName; - - private String demandStatus; - - public Integer getId() { - - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getDeamndName() { - return deamndName; - } - - public void setDeamndName(String deamndName) { - this.deamndName = deamndName; - } - - public String getDemandStatus() { - return demandStatus; - } - - public void setDemandStatus(String demandStatus) { - this.demandStatus = demandStatus; - } -} diff --git a/src/main/java/com/cetc32/dh/dto/EstimateDTO.java b/src/main/java/com/cetc32/dh/dto/EstimateDTO.java deleted file mode 100644 index 64b1301294f092c4d2a1f94e9ab06a398e2c24b5..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/dto/EstimateDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cetc32.dh.dto; - -import com.cetc32.dh.entity.EstimateTask; - -public class EstimateDTO extends EstimateTask { - private String username; - - private Integer userid; - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public Integer getUserid() { - return userid; - } - - public void setUserid(Integer userid) { - this.userid = userid; - } -} diff --git a/src/main/java/com/cetc32/dh/dto/LineBoth.java b/src/main/java/com/cetc32/dh/dto/LineBoth.java deleted file mode 100644 index 612288bb0540248f719dffc6acc1a2e2b8240220..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/dto/LineBoth.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cetc32.dh.dto; - -public class LineBoth { - String sourceNodeId; - String targetNodeId; - - public String getSourceNodeId() { - return sourceNodeId; - } - - public void setSourceNodeId(String sourceNodeId) { - this.sourceNodeId = sourceNodeId; - } - - public String getTargetNodeId() { - return targetNodeId; - } - - public void setTargetNodeId(String targetNodeId) { - this.targetNodeId = targetNodeId; - } -} diff --git a/src/main/java/com/cetc32/dh/dto/ProductDTO.java b/src/main/java/com/cetc32/dh/dto/ProductDTO.java deleted file mode 100644 index bb1413f1dc6051bb9cf84fbc4602c4583615ef33..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/dto/ProductDTO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.cetc32.dh.dto; - -import com.cetc32.dh.entity.Productdemand; -import com.alibaba.fastjson.JSONObject; -import springfox.documentation.spring.web.json.Json; - -import java.util.List; - -public class ProductDTO extends Productdemand { - private String username; - - private Integer userid; - - private List taskdocuments; - - public String demanddata; - - private JSONObject flow; - - public String getDemanddata() { - return demanddata; - } - - public void setDemanddata(String demanddata) { - this.demanddata = demanddata; - } - - public List getTaskdocuments() { - return taskdocuments; - } - - public void setTaskdocuments(List taskdocuments) { - this.taskdocuments = taskdocuments; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public Integer getUserid() { - return userid; - } - - public void setUserid(Integer userid) { - this.userid = userid; - } - - public JSONObject getFlow() { - return flow; - } - - public void setFlow(JSONObject flow) { - this.flow = flow; - } -} diff --git a/src/main/java/com/cetc32/dh/dto/TreeData.java b/src/main/java/com/cetc32/dh/dto/TreeData.java new file mode 100644 index 0000000000000000000000000000000000000000..cb261a87b06a41207e60b945f9cf3229e1fcc6fd --- /dev/null +++ b/src/main/java/com/cetc32/dh/dto/TreeData.java @@ -0,0 +1,217 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/13 下午2:04 + ******************************************************************************/ +package com.cetc32.dh.dto; + +import java.util.*; + +public class TreeData { + private Set children; + private String title; + private V value; + private K key; + + public TreeData(String title, V value, K key) { + this.title = title; + this.value = value; + this.key = key; + } + + public TreeData(Set children, String title, V value, K key) { + this.children = children; + this.title = title; + this.value = value; + this.key = key; + } + + public TreeData(){} + + public TreeData addChildren(TreeData children){ + if(isParentOf(children)){ + this.children.addAll(children.children); + } + return this; + } + public boolean isParentOf(TreeData node){ + if(node.key.equals(this.key)){ + return true; + } + return false; + } + + public boolean hasParentOf(TreeData node){ + return null == getParentOf(node)? false:true; + } + + public TreeData getParentOf(TreeData node){ + if(isParentOf(node)){ + return this; + }else { + if(null == this.children) + return null; + Iterator it = this.children.iterator(); + while(it.hasNext()){ + TreeData data = it.next(); + if(data.hasParentOf(node)){ + return data; + } + } + } + return null; + } + + public boolean hasChildren(TreeData node){ + /*if(isParent(node)){*/ + if(null == children || 0 == children.size()){ + return false; + } + if(isParentOf(node)){ + Iterator it = node.children.iterator(); + while(it.hasNext()){ + if(!this.children.contains(it.next())){ + return false; + } + } + return true; + }else{ + for(TreeData dto :children){ + if(dto.hasChildren(node)) + return true; + } + } + + /*}*/ + return false; + } + + public Set getChildren() { + return children; + } + + public void setChildren(Set children) { + this.children = children; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public V getValue() { + return value; + } + + public void setValue(V value) { + this.value = value; + } + + public K getKey() { + return key; + } + + public void setKey(K key) { + this.key = key; + } + + /** + * Returns a hash code value for the object. This method is + * supported for the benefit of hash tables such as those provided by + * {@link HashMap}. + *

+ * The general contract of {@code hashCode} is: + *

    + *
  • Whenever it is invoked on the same object more than once during + * an execution of a Java application, the {@code hashCode} method + * must consistently return the same integer, provided no information + * used in {@code equals} comparisons on the object is modified. + * This integer need not remain consistent from one execution of an + * application to another execution of the same application. + *
  • If two objects are equal according to the {@code equals(Object)} + * method, then calling the {@code hashCode} method on each of + * the two objects must produce the same integer result. + *
  • It is not required that if two objects are unequal + * according to the {@link Object#equals(Object)} + * method, then calling the {@code hashCode} method on each of the + * two objects must produce distinct integer results. However, the + * programmer should be aware that producing distinct integer results + * for unequal objects may improve the performance of hash tables. + *
+ *

+ * As much as is reasonably practical, the hashCode method defined by + * class {@code Object} does return distinct integers for distinct + * objects. (This is typically implemented by converting the internal + * address of the object into an integer, but this implementation + * technique is not required by the + * Java™ programming language.) + * + * @return a hash code value for this object. + * @see Object#equals(Object) + * @see System#identityHashCode + */ + @Override + public int hashCode() { + return this.key.hashCode(); + } + + /** + * Indicates whether some other object is "equal to" this one. + *

+ * The {@code equals} method implements an equivalence relation + * on non-null object references: + *

    + *
  • It is reflexive: for any non-null reference value + * {@code x}, {@code x.equals(x)} should return + * {@code true}. + *
  • It is symmetric: for any non-null reference values + * {@code x} and {@code y}, {@code x.equals(y)} + * should return {@code true} if and only if + * {@code y.equals(x)} returns {@code true}. + *
  • It is transitive: for any non-null reference values + * {@code x}, {@code y}, and {@code z}, if + * {@code x.equals(y)} returns {@code true} and + * {@code y.equals(z)} returns {@code true}, then + * {@code x.equals(z)} should return {@code true}. + *
  • It is consistent: for any non-null reference values + * {@code x} and {@code y}, multiple invocations of + * {@code x.equals(y)} consistently return {@code true} + * or consistently return {@code false}, provided no + * information used in {@code equals} comparisons on the + * objects is modified. + *
  • For any non-null reference value {@code x}, + * {@code x.equals(null)} should return {@code false}. + *
+ *

+ * The {@code equals} method for class {@code Object} implements + * the most discriminating possible equivalence relation on objects; + * that is, for any non-null reference values {@code x} and + * {@code y}, this method returns {@code true} if and only + * if {@code x} and {@code y} refer to the same object + * ({@code x == y} has the value {@code true}). + *

+ * Note that it is generally necessary to override the {@code hashCode} + * method whenever this method is overridden, so as to maintain the + * general contract for the {@code hashCode} method, which states + * that equal objects must have equal hash codes. + * + * @param obj the reference object with which to compare. + * @return {@code true} if this object is the same as the obj + * argument; {@code false} otherwise. + * @see #hashCode() + * @see HashMap + */ + @Override + public boolean equals(Object obj) { + if(null == obj) + return false; + if(obj instanceof TreeData) + return this.key.equals(((TreeData) obj).getKey()); + return false; + } +} diff --git a/src/main/java/com/cetc32/dh/entity/ActiveUser.java b/src/main/java/com/cetc32/dh/entity/ActiveUser.java new file mode 100644 index 0000000000000000000000000000000000000000..d1e702e1d4c34f77b3f5d5fd189a802bdd4a58ee --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/ActiveUser.java @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/4/15 下午12:12 + ******************************************************************************/ +package com.cetc32.dh.entity; + +import java.util.Date; + +public class ActiveUser { + int id; + Date ldate; + Integer total; + String cate; + public ActiveUser(){} + + public ActiveUser(String cate){ + this(null,null,cate); + } + + public ActiveUser(Date date,Integer t,String c){ + ldate = date; + total = t; + cate = c; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Date getLdate() { + return ldate; + } + + public void setLdate(Date ldate) { + this.ldate = ldate; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public String getCate() { + return cate; + } + + public void setCate(String cate) { + this.cate = cate; + } +} diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java b/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java index 653c6d25c78d1978e126aff82cbad952e902d30d..a0076e33699e1f08c303d3be4ada6b26641da8e6 100644 --- a/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java +++ b/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java @@ -19,7 +19,31 @@ public class BaseAdminRole extends NumberS { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; + /** + * 系统菜单权限 + */ + @Column(name = "system_menu") + private String systemMenu; + + /** + * 角色描述 + */ + @Column(name = "description") + private String description; + + /** + * 是否为系统内置角色 + * 值为1，表只能改变角色名及描述，不过能修改权限，不能删除 + * 其他表示可删除和更改 + */ + @Column(name = "is_default") + private Integer isDefault; + /** + * 角色名称 + */ + @Column(name = "role_name") + private String roleName; public String getSystemMenu() { return systemMenu; @@ -46,31 +70,7 @@ public class BaseAdminRole extends NumberS { // this.systemMenu = systemMenu!=null?","+ StringUtils.join(systemMenu,",")+",": null; // } - /** - * 系统菜单权限 - */ - @Column(name = "system_menu") - private String systemMenu; - - /** - * 角色描述 - */ - @Column(name = "description") - private String description; - - /** - * 是否为系统内置角色 - * 值为1，表只能改变角色名及描述，不过能修改权限，不能删除 - * 其他表示可删除和更改 - */ - @Column(name = "is_default") - private Integer isDefault; - /** - * 角色名称 - */ - @Column(name = "role_name") - private String roleName; public Integer getId() { return id; diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java index 1d79a0fb7c7f26c96ac5c9f5fbe086b8a4e39c83..644ccf33f9deffd491a1b253341d1f92068be45e 100644 --- a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java +++ b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java @@ -11,7 +11,13 @@ import com.google.inject.internal.util.$ToStringBuilder; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; import javax.persistence.*; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.DateTimeException; +import java.time.LocalDate; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -63,7 +69,7 @@ public class BaseAdminUser extends NumberS { * 登记时间 */ @Column(name = "reg_time") - private String regTime; + private Date regTime; /** * 状态（0：无效；1：有效） @@ -88,6 +94,152 @@ public class BaseAdminUser extends NumberS { */ @Column(name = "security") private Integer security; + + /** + * 失败次数 + * **/ + @Column(name = "loginfailed") + private Integer loginFailed; + + /** + * 网页登陆时间 + * **/ + @Column(name = "web_login_time") + private Date webLoginDate; + + /** + * 网页登陆状态 + * **/ + @Column(name = "web_login_status") + private Integer webLoginStatus; + + /** + * 网页登陆次数 + * **/ + @Column(name = "web_login_count") + private Integer webLoginCount; + + /** + * app登陆时间 + * **/ + @Column(name = "app_login_time") + private Date appLoginDate; + + /** + * app登陆状态 + * **/ + @Column(name = "app_login_status") + private Integer appLoginStatus; + + /** + * app登陆次数 + * **/ + @Column(name = "app_login_count") + private Integer appLoginCount; + + /** + * 用户真实姓名 + * ***/ + @Column(name = "realname") + private String realName; + + + + public String getSortField() { + return sortField; + } + + public void setSortField(String sortField) { + if(StringUtils.isBlank(sortField)) + this.sortField=null; + else { + switch(sortField.toLowerCase()){ + case "username":this.sortField="sys_user_name";break; + case "weblogincount":this.sortField="web_login_count";break; + case "weblogindate":this.sortField="web_login_time";break; + default:; + } + + } + } + + public String sortField; + + public String getSortOrder() { + return sortOrder; + } + + public void setSortOrder(String sortOrder) { + if(StringUtils.isBlank(sortOrder)) + this.sortOrder=null; + else{ + switch(sortOrder.toLowerCase()){ + case "ascend":this.sortOrder="asc";break; + case "descend":this.sortOrder= "desc";break; + default:; + } + } + } + + public String sortOrder; + + + public Integer getLoginFailed() { + return loginFailed; + } + + public void setLoginFailed(Integer loginFailed) { + this.loginFailed = loginFailed; + } + + public Date getWebLoginDate() { + return webLoginDate; + } + + public void setWebLoginDate(Date webLoginDate) { + this.webLoginDate = webLoginDate; + } + + public Integer getWebLoginStatus() { + return webLoginStatus; + } + + public void setWebLoginStatus(Integer webLoginStatus) { + this.webLoginStatus = webLoginStatus; + } + + public Integer getWebLoginCount() { + return webLoginCount; + } + + public void setWebLoginCount(Integer webLoginCount) { + this.webLoginCount = webLoginCount; + } + + public Date getAppLoginDate() { + return appLoginDate; + } + + public void setAppLoginDate(Date appLoginDate) { + this.appLoginDate = appLoginDate; + } + + public Integer getAppLoginStatus() { + return appLoginStatus; + } + + public void setAppLoginStatus(Integer appLoginStatus) { + this.appLoginStatus = appLoginStatus; + } + + public Integer getAppLoginCount() { + return appLoginCount; + } + + public void setAppLoginCount(Integer appLoginCount) { + this.appLoginCount = appLoginCount; + } + /** * 获取ID * @return id - ID @@ -163,6 +315,7 @@ public class BaseAdminUser extends NumberS { } List list=new ArrayList<>(); + //if(roleId.getClass() == List.class) if( roleId instanceof List){ list = (List)roleId; } @@ -232,7 +385,7 @@ public class BaseAdminUser extends NumberS { * 获取登记时间 * @return reg_time - 登记时间 */ - public String getRegTime() { + public Date getRegTime() { return regTime; } @@ -240,7 +393,7 @@ public class BaseAdminUser extends NumberS { * 设置登记时间 * @param regTime 登记时间 */ - public void setRegTime(String regTime) { + public void setRegTime(Date regTime) { this.regTime = regTime; } @@ -384,6 +537,13 @@ public class BaseAdminUser extends NumberS { this.security = security; } + public String getRealName() { + return realName; + } + + public void setRealName(String realName) { + this.realName = realName; + } /** * 实体类转换成字符串 @@ -403,4 +563,4 @@ public class BaseAdminUser extends NumberS { ", security=" + security + '}'; } -} \ No newline at end of file +} diff --git a/src/main/java/com/cetc32/dh/entity/BaseSysInfo.java b/src/main/java/com/cetc32/dh/entity/BaseSysInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..37b1108e5d23039034adc909f0857aede85a9af6 --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/BaseSysInfo.java @@ -0,0 +1,153 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/6/11 下午4:19 + ******************************************************************************/ +package com.cetc32.dh.entity; + +import java.util.HashMap; + +public class BaseSysInfo extends NumberS { + String url; + String sysCode; + String sysName; + /* + 前六个应用的图标icon + */ + String icon; + + public String getIcon() { + return icon; + } + public void setIcon(String icon) { + this.icon = icon; + } + + @Override + public String toString() { + return "BaseSysInfo{" + + "url='" + url + '\'' + + ", sysCode='" + sysCode + '\'' + + ", sysName='" + sysName + '\'' + + ", icon='" + icon + '\'' + + '}'; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getSysCode() { + return sysCode; + } + + public void setSysCode(String sysCode) { + this.sysCode = sysCode; + } + + public String getSysName() { + return sysName; + } + + public void setSysName(String sysName) { + this.sysName = sysName; + } + /** + * Returns a hash code value for the object. This method is + * supported for the benefit of hash tables such as those provided by + * {@link HashMap}. + *

+ * The general contract of {@code hashCode} is: + *

    + *
  • Whenever it is invoked on the same object more than once during + * an execution of a Java application, the {@code hashCode} method + * must consistently return the same integer, provided no information + * used in {@code equals} comparisons on the object is modified. + * This integer need not remain consistent from one execution of an + * application to another execution of the same application. + *
  • If two objects are equal according to the {@code equals(Object)} + * method, then calling the {@code hashCode} method on each of + * the two objects must produce the same integer result. + *
  • It is not required that if two objects are unequal + * according to the {@link Object#equals(Object)} + * method, then calling the {@code hashCode} method on each of the + * two objects must produce distinct integer results. However, the + * programmer should be aware that producing distinct integer results + * for unequal objects may improve the performance of hash tables. + *
+ *

+ * As much as is reasonably practical, the hashCode method defined by + * class {@code Object} does return distinct integers for distinct + * objects. (This is typically implemented by converting the internal + * address of the object into an integer, but this implementation + * technique is not required by the + * Java™ programming language.) + * + * @return a hash code value for this object. + * @see Object#equals(Object) + * @see System#identityHashCode + */ + @Override + public int hashCode() { + return this.sysCode.hashCode(); + } + + /** + * Indicates whether some other object is "equal to" this one. + *

+ * The {@code equals} method implements an equivalence relation + * on non-null object references: + *

    + *
  • It is reflexive: for any non-null reference value + * {@code x}, {@code x.equals(x)} should return + * {@code true}. + *
  • It is symmetric: for any non-null reference values + * {@code x} and {@code y}, {@code x.equals(y)} + * should return {@code true} if and only if + * {@code y.equals(x)} returns {@code true}. + *
  • It is transitive: for any non-null reference values + * {@code x}, {@code y}, and {@code z}, if + * {@code x.equals(y)} returns {@code true} and + * {@code y.equals(z)} returns {@code true}, then + * {@code x.equals(z)} should return {@code true}. + *
  • It is consistent: for any non-null reference values + * {@code x} and {@code y}, multiple invocations of + * {@code x.equals(y)} consistently return {@code true} + * or consistently return {@code false}, provided no + * information used in {@code equals} comparisons on the + * objects is modified. + *
  • For any non-null reference value {@code x}, + * {@code x.equals(null)} should return {@code false}. + *
+ *

+ * The {@code equals} method for class {@code Object} implements + * the most discriminating possible equivalence relation on objects; + * that is, for any non-null reference values {@code x} and + * {@code y}, this method returns {@code true} if and only + * if {@code x} and {@code y} refer to the same object + * ({@code x == y} has the value {@code true}). + *

+ * Note that it is generally necessary to override the {@code hashCode} + * method whenever this method is overridden, so as to maintain the + * general contract for the {@code hashCode} method, which states + * that equal objects must have equal hash codes. + * + * @param obj the reference object with which to compare. + * @return {@code true} if this object is the same as the obj + * argument; {@code false} otherwise. + * @see #hashCode() + * @see HashMap + */ + @Override + public boolean equals(Object obj) { + if(obj instanceof BaseSysInfo) + return sysCode.equals(((BaseSysInfo)(BaseSysInfo) obj).sysCode); + return false; + } +} diff --git a/src/main/java/com/cetc32/dh/entity/DataFile.java b/src/main/java/com/cetc32/dh/entity/DataFile.java deleted file mode 100644 index 6b317cc65f7c70f0856321ca28de2999dda0a0e0..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/DataFile.java +++ /dev/null @@ -1,840 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.entity; - -import org.apache.commons.lang3.StringUtils; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.Table; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - * 数据管理成果数据实体类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@Table(name = "data_file") -public class DataFile extends NumberS { - - /** - * 数据id,文件(夹)id - */ - @Id - private Long id; - - /** - * 文件名称 - */ - @Column(name = "file_name") - private String fileName; - - /** - * 数据安全等级，文件(夹)安全等级 - */ - @Column(name = "file_security") - private String fileSecurity; - - /** - * 数据路径，文件(夹)存放路径 - */ - @Column(name = "file_path") - private String filePath; - - /** - * 数据时间，文件(夹)创建时间 - */ - @Column(name = "create_time") - private Date createTime; - - /** - * 时间数组，存放搜索的开始时间和结束时间 - */ - private String[] timeRange; - - /** - * 开始时间(文件年份时间) - */ - private String startTime; - - /** - * 结束时间（文件年份时间） - */ - private String endTime; - - /** - * 数据区域，文件(夹)所属区域 - */ - private String region; - - /** - * 数据区域list，文件(夹)所属区域 - */ - private List regionList; - - /** - * 数据大小，文件(夹)大小 - */ - @Column(name = "file_size") - private String fileSize; - - /** - * 文件夹中文件个数 - */ - @Column(name = "file_numbers") - private Integer fileNumbers; - - /** - * 数据描述，文件(夹)描述 - */ - @Column(name = "file_discription") - private String fileDiscription; - - /** - * 提交人 - */ - private String submitor; - - /** - * 审核人 - */ - private String approver; - - /** - * 图像地理坐标系（北京54、西安80、WGS－84、2000国家大地坐标系） - */ - private String gcs; - - /** - * 图像级别（1-20） - */ - @Column(name = "scan_level") - private Integer scanLevel; - - /** - * 图像比例尺（1:10万 1:25万 1:50万 1:100万） - */ - private String scale; - - /** - * 经度（左上） - */ - private String lan; - - /** - * 纬度（左上） - */ - private String lon; - - /** - * 保留字段 - */ - private String catagory; - - /** - * 数据日期,文件(夹)所属年份 - */ - @Column(name = "file_time") - private java.sql.Date fileTime; - - /** - * 审批状态 - */ - private String status; - - /** - * 编目Id - */ - @Column(name = "menu_id") - private Integer menuId; - - /** - * 文件标识，数据标识 - */ - @Column(name = "file_config") - private String fileConfig; - - /** - * 文件审批数据时间 - */ - @Column(name = "approve_time") - private Date approveTime; - - /** - * 范围自定义（点集） - */ - @Column(name = "area") - private String area; - - /** - * 用户id - */ - @Column(name = "user_id") - private Integer userId; - - /** - * 今日开始时间td_start - */ - private String td_start; - - /** - * 今日结束时间td_end - */ - private String td_end; - - /** - * 无参构造函数 - */ - public DataFile() { - } - - /** - * @param id - * @param fileName - * @param area - * @param fileSecurity - * @param filePath - * @param createTime - * @param region - * @param fileTime - * @param gcs - * @param lan - * @param lon - * @param catagory - * @param scale - * @param scanLevel - * @param status - * @param menuId - * @param fileConfig - * @param approveTime - * @param userId - * @param submitor - * @param approver 有参构造函数 - */ - public DataFile(Long id, String fileName, String area, String fileSecurity, String filePath, Date createTime, String region, java.sql.Date fileTime, String fileSize, - Integer fileNumbers, String fileDiscription, String submitor, String approver, String gcs, Integer scanLevel, String scale, String lan, String lon, - String catagory, String status, Integer menuId, String fileConfig, Date approveTime, Integer userId, List regionList, String startTime, - String endTime, String[] timeRange, String td_end, String td_start) { - this.id = id; - this.fileName = fileName; - this.area = area; - this.fileSecurity = fileSecurity; - this.createTime = createTime; - this.filePath = filePath; - this.region = region; - this.fileTime = fileTime; - this.fileSize = fileSize; - this.fileNumbers = fileNumbers; - this.fileDiscription = fileDiscription; - this.submitor = submitor; - this.approver = approver; - this.gcs = gcs; - this.scale = scale; - this.scanLevel = scanLevel; - this.lan = lan; - this.lon = lon; - this.catagory = catagory; - this.status = status; - this.menuId = menuId; - this.fileConfig = fileConfig; - this.approveTime = approveTime; - this.userId = userId; - this.regionList = regionList; - this.startTime = startTime; - this.endTime = endTime; - this.timeRange = timeRange; - this.td_end = td_end; - this.td_start = td_start; - } - - /** - * 获取今日开始时间td_start - * - * @return td_start - 今日开始时间td_start - */ - public String getTd_start() { - return td_start; - } - - /** - * 设置今日开始时间td_start - * - * @param td_start - 今日开始时间td_start - */ - public void setTd_start(String td_start) { - this.td_start = td_start; - } - - /** - * 获取今日结束时间td_end - * - * @return td_end -今日结束时间td_end - */ - public String getTd_end() { - return td_end; - } - - /** - * 设置今日结束时间td_end - * - * @param td_end - 今日结束时间td_end - */ - public void setTd_end(String td_end) { - this.td_end = td_end; - } - - /** - * 获取数据id,文件(夹)id - * - * @return id - 数据id,文件(夹)id - */ - public Long getId() { - return id; - } - - /** - * 设置数据id,文件(夹)id - * - * @param id 数据id,文件(夹)id - */ - public void setId(Long id) { - this.id = id; - } - - /** - * 获取编目id - * - * @return menuId - 编目id - */ - public Integer getMenuId() { - return menuId; - } - - /** - * 设置编目id - * - * @param menuId 编目id - */ - public void setMenuId(Integer menuId) { - this.menuId = menuId; - } - - - /** - * 获取用户id - * - * @return userId - 用户id - */ - public Integer getUserId() { - return userId; - } - - /** - * 设置用户id - * - * @param userId 用户id - */ - public void setUserId(Integer userId) { - this.userId = userId; - } - - /** - * 获取文件名称 - * - * @return file_name - 文件名称 - */ - public String getFileName() { - return fileName; - } - - /** - * 设置文件名称 - * - * @param fileName 文件名称 - */ - public void setFileName(String fileName) { - this.fileName = fileName == null ? null : fileName.trim(); - } - - /** - * 获取区域自定义范围 - * - * @return area - 区域自定义范围 - */ - public String getArea() { - return area; - } - - /** - * 设置区域自定义范围 - * - * @param area 区域自定义范围 - */ - public void setArea(String area) { - this.area = area == null ? null : area.trim(); - } - - /** - * 获取数据安全等级，文件(夹)安全等级 - * - * @return file_security - 数据安全等级，文件(夹)安全等级 - */ - public String getFileSecurity() { - return fileSecurity; - } - - /** - * 设置数据安全等级，文件(夹)安全等级 - * - * @param fileSecurity 数据安全等级，文件(夹)安全等级 - */ - public void setFileSecurity(String fileSecurity) { - this.fileSecurity = fileSecurity == null ? null : fileSecurity.trim(); - } - - /** - * 获取数据路径，文件(夹)存放路径 - * - * @return file_path - 数据路径，文件(夹)存放路径 - */ - public String getFilePath() { - return filePath; - } - - /** - * 设置数据路径，文件(夹)存放路径 - * - * @param filePath 数据路径，文件(夹)存放路径 - */ - public void setFilePath(String filePath) { - this.filePath = filePath == null ? null : filePath.trim(); - } - - /** - * 获取数据时间，文件(夹)创建时间 - * - * @return create_time - 数据时间，文件(夹)创建时间 - */ - public Date getCreateTime() { - return createTime; - } - - /** - * 设置数据时间，文件(夹)创建时间 - * - * @param createTime 数据时间，文件(夹)创建时间 - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - /** - * 获取开始时间 - * - * @return start_time - 开始时间 - */ - public String getStartTime() { - return startTime; - } - - /** - * 设置开始时间 - * - * @param startTime 开始时间 - */ - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - /** - * 获取结束时间 - * - * @return end_time - 结束时间 - */ - public String getEndTime() { - return endTime; - } - - /** - * 设置结束时间 - * - * @param endTime 结束时间 - */ - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - /** - * 获取数据区域，文件(夹)所属区域 - * - * @return region - 数据区域，文件(夹)所属区域 - */ - public String getRegion() { - return region; - } - - /** - * 设置数据区域，文件(夹)所属区域 - * - * @param region 数据区域，文件(夹)所属区域 - */ - public void setRegion(String region) { - this.region = region == null ? null : region.trim(); - } - - /** - * 获取数据大小，文件(夹)大小 - * - * @return file_size - 数据大小，文件(夹)大小 - */ - public String getFileSize() { - return fileSize; - } - - /** - * 设置数据大小，文件(夹)大小 - * - * @param fileSize 数据大小，文件(夹)大小 - */ - public void setFileSize(String fileSize) { - this.fileSize = fileSize == null ? null : fileSize.trim(); - } - - /** - * 获取文件夹中文件个数 - * - * @return file_numbers - 文件夹中文件个数 - */ - public Integer getFileNumbers() { - return fileNumbers; - } - - /** - * 设置文件夹中文件个数 - * - * @param fileNumbers 文件夹中文件个数 - */ - public void setFileNumbers(Integer fileNumbers) { - this.fileNumbers = fileNumbers; - } - - /** - * 获取数据描述，文件(夹)描述 - * - * @return file_discription - 数据描述，文件(夹)描述 - */ - public String getFileDiscription() { - return fileDiscription; - } - - /** - * 设置数据描述，文件(夹)描述 - * - * @param fileDiscription 数据描述，文件(夹)描述 - */ - public void setFileDiscription(String fileDiscription) { - this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim(); - } - - /** - * 获取提交人 - * - * @return submitor- 提交人 - */ - public String getSubmitor() { - return submitor; - } - - /** - * 设置提交人 - * - * @param submitor 提交人 - */ - public void setSubmitor(String submitor) { - this.submitor = submitor == null ? null : submitor.trim(); - } - - /** - * 获取审批人 - * - * @return approver - 审批人 - */ - public String getApprover() { - return approver; - } - - /** - * 设置审批人 - * - * @param approver 审批人 - */ - public void setApprover(String approver) { - this.approver = approver == null ? null : approver.trim(); - } - - /** - * 获取图像地理坐标系（北京54、西安80、WGS－84、2000国家大地坐标系） - * - * @return gcs - 图像地理坐标系（北京54、西安80、WGS－84、2000国家大地坐标系） - */ - public String getGcs() { - return gcs; - } - - /** - * 设置图像地理坐标系（北京54、西安80、WGS－84、2000国家大地坐标系） - * - * @param gcs 图像地理坐标系（北京54、西安80、WGS－84、2000国家大地坐标系） - */ - public void setGcs(String gcs) { - this.gcs = gcs == null ? null : gcs.trim(); - } - - /** - * 获取图像级别（1-20） - * - * @return scan_level - 图像级别（1-20） - */ - public Integer getScanLevel() { - return scanLevel; - } - - - /** - * 设置图像级别（1-20） - * - * @param scanLevel 图像级别（1-20） - */ - public void setScanLevel(Integer scanLevel) { - this.scanLevel = scanLevel; - } - - /** - * 设置图像级别（1-20） - * - * @param scanLevel 图像级别（1-20）输入参数String类型 - */ - public void setScanLevel(String scanLevel) { - if (scanLevel.equals("全部级别") || StringUtils.isEmpty(scanLevel)) { - this.scanLevel = null; - } else { - this.scanLevel = Integer.parseInt(scanLevel); - } - } - - /** - * 获取图像比例尺（1:10万 1:25万 1:50万 1:100万） - * - * @return scale - 图像比例尺（1:10万 1:25万 1:50万 1:100万） - */ - public String getScale() { - return scale; - } - - /** - * 设置图像比例尺（1:10万 1:25万 1:50万 1:100万） - * - * @param scale 图像比例尺（1:10万 1:25万 1:50万 1:100万） - */ - public void setScale(String scale) { - this.scale = scale == null ? null : scale.trim(); - } - - /** - * 获取经度（左上） - * - * @return lan - 经度（左上） - */ - public String getLan() { - return lan; - } - - /** - * 设置经度（左上） - * - * @param lan 经度（左上） - */ - public void setLan(String lan) { - this.lan = lan == null ? null : lan.trim(); - } - - /** - * 获取纬度（左上） - * - * @return lon - 纬度（左上） - */ - public String getLon() { - return lon; - } - - /** - * 设置纬度（左上） - * - * @param lon 纬度（左上） - */ - public void setLon(String lon) { - this.lon = lon == null ? null : lon.trim(); - } - - /** - * 获取保留 - * - * @return catagory - 保留 - */ - public String getCatagory() { - return catagory; - } - - /** - * 设置保留 - * - * @param catagory 保留 - */ - public void setCatagory(String catagory) { - this.catagory = catagory == null ? null : catagory.trim(); - } - - /** - * 获取数据日期,文件(夹)所属年份 - * - * @return file_time - 数据日期,文件(夹)所属年份 - */ - public java.sql.Date getFileTime() { - return fileTime; - } - - /** - * 设置数据日期,文件(夹)所属年份 - * - * @param fileTime 数据日期,文件(夹)所属年份 - */ - public void setFileTime(String fileTime) { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - java.util.Date d = null; - try { - d = format.parse(fileTime); - } catch (Exception e) { - e.printStackTrace(); - } - java.sql.Date date = new java.sql.Date(d.getTime()); - this.fileTime = date; - } - - /** - * 获取审批状态 - * - * @return status - 审批状态 - */ - public String getStatus() { - return status; - } - - /** - * 设置审批状态 - * - * @param status 审批状态 - */ - public void setStatus(String status) { - this.status = status == null ? null : status.trim(); - } - - /** - * 获取文件标识，数据标识 - * - * @return file_config - 文件标识，数据标识 - */ - public String getFileConfig() { - return fileConfig; - } - - /** - * 设置数据标识，文件标识 - * - * @param fileConfig 数据标识，文件标识 - */ - public void setFileConfig(String fileConfig) { - this.fileConfig = fileConfig == null ? null : fileConfig.trim(); - } - - - /** - * 获取数据、文件时间 - * - * @return approve_time - */ - public Date getApproveTime() { - return approveTime; - } - - /** - * 设置文件数据时间 - * - * @param approveTime - */ - public void setApproveTime(Date approveTime) { - this.approveTime = approveTime; - } - - /** - * 获取数据区域list，文件(夹)所属区域 - * - * @return regionList - */ - public List getRegionList() { - return regionList; - } - - /** - * 设置数据区域list，文件(夹)所属区域 - * - * @param regionList - */ - public void setRegionList(List regionList) { - this.regionList = regionList; - } - - /** - * 获取时间数组 - * - * @return timeRange - */ - public String[] getTimeRange() { - return timeRange; - } - - /** - * 设置时间数组 - * - * @param timeRange - */ - public void setTimeRange(String[] timeRange) { - this.timeRange = timeRange; - } - - - /** - * 返回文件实体类的字符串形式 - */ - public String toString() { - return "{" + - "menuId=" + menuId + '\'' + - "fileName=" + fileName + '\'' + - ", area='" + area + '\'' + - ", fileSecurity=" + fileSecurity + '\'' + - ", filePath=" + filePath + '\'' + - ", createTime=" + createTime + '\'' + - ", region=" + region + '\'' + - ", fileSize=" + fileSize + '\'' + - ", fileNumbers=" + fileNumbers + '\'' + - ", fileDiscription=" + fileDiscription + - '}'; - } -} diff --git a/src/main/java/com/cetc32/dh/entity/DataMenu.java b/src/main/java/com/cetc32/dh/entity/DataMenu.java deleted file mode 100644 index a0222c0250dd5e6ac6e30f877dbc9e132164aee9..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/DataMenu.java +++ /dev/null @@ -1,299 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.entity; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Title: DataTrace - * @Description: 数据编目实体 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/21 13:43 - */ -@Table(name = "data_menu") -public class DataMenu implements Serializable { - - /** - * id - */ - @Id - private Long id; - - /** - * 数据管理编目名称 - */ - @Column(name = "menu_name") - private String menuName; - - /** - * 父编目ID - */ - private Long pid; - - /** - * 编目信息描述 - */ - private String discription; - - /** - * 编目路径URL - */ - private String url; - - /** - * 编目键 - */ - private String key; - - /** - * 图标类型icon - */ - private String icon; - - /** - * 数据管理编目前端页面路径 - */ - @Column(name = "html_url") - private String htmlUrl; - - /** - * 编目允许变更信息 - */ - private Boolean disabled; - - /** - * 编目允许变更信息 - */ - private Boolean addkids; - - - /** - * 无参构造函数 - */ - public DataMenu() { - } - - /** - * @param id - * @param menuName - * @param pid - * @param discription - * @param url - * @param icon - * @param key - * @param addkids 有参构造函数 - */ - public DataMenu(Long id, String menuName, Long pid, String discription, String url, String htmlUrl, - Boolean disabled, String icon, String key, Boolean addkids) { - this.id = id; - this.menuName = menuName; - this.pid = pid; - this.discription = discription; - this.url = url; - this.htmlUrl = htmlUrl; - this.disabled = disabled; - this.icon = icon; - this.key = key; - this.addkids = addkids; - } - - /** - * 获取编目id - * - * @return 编目id - */ - public Long getId() { - return id; - } - - /** - * 设置编目id - * - * @param id 编目id - */ - public void setId(Long id) { - this.id = id; - } - - /** - * 获取数据管理编目名称 - * - * @return menu_name - 数据管理编目名称 - */ - public String getMenuName() { - return menuName; - } - - /** - * 设置数据管理编目名称 - * - * @param menuName 数据管理编目名称 - */ - public void setMenuName(String menuName) { - this.menuName = menuName == null ? null : menuName.trim(); - } - - /** - * 获取父编目ID - * - * @return pid - 父编目ID - */ - public Long getPid() { - return pid; - } - - /** - * 设置父编目ID - * - * @param pid 父编目ID - */ - public void setPid(Long pid) { - this.pid = pid; - } - - /** - * 获取信息描述 - * - * @return discription - */ - public String getDiscription() { - return discription; - } - - /** - * 设置信息描述 - * - * @param discription 信息描述 - */ - public void setDiscription(String discription) { - this.discription = discription == null ? null : discription.trim(); - } - - /** - * 获取图表类型icon - * - * @return icon - 编目icon - */ - public String getIcon() { - return icon; - } - - /** - * 设置图表类型icon - * - * @param icon 编目icon - */ - public void setIcon(String icon) { - this.icon = icon == null ? null : icon.trim(); - } - - /** - * 获取编目URL - * - * @return url - 编目URL - */ - public String getUrl() { - return url; - } - - /** - * 设置编目URL - * - * @param url 编目URL - */ - public void setUrl(String url) { - this.url = url == null ? null : url.trim(); - } - - /** - * 获取编目URL - * - * @return key - 编目键key - */ - public String getKey() { - return key; - } - - /** - * 设置编目键key - * - * @param key 编目键key - */ - public void setKey(String key) { - this.key = key == null ? null : key.trim(); - } - - /** - * 获取数据管理数据管理编目前端页面路径 - * - * @return html_url - 数据管理数据管理编目前端页面路径 - */ - public String getHtmlUrl() { - return htmlUrl; - } - - /** - * 设置数据管理数据管理编目前端页面路径 - * - * @param htmlUrl 数据管理数据管理编目前端页面路径 - */ - public void setHtmlUrl(String htmlUrl) { - this.htmlUrl = htmlUrl == null ? null : htmlUrl.trim(); - } - - /** - * 获取编目允许变更信息 - * - * @return disabled - 编目允许变更信息 - */ - public Boolean getDisabled() { - return disabled; - } - - /** - * 设置编目允许变更信息 - * - * @param disabled 编目允许变更信息 - */ - public void setDisabled(Boolean disabled) { - this.disabled = disabled; - } - - - /** - * 获取前端编目可更改信息 - * - * @return icon - 前端编目更改信息 - */ - public Boolean getAddkids() { - return addkids; - } - - /** - * 设置前端编目更改信息 - * - * @param addkids 前端页编目更改信息 - */ - public void setAddkids(Boolean addkids) { - this.addkids = addkids; - } - - - /* public String toString() { - return "{" + - "id=" + id +'\'' + -// "menuName=" + menuName + -// ", pid='" + pid + '\'' + -// ", discription=" + discription+'\'' + -// ", url=" + url + - '}'; - }*/ -} - diff --git a/src/main/java/com/cetc32/dh/entity/DataPlp.java b/src/main/java/com/cetc32/dh/entity/DataPlp.java deleted file mode 100644 index 77b7079448bbfbc309d109e507cb36c523dfd2fa..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/DataPlp.java +++ /dev/null @@ -1,616 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.entity; - -import javax.persistence.Column; -import javax.persistence.Table; -import java.util.Date; - -/** - * 数据管理点线面实体类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@Table(name = "data_plp") -public class DataPlp extends NumberS { - - /** - * 用户id - */ - @Column(name = "user_id") - private Integer userId; - - /** - * 数据类型-8:点，线：64,面：128 - */ - @Column(name = "event_type") - private String eventType; - - /** - * 点集wkt格式 - */ - private String points; - - /** - * 当前区域 - */ - private String region; - - /** - * 上传创建时间 - */ - @Column(name = "create_time") - private Date createTime; - - /** - * 数据描述 - */ - private String description; - - /** - * 编目id - */ - @Column(name = "menu_id") - private Integer menuId; - - /** - * 预留字段2 - */ - private String reserver2; - - /** - * 唯一标识 - */ - private Integer id; - - /** - * 数据安全等级 - */ - private String security; - - /** - * 审批人 - */ - private String approver; - - /** - * 审批时间 - */ - @Column(name = "approve_time") - private Date approveTime; - - /** - * 审批状态 - */ - private String status; - - /** - * 数据标识 - */ - @Column(name = "file_config") - private String fileConfig; - - /** - * 数据名称 - */ - @Column(name = "file_name") - private String fileName; - - /** - * 数据所属年份 - */ - @Column(name = "file_time") - private String fileTime; - - /** - * 照片流 - */ - @Column(name = "photo_byte") - private byte[] photoByte; - - /** - * 提交者 - */ - @Column(name = "submitor") - private String submitor; - - /** - * 时间数组 - */ - private String[] timeRange; - - /** - * 开始时间 - */ - private String startTime; - - /** - * 结束时间 - */ - private String endTime; - - /** - * 今日开始时间td_start - */ - private String td_start; - - /** - * 今日结束时间td_end - */ - private String td_end; - - /** - * 无参构造函数 - */ - public DataPlp() { - } - - /** - * @param id - * @param fileName - * @param eventType - * @param createTime - * @param region - * @param fileTime - * @param status - * @param fileConfig - * @param approveTime - * @param photoByte - * @param points - * @param approver - * @param menuId - * @param reserver2 - * @param userId - * @param security - * @param description - * @param submitor 有参构造函数 - */ - public DataPlp(Integer id, String fileName, String eventType, String security, Date createTime, String region, String fileTime, - String description, Integer userId, String approver, String status, String fileConfig, Date approveTime, - String points, Integer menuId, String reserver2, byte[] photoByte, String submitor, String[] timeRange, String td_start, String td_end) { - this.id = id; - this.fileName = fileName; - this.eventType = eventType; - this.security = security; - this.createTime = createTime; - this.region = region; - this.fileTime = fileTime; - this.description = description; - this.userId = userId; - this.approver = approver; - this.status = status; - this.fileConfig = fileConfig; - this.approveTime = approveTime; - this.photoByte = photoByte; - this.points = points; - this.menuId = menuId; - this.reserver2 = reserver2; - this.submitor = submitor; - this.timeRange = timeRange; - this.td_end = td_end; - this.td_start = td_start; - } - - /** - * 获取时间数组(时间段) - * - * @return timeRange - 时间数组 - */ - public String[] getTimeRange() { - return timeRange; - } - - /** - * 设置时间数组(时间段) - * - * @param timeRange -时间数组 - */ - public void setTimeRange(String[] timeRange) { - this.timeRange = timeRange; - } - - /** - * 获取开始时间 - * - * @return startTime - 开始时间 - */ - public String getStartTime() { - return startTime; - } - - /** - * 设置开始时间 - * - * @param startTime - 开始时间 - */ - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - /** - * 获取结束时间 - * - * @return endTime - 结束时间 - */ - public String getEndTime() { - return endTime; - } - - /** - * 设置结束时间 - * - * @param endTime - 结束时间 - */ - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - /** - * 获取结束时间 - * - * @return td_start - 今日开始时间 - */ - public String getTd_start() { - return td_start; - } - - /** - * 设置结束时间 - * - * @param td_start - 今日开始时间 - */ - public void setTd_start(String td_start) { - this.td_start = td_start; - } - - /** - * 获取结束时间 - * - * @return td_end - 今日结束时间 - */ - public String getTd_end() { - return td_end; - } - - /** - * 设置结束时间 - * - * @param td_end - 今日结束时间 - */ - public void setTd_end(String td_end) { - this.td_end = td_end; - } - - /** - * 获取用户id - * - * @return user_id - 用户id - */ - public Integer getUserId() { - return userId; - } - - /** - * 设置用户id - * - * @param userId 用户id - */ - public void setUserId(Integer userId) { - this.userId = userId; - } - - /** - * 获取数据类型-8:点，线：64,面：128 - * - * @return event_type - 数据类型-8:点，线：64,面：128 - */ - public String getEventType() { - return eventType; - } - - /** - * 设置数据类型-8:点，线：64,面：128 - * - * @param eventType 数据类型-8:点，线：64,面：128 - */ - public void setEventType(String eventType) { - this.eventType = eventType == null ? null : eventType.trim(); - } - - /** - * 获取点集wkt格式 - * - * @return points - 点集wkt格式 - */ - public String getPoints() { - return points; - } - - /** - * 设置点集wkt格式 - * - * @param points 点集wkt格式 - */ - public void setPoints(String points) { - this.points = points == null ? null : points.trim(); - } - - /** - * 获取当前区域 - * - * @return region - 当前区域 - */ - public String getRegion() { - return region; - } - - /** - * 设置当前区域 - * - * @param region 当前区域 - */ - public void setRegion(String region) { - this.region = region == null ? null : region.trim(); - } - - /** - * 获取上传创建时间 - * - * @return create_time - 上传创建时间 - */ - public Date getCreateTime() { - return createTime; - } - - /** - * 设置上传创建时间 - * - * @param createTime 上传创建时间 - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - /** - * 获取数据描述 - * - * @return description - 数据描述 - */ - public String getDescription() { - return description; - } - - /** - * 设置数据描述 - * - * @param description 数据描述 - */ - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } - - /** - * 编目id - * - * @return menuId - 编目id - */ - public Integer getMenuId() { - return menuId; - } - - /** - * 设置编目id - * - * @param menuId 编目id - */ - public void setMenuId(Integer menuId) { - this.menuId = menuId; - } - - /** - * 获取预留字段2 - * - * @return reserver2 - 预留字段2 - */ - public String getReserver2() { - return reserver2; - } - - /** - * 设置预留字段2 - * - * @param reserver2 预留字段2 - */ - public void setReserver2(String reserver2) { - this.reserver2 = reserver2 == null ? null : reserver2.trim(); - } - - /** - * 获取唯一标识 - * - * @return id - 唯一标识 - */ - public Integer getId() { - return id; - } - - /** - * 设置唯一标识 - * - * @param id 唯一标识 - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 获取数据安全等级 - * - * @return security - 数据安全等级 - */ - public String getSecurity() { - return security; - } - - /** - * 设置数据安全等级 - * - * @param security 数据安全等级 - */ - public void setSecurity(String security) { - this.security = security == null ? null : security.trim(); - } - - /** - * 获取审批人 - * - * @return approver - 审批人 - */ - public String getApprover() { - return approver; - } - - /** - * 设置审批人 - * - * @param approver 审批人 - */ - public void setApprover(String approver) { - this.approver = approver == null ? null : approver.trim(); - } - - /** - * 获取审批时间 - * - * @return approve_time - 审批时间 - */ - public Date getApproveTime() { - return approveTime; - } - - /** - * 设置审批时间 - * - * @param approveTime 审批时间 - */ - public void setApproveTime(Date approveTime) { - this.approveTime = approveTime; - } - - /** - * 获取审批状态 - * - * @return status - 审批状态 - */ - public String getStatus() { - return status; - } - - /** - * 设置审批状态 - * - * @param status 审批状态 - */ - public void setStatus(String status) { - this.status = status == null ? null : status.trim(); - } - - /** - * 获取数据标识 - * - * @return file_config - 数据标识 - */ - public String getFileConfig() { - return fileConfig; - } - - /** - * 设置数据标识 - * - * @param fileConfig 数据标识 - */ - public void setFileConfig(String fileConfig) { - this.fileConfig = fileConfig == null ? null : fileConfig.trim(); - } - - /** - * 获取数据名称 - * - * @return file_name - 数据名称 - */ - public String getFileName() { - return fileName; - } - - /** - * 设置数据名称 - * - * @param fileName 数据名称 - */ - public void setFileName(String fileName) { - this.fileName = fileName == null ? null : fileName.trim(); - } - - /** - * 获取数据所属年份 - * - * @return file_time - 数据所属年份 - */ - public String getFileTime() { - return fileTime; - } - - /** - * 设置数据所属年份 - * - * @param fileTime 数据所属年份 - */ - public void setFileTime(String fileTime) { - this.fileTime = fileTime == null ? null : fileTime.trim(); - } - - /** - * 获取照片流 - * - * @return photo_byte - 照片流 - */ - public byte[] getPhotoByte() { - return photoByte; - } - - /** - * 设置照片流 - * - * @param photoByte 照片流 - */ - public void setPhotoByte(byte[] photoByte) { - this.photoByte = photoByte; - } - - /** - * 获取提交用户 - * - * @return submitor - 提交用户 - */ - public String getSubmitor() { - return submitor; - } - - /** - * 设置提交用户 - * - * @param submitor 提交用户 - */ - public void setSubmitor(String submitor) { - this.submitor = submitor == null ? null : submitor.trim(); - } - - -} diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java deleted file mode 100644 index b173508b72fcd7b53d52cbc2bfa8e51f0a89954f..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java +++ /dev/null @@ -1,379 +0,0 @@ -package com.cetc32.dh.entity; - -import javax.persistence.*; -import java.util.Date; - -@Table(name = "data_submit") -public class DataSubmit extends NumberS{ - - public DataSubmit(){} - - public DataSubmit(Integer id, String subtype, Integer plevel, Integer status, String submitor, String approver, - Long menuid, String menuName, Integer year, String title, String area, String path,String fileType) { - this.id=id; - this.subtype=subtype; - this.plevel=plevel; - this.status=status; - this.submitor=submitor; - this.approver=approver; - this.menuid=menuid; - this.year=year; - this.title=title; - this.area=area; - this.path=path; - this.menuName=menuName; - this.fileType=fileType; - - } - - - @Id - private Integer id; - - /** - * '报送类型,外部接口上报或本地路径上报' - */ - private String subtype; - - private Integer plevel; - - private Integer status; - - private String submitor; - - private String approver; - - @Column(name = "menuId") - private Long menuid; - - private Integer year; - - private String title; - - private String area; - - private String path; - - @Column(name = "file_type") - private String fileType; - - private Date subtime; - - @Column(name = "review_time") - private Date reviewTime; - - @Column(name = "file_size") - private String fileSize; - - @Column(name = "file_numbers") - private Integer fileNumbers; - - @Column(name = "file_discription") - private String fileDiscription; - - private String[] pathList; - - private String menuName; - - private String userId; - - /** - * @return id - */ - public Integer getId() { - return id; - } - - /** - * @param id - */ - public void setId(Integer id) { - this.id = id; - } - - - - /** - * @return userId - */ - public String getUserId() { - return userId; - } - - /** - * @param userId - */ - public void setUserId(String userId) { - this.userId = userId; - } - - /** - * 获取'报送类型,外部接口上报或本地路径上报' - * - * @return subtype - '报送类型,外部接口上报或本地路径上报' - */ - public String getSubtype() { - return subtype; - } - - /** - * 设置'报送类型,外部接口上报或本地路径上报' - * - * @param subtype '报送类型,外部接口上报或本地路径上报' - */ - public void setSubtype(String subtype) { - this.subtype = subtype; - } - - /** - * @return plevel - */ - public Integer getPlevel() { - return plevel; - } - - /** - * @param plevel - */ - public void setPlevel(Integer plevel) { - this.plevel = plevel; - } - - /** - * @return status - */ - public Integer getStatus() { - return status; - } - - /** - * @param status - */ - public void setStatus(Integer status) { - this.status = status; - } - - /** - * @return submitor - */ - public String getSubmitor() { - return submitor; - } - - /** - * @param submitor - */ - public void setSubmitor(String submitor) { - this.submitor = submitor == null ? null : submitor.trim(); - } - - /** - * @return approver - */ - public String getApprover() { - return approver; - } - - /** - * @param approver - */ - public void setApprover(String approver) { - this.approver = approver == null ? null : approver.trim(); - } - - /** - * @return menuId - */ - public Long getMenuid() { - return menuid; - } - - /** - * @param menuid - */ - public void setMenuid(Long menuid) { - this.menuid = menuid; - } - - /** - * @return year - */ - public Integer getYear() { - return year; - } - - /** - * @param year - */ - public void setYear(Integer year) { - this.year = year; - } - - /** - * @return title - */ - public String getTitle() { - return title; - } - - /** - * @param title - */ - public void setTitle(String title) { - this.title = title == null ? null : title.trim(); - } - - /** - * @return area - */ - public String getArea() { - return area; - } - - /** - * @param area - */ - public void setArea(String area) { - this.area = area == null ? null : area.trim(); - } - - /** - * @return path - */ - public String getPath() { - return path; - } - - /** - * @param path - */ - public void setPath(String path) { - this.path = path == null ? null : path.trim(); - } - - /** - * @return file_type - */ - public String getFileType() { - return fileType; - } - - /** - * @param fileType - */ - public void setFileType(String fileType) { - this.fileType = fileType == null ? null : fileType.trim(); - } - - /** - * @return subtime - */ - public Date getSubtime() { - return subtime; - } - - /** - * @param subtime - */ - public void setSubtime(Date subtime) { - this.subtime = subtime; - } - - /** - * @return review_time - */ - public Date getReviewTime() { - return reviewTime; - } - - /** - * @param reviewTime - */ - public void setReviewTime(Date reviewTime) { - this.reviewTime = reviewTime; - } - - /** - * @return file_size - */ - public String getFileSize() { - return fileSize; - } - - /** - * @param fileSize - */ - public void setFileSize(String fileSize) { - this.fileSize = fileSize == null ? null : fileSize.trim(); - } - - /** - * @return file_numbers - */ - public Integer getFileNumbers() { - return fileNumbers; - } - - /** - * @param fileNumbers - */ - public void setFileNumbers(Integer fileNumbers) { - this.fileNumbers = fileNumbers; - } - - /** - * @return file_discription - */ - public String getFileDiscription() { - return fileDiscription; - } - - /** - * @param fileDiscription - */ - public void setFileDiscription(String fileDiscription) { - this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim(); - } - - - - /** - * @param pathList - */ - public void setPathList(String[] pathList) { - this.pathList = pathList; - } - - public String[] getPathList() { - return this.pathList; - } - - /** - * @param menuName - */ - public void setMenuName(String menuName) { - this.menuName = menuName; - } - - public String getMenuName() { - return this.menuName; - } - - - - public String toString() { - return "{" + - "id=" + id +'\'' + - ",subtype=" + subtype +'\'' + - ",plevel=" + plevel + '\'' + - ",status=" + status+'\'' + - ",submitor=" + submitor +'\'' + - ",approver=" + approver + '\'' + - ",path=" + path+'\'' + - ",year=" + year+'\'' + - ",title=" + title+'\'' + - ",menuName=" + menuName+'\'' + - ",area=" + area + - '}'; - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/entity/DataTrace.java b/src/main/java/com/cetc32/dh/entity/DataTrace.java deleted file mode 100644 index f499d50ed54d89cf15bcf7f29d12d509fde6da21..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/DataTrace.java +++ /dev/null @@ -1,896 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.entity; - -import javax.persistence.Column; -import javax.persistence.Table; -import java.util.Date; - -/** - * 数据管理轨迹数据实体类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@Table(name = "data_trace") -public class DataTrace extends NumberS { - - /** - * 无参构造函数 - */ - public DataTrace() { - } - - /** - * @param id - * @param createTime - * @param fileTime - * @param status - * @param fileConfig - * @param approveTime - * @param points - * @param approver - * @param userId - * @param security - * @param description - * @param speed - * @param locsource - * @param deviceid - * @param direction - * @param lat - * @param linkid - * @param lon - * @param enccrylatitude - * @param encrylongitude - * @param flag - * @param submitor - * @param fileName - * @param filePath - * @param fileSize - * @param startTime - * @param endTime - * @param menuId - * 有参构造函数 - */ - public DataTrace(Integer id, String security, Date createTime, String fileTime, String description, Integer userId, String approver, String status, - String fileConfig, Date approveTime, String lat, String lon, Integer speed, Integer direction, Integer locsource, Integer coordinateerror, - String deviceid, Integer encrylongitude, Integer enccrylatitude, Boolean flag, String points, String linkid, String submitor, Date startTime, - Date endTime, String filePath, String fileSize, String fileName, Integer menuId, String td_start, String td_end) { - this.id = id; - this.security = security; - this.createTime = createTime; - this.fileTime = fileTime; - this.description = description; - this.userId = userId; - this.approver = approver; - this.status = status; - this.fileConfig = fileConfig; - this.approveTime = approveTime; - this.points = points; - this.deviceid = deviceid; - this.enccrylatitude = enccrylatitude; - this.encrylongitude = encrylongitude; - this.flag = flag; - this.speed = speed; - this.direction = direction; - this.lat = lat; - this.lon = lon; - this.locsource = locsource; - this.coordinateerror = coordinateerror; - this.linkid = linkid; - this.submitor = submitor; - this.startTime = startTime; - this.endTime = endTime; - this.filePath = filePath; - this.fileSize = fileSize; - this.fileName = fileName; - this.menuId = menuId; - this.td_end = td_end; - this.td_start = td_start; - } - - /** - * 编目id - */ - @Column(name = "menu_id") - private Integer menuId; - - /** - * 纬度 - */ - private String lat; - - /** - * 经度 - */ - private String lon; - - /** - * 速度 - */ - private Integer speed; - - /** - * 方向 - */ - private Integer direction; - - /** - * 数据源 - */ - private Integer locsource; - - /** - * 精度 - */ - private Integer coordinateerror; - - /** - * 创建时间 - */ - @Column(name = "create_time") - private Date createTime; - - /** - * 设备ID - */ - @Column(name = "deviceId") - private String deviceid; - - /** - * 偏移经度 - */ - private Integer encrylongitude; - - /** - * 偏移纬度 - */ - private Integer enccrylatitude; - - /** - * 点集wkt点位 - */ - private String points; - - /** - * 标志 - */ - private Boolean flag; - - /** - * linkID - */ - private String linkid; - - /** - * 用户ID - */ - @Column(name = "user_id") - private Integer userId; - - /** - * 唯一标识 - */ - private Integer id; - - /** - * 审批人 - */ - private String approver; - - /** - * 审批时间 - */ - @Column(name = "approve_time") - private Date approveTime; - - /** - * 时间数组(时间段) - */ - private String[] timeRange; - - /** - * 开始时间 - */ - private String startTimeCompare; - - /** - * 结束时间 - */ - private String endTimeCompare; - - /** - * 轨迹开始时间 - */ - @Column(name = "start_time") - private Date startTime; - - /** - * 轨迹结束时间 - */ - @Column(name = "end_time") - private Date endTime; - - /** - * 数据文件路径 - */ - @Column(name = "file_path") - private String filePath; - - /** - * 数据文件大小 - */ - @Column(name = "file_size") - private String fileSize; - - /** - * 审批状态 - */ - private String status; - - /** - * 数据标识 - */ - @Column(name = "file_config") - private String fileConfig; - - /** - * 文件名字 - */ - @Column(name = "file_name") - private String fileName; - - /** - * 数据所属时间 - */ - @Column(name = "file_time") - private String fileTime; - - /** - * 数据描述 - */ - private String description; - - /** - * 安全等级 - */ - private String security; - - /** - * 提交用户姓名 - */ - @Column(name = "submitor") - private String submitor; - - /** - * 今日开始时间td_start - */ - private String td_start; - - /** - * 今日结束时间td_end - */ - private String td_end; - - /** - * 获取时间数组(时间段) - * - * @return timeRange - 时间数组(时间段) - */ - public String[] getTimeRange() { - return timeRange; - } - - /** - * 设置时间数组(时间段) - * - * @param timeRange 时间数组(时间段) - */ - public void setTimeRange(String[] timeRange) { - this.timeRange = timeRange; - } - - /** - * 获取开始时间 - * - * @return startTimeCompare - 开始时间 - */ - public String getStartTimeCompare() { - return startTimeCompare; - } - - /** - * 设置开始时间 - * - * @param startTimeCompare 开始时间 - */ - public void setStartTimeCompare(String startTimeCompare) { - this.startTimeCompare = startTimeCompare; - } - - /** - * 获取结束时间 - * - * @return endTimeCompare - 结束时间 - */ - public String getEndTimeCompare() { - return endTimeCompare; - } - - /** - * 设置结束时间 - * - * @param endTimeCompare 结束时间 - */ - public void setEndTimeCompare(String endTimeCompare) { - this.endTimeCompare = endTimeCompare; - } - - /** - * 获取今日开始时间 - * - * @return td_start - 今日开始时间 - */ - public String getTd_start() { - return td_start; - } - - /** - * 设置今日开始时间 - * - * @param td_start 今日开始时间 - */ - public void setTd_start(String td_start) { - this.td_start = td_start; - } - - /** - * 获取今日结束时间 - * - * @return td_end - 今日结束时间 - */ - public String getTd_end() { - return td_end; - } - - /** - * 设置今日结束时间 - * - * @param td_end 今日结束时间 - */ - public void setTd_end(String td_end) { - this.td_end = td_end; - } - - /** - * 获取纬度 - * - * @return lat - 纬度 - */ - public String getLat() { - return lat; - } - - /** - * 设置纬度 - * - * @param lat 纬度 - */ - public void setLat(String lat) { - this.lat = lat == null ? null : lat.trim(); - } - - /** - * 获取经度 - * - * @return lon - 经度 - */ - public String getLon() { - return lon; - } - - /** - * 设置经度 - * - * @param lon 经度 - */ - public void setLon(String lon) { - this.lon = lon == null ? null : lon.trim(); - } - - /** - * 获取速度 - * - * @return speed - 速度 - */ - public Integer getSpeed() { - return speed; - } - - /** - * 设置速度 - * - * @param speed 速度 - */ - public void setSpeed(Integer speed) { - this.speed = speed; - } - - /** - * 获取方向 - * - * @return direction - 方向 - */ - public Integer getDirection() { - return direction; - } - - /** - * 设置方向 - * - * @param direction 方向 - */ - public void setDirection(Integer direction) { - this.direction = direction; - } - - /** - * 获取数据源 - * - * @return locSource - 数据源 - */ - public Integer getLocsource() { - return locsource; - } - - /** - * 设置数据源 - * - * @param locsource 数据源 - */ - public void setLocsource(Integer locsource) { - this.locsource = locsource; - } - - /** - * 获取精度 - * - * @return coordinateError - 精度 - */ - public Integer getCoordinateerror() { - return coordinateerror; - } - - /** - * 设置精度 - * - * @param coordinateerror 精度 - */ - public void setCoordinateerror(Integer coordinateerror) { - this.coordinateerror = coordinateerror; - } - - /** - * 获取创建时间 - * - * @return create_time - 创建时间 - */ - public Date getCreateTime() { - return createTime; - } - - /** - * 设置创建时间 - * - * @param createTime 创建时间 - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - /** - * 获取设备ID - * - * @return deviceId - 设备ID - */ - public String getDeviceid() { - return deviceid; - } - - /** - * 设置设备ID - * - * @param deviceid 设备ID - */ - public void setDeviceid(String deviceid) { - this.deviceid = deviceid == null ? null : deviceid.trim(); - } - - /** - * 获取偏移经度 - * - * @return encryLongitude - 偏移经度 - */ - public Integer getEncrylongitude() { - return encrylongitude; - } - - /** - * 设置偏移经度 - * - * @param encrylongitude 偏移经度 - */ - public void setEncrylongitude(Integer encrylongitude) { - this.encrylongitude = encrylongitude; - } - - /** - * 获取偏移纬度 - * - * @return enccryLatitude - 偏移纬度 - */ - public Integer getEnccrylatitude() { - return enccrylatitude; - } - - /** - * 设置偏移纬度 - * - * @param enccrylatitude 偏移纬度 - */ - public void setEnccrylatitude(Integer enccrylatitude) { - this.enccrylatitude = enccrylatitude; - } - - /** - * 获取点集wkt点位 - * - * @return points - 点集wkt点位 - */ - public String getPoints() { - return points; - } - - /** - * 设置点集wkt点位 - * - * @param points 点集wkt点位 - */ - public void setPoints(String points) { - this.points = points == null ? null : points.trim(); - } - - /** - * 获取标志 - * - * @return flag - 标志 - */ - public Boolean getFlag() { - return flag; - } - - /** - * 设置标志 - * - * @param flag 标志 - */ - public void setFlag(Boolean flag) { - this.flag = flag; - } - - /** - * 获取linkID - * - * @return linkID - linkID - */ - public String getLinkid() { - return linkid; - } - - /** - * 设置linkID - * - * @param linkid linkID - */ - public void setLinkid(String linkid) { - this.linkid = linkid == null ? null : linkid.trim(); - } - - /** - * 获取用户ID - * - * @return userId - 用户ID - */ - public Integer getUserId() { - return userId; - } - - /** - * 设置用户ID - * - * @param userId 用户ID - */ - public void setUserId(Integer userId) { - this.userId = userId; - } - - /** - * 获取唯一标识 - * - * @return id - 唯一标识 - */ - public Integer getId() { - return id; - } - - /** - * 设置唯一标识 - * - * @param id 唯一标识 - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 获取审批人 - * - * @return approver - 审批人 - */ - public String getApprover() { - return approver; - } - - /** - * 设置审批人 - * - * @param approver 审批人 - */ - public void setApprover(String approver) { - this.approver = approver == null ? null : approver.trim(); - } - - /** - * 获取审批时间 - * - * @return approve_time - 审批时间 - */ - public Date getApproveTime() { - return approveTime; - } - - /** - * 设置审批时间 - * - * @param approveTime 审批时间 - */ - public void setApproveTime(Date approveTime) { - this.approveTime = approveTime; - } - - /** - * 获取审批状态 - * - * @return status - 审批状态 - */ - public String getStatus() { - return status; - } - - /** - * 设置审批状态 - * - * @param status 审批状态 - */ - public void setStatus(String status) { - this.status = status == null ? null : status.trim(); - } - - /** - * 获取数据标识 - * - * @return file_config - 数据标识 - */ - public String getFileConfig() { - return fileConfig; - } - - /** - * 设置数据标识 - * - * @param fileConfig 数据标识 - */ - public void setFileConfig(String fileConfig) { - this.fileConfig = fileConfig == null ? null : fileConfig.trim(); - } - - /** - * 获取数据所属时间 - * - * @return file_time - 数据所属时间 - */ - public String getFileTime() { - return fileTime; - } - - /** - * 设置数据所属时间 - * - * @param fileTime 数据所属时间 - */ - public void setFileTime(String fileTime) { - this.fileTime = fileTime == null ? null : fileTime.trim(); - } - - /** - * 获取数据描述 - * - * @return description - 数据描述 - */ - public String getDescription() { - return description; - } - - /** - * 设置数据描述 - * - * @param description 数据描述 - */ - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } - - /** - * 获取安全等级 - * - * @return security - 安全等级 - */ - public String getSecurity() { - return security; - } - - /** - * 设置安全等级 - * - * @param security 安全等级 - */ - public void setSecurity(String security) { - this.security = security == null ? null : security.trim(); - } - - /** - * 获取提交用户姓名 - * - * @return submitor - 提交用户姓名 - */ - public String getSubmitor() { - return submitor; - } - - /** - * 设置提交用户姓名 - * - * @param submitor 提交用户姓名 - */ - public void setSubmitor(String submitor) { - this.submitor = submitor == null ? null : submitor.trim(); - } - - /** - * 获取文件数据大小 - * - * @return file_size - 文件数据大小 - */ - public String getFileSize() { - return fileSize; - } - - /** - * 设置文件数据大小 - * - * @param fileSize 文件数据大小 - */ - public void setFileSize(String fileSize) { - this.fileSize = fileSize; - } - - - /** - * 获取文件数据路径 - *

- * file_path 文件数据路径 - */ - public String getFilePath() { - return filePath; - } - - /** - * 设置文件数据路径 - * - * @param filePath 文件数据大小 - */ - public void setFilePath(String filePath) { - this.filePath = filePath; - } - - /** - * 获取轨迹数据结束时间 - *

- * end_Time 轨迹数据结束时间 - */ - public Date getEndTime() { - return endTime; - } - - /** - * 设置轨迹数据结束时间 - * - * @param endTime 轨迹数据结束时间 - */ - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - /** - * 获取轨迹数据开始时间 - *

- * start_Time 轨迹数据开始时间 - */ - public Date getStartTime() { - return startTime; - } - - - /** - * 设置轨迹数据开始时间 - * - * @param startTime 轨迹数据开始时间 - */ - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - /** - * 获取文件数据名称 - *

- * file_name 文件数据名称 - */ - public String getFileName() { - return fileName; - } - - /** - * 设置文件数据名称 - * - * @param fileName 文件数据名称 - */ - public void setFileName(String fileName) { - this.fileName = fileName; - } - - /** - * 编目id - * - * @return menuId 编目id - */ - public Integer getMenuId() { - return menuId; - } - - /** - * 设置编目id - * - * @param menuId 编目id - */ - public void setMenuId(Integer menuId) { - this.menuId = menuId; - } - - -} diff --git a/src/main/java/com/cetc32/dh/entity/DemandSubmit.java b/src/main/java/com/cetc32/dh/entity/DemandSubmit.java deleted file mode 100644 index 044f8dba62515b2ab982f7eeba82698ac9079d03..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/DemandSubmit.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.cetc32.dh.entity; - -import org.springframework.util.StringUtils; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; - -public class DemandSubmit extends NumberS{ - private Integer id; - - private String projectName; - - private String demandName; - - private String demandDes; - - private String status; - - private String reporter; - - private Integer departmentid; - - private String approver; - - private Date approceTime; - - private String getEndtimeFront; - - private String getApproveFront; - - private String areachoice; - - private Date creattime; - - - public String getGetEndtimeFront() { - return getEndtimeFront; - } - - public void setGetEndtimeFront(String getEndtimeFront) { - this.getEndtimeFront = getEndtimeFront; - } - - public String getGetApproveFront() { - return getApproveFront; - } - - public void setGetApproveFront(String getApproveFront) { - this.getApproveFront = getApproveFront; - } - - private Date endtime; - - private String demandClassify; - - private String demandAttachment; - - private String area; - - private String areaname; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public String getDemandName() { - return demandName; - } - - public void setDemandName(String demandName) { - this.demandName = demandName; - } - - public String getDemandDes() { - return demandDes; - } - - public void setDemandDes(String demandDes) { - this.demandDes = demandDes; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getReporter() { - return reporter; - } - - public void setReporter(String reporter) { - this.reporter = reporter; - } - - public Integer getDepartmentid() { - return departmentid; - } - - public void setDepartmentid(Integer departmentid) { - this.departmentid = departmentid; - } - - public String getApprover() { - return approver; - } - - public void setApprover(String approver) { - this.approver = approver; - } - - public Date getApproceTime() { - return approceTime; - } - - public void setApproceTime(Date approceTime) { - this.approceTime = approceTime; - } - - public Date getEndtime() throws Exception{ - return endtime; - } - - public void setEndtime(Date endtime) { -// if(!StringUtils.isEmpty(endtime)){ -// DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); -// String endDateStr=df.format(endtime); -// endtime = df.parse(endDateStr); -// } - - this.endtime = endtime; - } - - public String getDemandClassify() { - return demandClassify; - } - - public void setDemandClassify(String demandClassify) { - this.demandClassify = demandClassify; - } - - public String getDemandAttachment() { - return demandAttachment; - } - - public void setDemandAttachment(String demandAttachment) { - this.demandAttachment = demandAttachment; - } - - public String getAreachoice() { - return areachoice; - } - - public void setAreachoice(String areachoice) { - this.areachoice = areachoice; - } - - public Date getCreattime() { - return creattime; - } - - public void setCreattime(Date creattime) { - this.creattime = creattime; - } - - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getAreaname() { - return areaname; - } - - public void setAreaname(String areaname) { - this.areaname = areaname; - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/entity/EstimateTask.java b/src/main/java/com/cetc32/dh/entity/EstimateTask.java deleted file mode 100644 index c442787a6d116e67f4327e25494122bf4430931e..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/EstimateTask.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.cetc32.dh.entity; - -import java.util.Date; -import java.util.List; - -public class EstimateTask extends NumberS{ - private Integer id; - - private String name; - - private String taskClassify; - - private String taskType; - - private String taskPath; - - private String starttimefront; - - private String endtimefront; - - private Date starttime; - - private Date endtime; - - private String creator; - - private String creattimefront; - - private Date creattime; - - private String status; - - private String approver; - - private Integer demandid; - - private List frontyear; - - private Date approvtime; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getTaskClassify() { - return taskClassify; - } - - public void setTaskClassify(String taskClassify) { - this.taskClassify = taskClassify; - } - - public String getTaskType() { - return taskType; - } - - public void setTaskType(String taskType) { - this.taskType = taskType; - } - - public String getTaskPath() { - return taskPath; - } - - public void setTaskPath(String taskPath) { - this.taskPath = taskPath; - } - - public Date getStarttime() { - return starttime; - } - - public void setStarttime(Date starttime) { - this.starttime = starttime; - } - - public Date getEndtime() { - return endtime; - } - - public void setEndtime(Date endtime) { - this.endtime = endtime; - } - - public String getCreator() { - return creator; - } - - public void setCreator(String creator) { - this.creator = creator; - } - - public Date getCreattime() { - return creattime; - } - - public void setCreattime(Date creattime) { - this.creattime = creattime; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getApprover() { - return approver; - } - - public void setApprover(String approver) { - this.approver = approver; - } - - public Integer getDemandid() { - return demandid; - } - - public void setDemandid(Integer demandid) { - this.demandid = demandid; - } - - public String getStarttimefront() { - return starttimefront; - } - - public void setStarttimefront(String starttimefront) { - this.starttimefront = starttimefront; - } - - public String getEndtimefront() { - return endtimefront; - } - - public void setEndtimefront(String endtimefront) { - this.endtimefront = endtimefront; - } - - public String getCreattimefront() { - return creattimefront; - } - - public void setCreattimefront(String creattimefront) { - this.creattimefront = creattimefront; - } - - public List getFrontyear() { - return frontyear; - } - - public void setFrontyear(List frontyear) { - this.frontyear = frontyear; - } - - public Date getApprovtime() { - return approvtime; - } - - public void setApprovtime(Date approvtime) { - this.approvtime = approvtime; - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/entity/Options.java b/src/main/java/com/cetc32/dh/entity/Options.java deleted file mode 100644 index 117675322662e50a19a8fd275bff8285d14f2dce..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/Options.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.entity; - -import javax.persistence.Column; -import javax.persistence.Id; - -/** - * 数据管理Options实体类 - * - * @author: xiao - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -public class Options { - /** - * 自增id - */ - @Id - private Integer id; - - /** - * 名称 - */ - @Column(name = "value_name") - private String valueName; - - /** - * 名称值 - */ - private String value; - - /** - * 数据类别 - */ - private String category; - - /** - * 获取自增id - * - * @return id - */ - public Integer getId() { - return id; - } - - /** - * 设置自增id - * - * @param id - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 获取名称 - * - * @return valueName 名称 - */ - public String getValueName() { - return valueName; - } - - /** - * 设置名称 - * - * @param valueName 名称 - */ - public void setValueName(String valueName) { - this.valueName = valueName == null ? null : valueName.trim(); - } - - /** - * 获取名称值 - * - * @return value 名称值 - */ - public String getValue() { - return value; - } - - /** - * 设置名称值 - * - * @param value 名称值 - */ - public void setValue(String value) { - this.value = value == null ? null : value.trim(); - } - - /** - * 获取数据类别 - * - * @return category 数据类别 - */ - public String getCategory() { - return category; - } - - /** - * 设置数据类别 - * - * @param category 数据类别 - */ - public void setCategory(String category) { - this.category = category == null ? null : category.trim(); - } -} diff --git a/src/main/java/com/cetc32/dh/entity/Organization.java b/src/main/java/com/cetc32/dh/entity/Organization.java deleted file mode 100644 index 0edf636dc6690c108e2056c8a6d2a48f6534d5c8..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/Organization.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cetc32.dh.entity; - -public class Organization extends NumberS{ - private Integer id; - - private String name; - - private String description; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/entity/Productdemand.java b/src/main/java/com/cetc32/dh/entity/Productdemand.java deleted file mode 100644 index cbd799ca4e6606dd0ea015cdb8e8ea0e10bc55f4..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/Productdemand.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.cetc32.dh.entity; - -import java.util.Date; -import java.util.List; - -public class Productdemand extends NumberS{ - private Integer id; - - private String name; - - private String demandClassify; - - private Date demandyear; - - private String taskdocument; //修改数据库，对应区域（region)字段 - - private String starttimefront; - - private String endtimefront; - - private Date starttime; - - private Date endtime; - - private String status; - - private String approver; - - private Integer demandid; - - private String creator; - - private List fronttime; - - private String flowresult; - - private Date creattime; - - private Date approvtime; - - private String area; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDemandClassify() { - return demandClassify; - } - - public void setDemandClassify(String demandClassify) { - this.demandClassify = demandClassify; - } - - public Date getDemandyear() { - return demandyear; - } - - public void setDemandyear(Date demandyear) { - this.demandyear = demandyear; - } - - public String getTaskdocument() { - return taskdocument; - } - - public void setTaskdocument(String taskdocument) { - this.taskdocument = taskdocument; - } - - public Date getStarttime() { - return starttime; - } - - public void setStarttime(Date starttime) { - this.starttime = starttime; - } - - public Date getEndtime() { - return endtime; - } - - public void setEndtime(Date endtime) { - this.endtime = endtime; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getApprover() { - return approver; - } - - public void setApprover(String approver) { - this.approver = approver; - } - - public Integer getDemandid() { - return demandid; - } - - public void setDemandid(Integer demandid) { - this.demandid = demandid; - } - - public String getCreator() { - return creator; - } - - public void setCreator(String creator) { - this.creator = creator; - } - - public String getStarttimefront() { - return starttimefront; - } - - public void setStarttimefront(String starttimefront) { - this.starttimefront = starttimefront; - } - - public String getEndtimefront() { - return endtimefront; - } - - public void setEndtimefront(String endtimefront) { - this.endtimefront = endtimefront; - } - - - public List getFronttime() { - return fronttime; - } - - public void setFronttime(List fronttime) { - this.fronttime = fronttime; - } - - public String getFlowresult() { - return flowresult; - } - - public void setFlowresult(String flowresult) { - this.flowresult = flowresult; - } - - public Date getCreattime() { - return creattime; - } - - public void setCreattime(Date creattime) { - this.creattime = creattime; - } - - public Date getApprovtime() { - return approvtime; - } - - public void setApprovtime(Date approvtime) { - this.approvtime = approvtime; - } - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/entity/SysInfo.java b/src/main/java/com/cetc32/dh/entity/SysInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..c1684248c10bc0e3385949f0512a5ceb9c276676 --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/SysInfo.java @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/7 上午10:14 + ******************************************************************************/ +package com.cetc32.dh.entity; + +import java.util.HashMap; + +public class SysInfo extends BaseSysInfo{ + String pCode; + public SysInfo(){ + + } + public SysInfo(String pCode, String sysName, String url){ + this.url = url; + this.sysName = sysName; + this.pCode = pCode; + this.sysCode = pCode.substring(0,4); + + } + public String getpCode() { + return pCode; + } + + public void setpCode(String pCode) { + this.pCode = pCode; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + +} diff --git a/src/main/java/com/cetc32/dh/entity/SystemVisitLog.java b/src/main/java/com/cetc32/dh/entity/SystemVisitLog.java new file mode 100644 index 0000000000000000000000000000000000000000..8363fdf1ef407eebe0df8788e904e603f79de642 --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/SystemVisitLog.java @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/6/11 上午10:48 + ******************************************************************************/ +package com.cetc32.dh.entity; + +import java.sql.Date; + +public class SystemVisitLog { + String userName; + String sysCode; + Date logTime; + Integer total = 0; + + public SystemVisitLog(){ + + } + + public SystemVisitLog(String sysCode,String userName,Date logTime){ + this.logTime = logTime; + this.sysCode = sysCode; + this.userName = userName; + this.total = 1; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getSysCode() { + return sysCode; + } + + public void setSysCode(String sysCode) { + this.sysCode = sysCode; + } + + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } +} diff --git a/src/main/java/com/cetc32/dh/entity/UserVisit.java b/src/main/java/com/cetc32/dh/entity/UserVisit.java new file mode 100644 index 0000000000000000000000000000000000000000..0e9b8a3d81f80631fb455932ae22b62ef8186ba8 --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/UserVisit.java @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/6/10 下午3:30 + ******************************************************************************/ +package com.cetc32.dh.entity; + +public class UserVisit extends BaseSysInfo{ + + String userName; + Integer visit = 0; + + + + public UserVisit(){ + } + + public UserVisit(String syscode,String userName){ + this.sysCode = syscode; + this.userName = userName; + this.visit = 1; + } + + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public Integer getVisit() { + if(null == visit) + return 0; + return visit; + } + + public void setVisit(Integer visit) { + this.visit = visit; + } + +} diff --git a/src/main/java/com/cetc32/dh/entity/vDemand.java b/src/main/java/com/cetc32/dh/entity/vDemand.java deleted file mode 100644 index ff1ddee3d48716feaa69e2d6a01768f727b90faf..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/vDemand.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.cetc32.dh.entity; - - -import org.apache.commons.lang3.StringUtils; - -import java.util.Date; - -public class vDemand { - public String classify; - public String name; - public String people; - public String starttime; - public String endtime; - - public String status; - - public Date sqlstarttime; - - public Date sqlendtime; - - - public String getTd_start() { - return td_start; - } - - public void setTd_start(String td_start) { - this.td_start = td_start; - } - - /** - * 今日开始时间td_start - */ - private String td_start; - - public String getTd_end() { - return td_end; - } - - public void setTd_end(String td_end) { - this.td_end = td_end; - } - - /** - * 今日结束时间td_end - */ - private String td_end; - - public Date getSqlstarttime() { - return sqlstarttime; - } - - public void setSqlstarttime(Date sqlstarttime) { - this.sqlstarttime = sqlstarttime; - } - - public Date getSqlendtime() { - return sqlendtime; - } - - public void setSqlendtime(Date sqlendtime) { - this.sqlendtime = sqlendtime; - } - - public String getClassify() { - if(StringUtils.isBlank(classify)) - return null; - return classify; - } - - public void setClassify(String classify) { - if(StringUtils.isNotBlank(classify)) - this.classify = classify; - } - - public String getName() { - if(StringUtils.isBlank(name)) - return null; - return name; - } - - public void setName(String name) { - if(StringUtils.isNotBlank(name)) - this.name = name; - } - - public String getPeople() { - if(StringUtils.isBlank(people)) - return null; - return people; - } - - public void setPeople(String people) { - if(StringUtils.isNotBlank(people)) - this.people = people; - } - - public String getStarttime() { - if(StringUtils.isBlank(starttime)) - return null; - return starttime; - } - - public void setStarttime(String starttime) { - if(StringUtils.isNotBlank(starttime)) - this.starttime = starttime; - } - - public String getEndtime() { - if(StringUtils.isBlank(endtime)) - return null; - return endtime; - } - - public void setEndtime(String endtime) { - if(StringUtils.isNotBlank(endtime)) - this.endtime = endtime; - } - - public String getStatus() { - if(StringUtils.isBlank(status)) - return null; - return status; - } - - public void setStatus(String status) { - if(StringUtils.isNotBlank(status)) - this.status = status; - } -} diff --git a/src/main/java/com/cetc32/dh/entity/vEstimate.java b/src/main/java/com/cetc32/dh/entity/vEstimate.java deleted file mode 100644 index 20b16c19c3d582c94b3d0057ca151ca721f2107d..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/vEstimate.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.cetc32.dh.entity; - -import org.apache.commons.lang3.StringUtils; - -public class vEstimate { - public String classify; - public String name; - public String astatus; - public String creator; - - public String getTd_start() { - return td_start; - } - - public void setTd_start(String td_start) { - this.td_start = td_start; - } - - /** - * 今日开始时间td_start - */ - private String td_start; - - public String getTd_end() { - return td_end; - } - - public void setTd_end(String td_end) { - this.td_end = td_end; - } - - /** - * 今日结束时间td_end - */ - private String td_end; - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - private String message; - - public String getClassify() { - if(StringUtils.isBlank(classify)) - return null; - return classify; - } - - public void setClassify(String classify) { - if(StringUtils.isNotBlank(classify)) - this.classify = classify; - } - - public String getName() { - if(StringUtils.isBlank(name)) - return null; - return name; - } - - public void setName(String name) { - if(StringUtils.isNotBlank(name)) - this.name = name; - } - - public String getStatus() { - if(StringUtils.isBlank(astatus)) - return null; - return astatus; - } - - public void setStatus(String status) { - if(StringUtils.isNotBlank(status)) - this.astatus = status; - } - - public String getAstatus() { - if(StringUtils.isBlank(astatus)) - return null; - return astatus; - } - - public void setAstatus(String astatus) { - if(StringUtils.isNotBlank(astatus)) - this.astatus = astatus; - } - - public String getCreator() { - if(StringUtils.isBlank(creator)) - return null; - return creator; - } - - public void setCreator(String creator) { - if(StringUtils.isNotBlank(creator)) - this.creator = creator; - } -} diff --git a/src/main/java/com/cetc32/dh/entity/vProduct.java b/src/main/java/com/cetc32/dh/entity/vProduct.java deleted file mode 100644 index 24d92d8502d279e1e21f15ef8def2ff0981b2f07..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/entity/vProduct.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.cetc32.dh.entity; - -import org.apache.commons.lang3.StringUtils; - -public class vProduct { - public String classify; - public String name; - public String astatus; - public String creator; - - public String getTd_start() { - return td_start; - } - - public void setTd_start(String td_start) { - this.td_start = td_start; - } - - /** - * 今日开始时间td_start - */ - private String td_start; - - public String getTd_end() { - return td_end; - } - - public void setTd_end(String td_end) { - this.td_end = td_end; - } - - /** - * 今日结束时间td_end - */ - private String td_end; - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - private String message; - - - public String getClassify() { - if(StringUtils.isBlank(classify)) - return null; - return classify; - } - - public void setClassify(String classify) { - if(StringUtils.isNotBlank(classify)) - this.classify = classify; - } - - public String getName() { - if(StringUtils.isBlank(name)) - return null; - return name; - } - - public void setName(String name) { - if(StringUtils.isNotBlank(name)) - this.name = name; - } - - public String getStatus() { - if(StringUtils.isBlank(astatus)) - return null; - return astatus; - } - - public void setStatus(String status) { - if(StringUtils.isNotBlank(status)) - this.astatus = status; - } - - public String getAstatus() { - if(StringUtils.isBlank(astatus)) - return null; - return astatus; - } - - public void setAstatus(String astatus) { - if(StringUtils.isNotBlank(astatus)) - this.astatus = astatus; - } - - public String getCreator() { - if(StringUtils.isBlank(creator)) - return null; - return creator; - } - - public void setCreator(String creator) { - if(StringUtils.isNotBlank(creator)) - this.creator = creator; - } -} diff --git a/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java b/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java new file mode 100644 index 0000000000000000000000000000000000000000..85e35fe5d7de2f4526a786192ba9d55ab2da9cfe --- /dev/null +++ b/src/main/java/com/cetc32/dh/listener/ContainerStartedListener.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/10 下午4:44 + ******************************************************************************/ +package com.cetc32.dh.listener; + +import com.cetc32.dh.entity.AreaCommon; +import com.cetc32.dh.service.AreaCommonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import java.util.List; +/** + * 容器初始化完成后加载数据 + * **/ +@Component +@Order +public class ContainerStartedListener implements ApplicationRunner { + @Autowired + AreaCommonService areaCommonService; + + private static List areas; + + public static List getAreas() { + return areas; + } + + @Override + public void run(ApplicationArguments args) throws Exception { + if(areaCommonService !=null){ + areas =areaCommonService.selectAll(); + } + } +} diff --git a/src/main/java/com/cetc32/dh/service/OptionsService.java b/src/main/java/com/cetc32/dh/mybatis/ActiveUserMapper.java similarity index 33% rename from src/main/java/com/cetc32/dh/service/OptionsService.java rename to src/main/java/com/cetc32/dh/mybatis/ActiveUserMapper.java index cf884a91b35847ea78443121db8ccb2904d588af..d69950c50555ca7e82176a9d99ce057cdc9b6d13 100644 --- a/src/main/java/com/cetc32/dh/service/OptionsService.java +++ b/src/main/java/com/cetc32/dh/mybatis/ActiveUserMapper.java @@ -1,29 +1,20 @@ /******************************************************************************* + * Copyright（C） CETC-32 * @Description： - * @Author ：肖小霞 + * @Author ：徐文远 * @version：1.0 - * @date ： 2021/1/21 下午4:45 + * @date ： 2021/4/15 下午4:27 ******************************************************************************/ -package com.cetc32.dh.service; +package com.cetc32.dh.mybatis; -import com.cetc32.dh.entity.Options; +import com.cetc32.dh.entity.ActiveUser; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; -/** - * @Title: OptionsService - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -public interface OptionsService { - - /** - * 根据数据类别查找数据 - * - * @param category 数据类别 - * @return 返回查询结果 - */ - public List selectByCategory(String category); +@Repository +public interface ActiveUserMapper { + List listByCateLimit(@Param("limit") Integer limit,ActiveUser activeUser); + public void insertStatistic(ActiveUser activeUser); } diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java index 8e30d1b2eaf26348a5630ac17ef3eab5d6255e5b..191d265fbaa2d096173c00a665f8baa63ecc3107 100644 --- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java @@ -8,6 +8,7 @@ package com.cetc32.dh.mybatis; import com.cetc32.dh.beans.ResultUserRole; +import com.cetc32.dh.beans.StatisticBean; import com.cetc32.dh.entity.BaseAdminRole; import com.cetc32.dh.entity.NumberS; import org.springframework.stereotype.Repository; @@ -26,11 +27,13 @@ public interface BaseAdminRoleMapper extends MyMapper { List getAllRoles(NumberS number); List getRoleList(); + List geALLRoleList(); ResultUserRole findRoleByID(Integer id); int addRole(BaseAdminRole baseAdminRole); ResultUserRole findRoleByName(String roleName); int countRoles(); int updateRole(BaseAdminRole baseAdminRole); int delRoleByID(Integer id); + ListcountByRole(); -} \ No newline at end of file +} diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java index 534282a47a423041dd2553e59a3aaaa656b060be..38a8c6135c348b00e785f16476033b01d5a8f0af 100644 --- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java @@ -13,8 +13,11 @@ import com.cetc32.dh.dto.AdminUserDTO; import com.cetc32.dh.dto.UserSearchDTO; import com.cetc32.dh.entity.BaseAdminUser; import org.apache.ibatis.annotations.Param; +import org.omg.PortableInterceptor.INACTIVE; import org.springframework.stereotype.Repository; import tk.mapper.MyMapper; + +import java.util.Date; import java.util.List; /** @@ -31,11 +34,6 @@ public interface BaseAdminUserMapper extends MyMapper { int deleteInfo(@Param("id") Integer id); - List findUserByCondition(BaseAdminUser user); - - Integer countUserByCondition(BaseAdminUser user); - - List getUserList(UserSearchDTO userSearchDTO); BaseAdminUser getUserByUserName(@Param("sysUserName") String sysUserName, @Param("id") Integer id); @@ -43,16 +41,32 @@ public interface BaseAdminUserMapper extends MyMapper { int updateUser(BaseAdminUser user); - int countUserByCondition(@Param("offset") Integer offset, @Param("limit") Integer limit,@Param("user") BaseAdminUser user); + int updatePwd(@Param("userName") String userName, @Param("password") String password); + BaseAdminUser findByUserName(@Param("userName") String userName); BaseAdminUser findByUserNameAll(@Param("userName") String userName); + List findUserByCondition(BaseAdminUser user); - int updatePwd(@Param("userName") String userName, @Param("password") String password); + Integer countUserByCondition(BaseAdminUser user); - List getUserRole(@Param("roleId") Integer roleId); BaseAdminUser queryById(Integer id); -} \ No newline at end of file + List getAllUserList(); + + Integer getLoginUser(); + + Integer getWebLoginCount(); + + Integer getAppLoginCount(); + + Integer failedCount(); + + int updateLogin(BaseAdminUser user); + + Integer getAppLoginUser(); + + Integer countActiveUserBetween(@Param("startTime") Date startTime,@Param("endTime") Date endTime); +} diff --git a/src/main/java/com/cetc32/dh/mybatis/CityMapper.java b/src/main/java/com/cetc32/dh/mybatis/CityMapper.java deleted file mode 100644 index d206ad8191b7b147a61eda082af9f004cedc5762..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/CityMapper.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.City; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; -import tk.mybatis.mapper.common.Mapper; -import java.util.List; - -/** - * 数据管理地理信息mapper类 - * @author: 肖小霞 - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -@Repository -public interface CityMapper extends Mapper { - - /** - * 判断多边形polygon2是否在多边形polygon1中 - * - * @return 返回判断结果 - * 备注:无 - */ - public Boolean judgePolygonContain(@Param("polygon1") String polygon1, @Param("polygon2") String polygon2); - - /** - * 判断某个点是否在一个面中 - * - * @return 返回判断结果 - * 备注:无 - */ - public Boolean judgePointContain(@Param("point") String point, @Param("polygon") String polygon); - - /** - * 根据citycode查询记录 - * - * @return 返回查询结果 - * 备注:无 - */ - public List selectByCityCode(String id); - -} diff --git a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java deleted file mode 100644 index ee5d2451ac073423d68d8fde4be728cb02ccde1f..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java +++ /dev/null @@ -1,140 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.DataFile; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; -import tk.mybatis.mapper.common.Mapper; - -import java.util.Date; -import java.util.List; - -/** - * @Title: DataFileMapper - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Repository -public interface DataFileMapper extends Mapper { - - /** - * 统计所有的文件数据个数 - * - * @return 返回统计结果 - */ - public Integer countAll(); - - /** - * 插入一个文件数据 - * - * @param dataFile 文件数据 - * @return 返回插入结果 - */ - public Integer insertOne(DataFile dataFile); - - - /** - * 成果数据上报 - * - * @param dataFile - * @return Integer - */ - public Integer insertGain(DataFile dataFile); - - /** - * 更新一个文件数据 - * - * @param dataFile 文件数据 - * @return 返回更新结果 - */ - public Integer updateById(DataFile dataFile); - - /** - * 根据id查询文件数据 - * - * @param id 文件id - * @return 返回查询结果 - */ - public DataFile queryById(Long id); - - /** - * 根据时间查询文件数据 - * - * @param time 文件时间 - * @return 返回查询结果 - */ - public List queryByTime(Date time); - - /** - * 根据区域查询文件数据 - * - * @param region 文件所属区域 - * @return 返回查询结果 - */ - public List queryByRegion(String region); - - /** - * 根据安全等级查询文件数据 - * - * @param fileSecurity 文件安全等级 - * @return 返回查询结果 - */ - public List queryAllByFileSecurity(String fileSecurity); - - /** - * 根据安状态和用户查询文件数据 - * - * @param dataFile 文件数据 - * @return 返回查询结果 - */ - public List selectByStatusAndUser(DataFile dataFile); - - /** - * 根据安全状态和用户统计文件数据 - * - * @param dataFile 文件数据 - * @return 返回统计结果 - */ - public Integer countByStatusAndUser(DataFile dataFile); - - /** - * 根据输入条件查询文件数据 - * - * @param offset 偏移量 - * @param limit 每页显示条数 - * @param dataFile 文件数据 - * @return 返回查询结果 - */ - public List queryFilesByObj(@Param("offset") Integer offset, @Param("limit") Integer limit, DataFile dataFile); - - /** - * 根据输入条件统计文件数据量 - * - * @param dataFile 文件数据 - * @return 返回统计结果 - */ - public Integer countFilesByObj(@Param("dataFile") DataFile dataFile); - - /** - * 根据id删除一个文件数据 - * - * @param id 文件id - * @return 返回删除结果 - */ - public Integer deleteById(Long id); - - /** - * 删除编目menuId下的所有文件数据 - * - * @param menuId 编目id - * @return 返回删除结果 - */ - public Integer deleteByMenuId(Integer menuId); -} diff --git a/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java deleted file mode 100644 index ecb6d5eebbaccd3ed967d3320775d60670d3e272..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java +++ /dev/null @@ -1,91 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.DataMenu; -import org.springframework.stereotype.Repository; -import tk.mybatis.mapper.common.Mapper; -import java.util.List; - -/** - * @Title: DataMenuMapper - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Repository -public interface DataMenuMapper extends Mapper { - - /** - * 统计所有的编目数据个数 - * - * @return 返回统计结果 - */ - public Integer countAll(); - - /** - * 插入一个编目数据 - * - * @param dataMenu 编目数据 - * @return 返回插入结果 - */ - public Integer insertOne(DataMenu dataMenu); - - /** - * 更新一个编目数据 - * - * @param dataMenu 编目数据 - * @return 返回更新结果 - */ - public Integer updateById(DataMenu dataMenu); - - /** - * 根据id查询编目数据 - * - * @param id 编目id - * @return 返回查询结果 - */ - public DataMenu queryById(Long id); - - /** - * 根据id删除一个编目数据 - * - * @param id 编目id - * @return 返回删除结果 - */ - public Integer deleteById(Long id); - - /** - * 查询所有父节点为pid的编目数据 - * - * @param pid 编目父节点pid - * @return 返回查询结果 - */ - public DataMenu queryByPid(Long pid); - - /** - * 查询所有编目数据 - * - * @return 返回查询结果 - */ - public List selectAll(); - - /** - * 查询所有以id为父节点的编目数据 - * - * @return 返回查询结果 - */ - public List queryByPIdSatisfyId(Long id); - - /** - * 查询编目键为key编目数据 - * - * @return 返回查询结果 - */ - public DataMenu queryByKey(String key); -} diff --git a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java deleted file mode 100644 index 6312b48c88ff3d12c3d5850f81a38c0f46821516..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java +++ /dev/null @@ -1,128 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.beans.DataCollected; -import com.cetc32.dh.entity.DataPlp; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; -import tk.mybatis.mapper.common.Mapper; -import java.util.Date; -import java.util.List; - -/** - * @Title: DataPlpMapper - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Repository -public interface DataPlpMapper extends Mapper { - - /** - * 统计所有的点线面数据个数 - * - * @return 返回统计结果 - */ - public Integer countAll(); - - /** - * 插入一个点线面数据 - * - * @param dataPlp 插入的点线面数据 - * @return 返回是否插入成功 - */ - public Integer insertOne(DataPlp dataPlp); - - - public Integer insertCollected(DataCollected data); - - - public List selectPloygon(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("polygon") String polygon); - - /** - * 根据id更新点线面数据记录 - * - * @param dataPlp 点线面数据 - * @return 返回是否更新成功 - */ - public Integer updateById(DataPlp dataPlp); - - /** - * 根据id删除一个点线面数据记录 - * - * @param id 点线面数据的id - * @return 返回是否删除成功 - */ - public Integer deleteById(Integer id); - - /** - * 根据id查询点线面数据记录 - * - * @param id 点线面数据的id - * @return 返回查询结果 - */ - public DataPlp queryById(Integer id); - - /** - * 根据时间查询点线面数据 - * - * @param time 时间 - * @return 返回查询结果 - */ - public List queryByTime(Date time); - - /** - * 根据区域查询点线面数据记录 - * - * @param region 区域 - * @return 返回查询结果 - */ - public List queryByRegion(String region); - - /** - * 根据安全等级查询点线面数据记录 - * - * @param security 安全等级 - * @return 返回查询结果 - */ - public List queryAllByFileSecurity(String security); - - /** - * 根据状态和审批用户查询点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - public List selectByStatusAndUser(DataPlp dataPlp); - - /** - * 统计满足状态和审批用户条件的点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - public Integer countByStatusAndUser(DataPlp dataPlp); - - /** - * 根据输入的条件动态查询点线面数据 - * - * @param offset 偏移量 - * @param limit 每页显示的条数 - * @return 返回查询结果 - */ - public List queryFilesByObj(@Param("offset") Integer offset, @Param("limit") Integer limit, DataPlp dataPlp); - - /** - * 根据输入的条件动态统计查询的点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - public Integer countFilesByObj(@Param("dataPlp") DataPlp dataPlp); -} diff --git a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java deleted file mode 100644 index 7b1cc40315040fc015d9399ced61b651a999a5ff..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * @Title: 数据库接口文件 - * @author: 徐文远 - * @version: 1.0 - * @date: 2020/10/16 - * 备注:无 - */ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.DataSubmit; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface DataSubmitMapper { - /** - * 插入一个提交记录 - * @param dataSubmit 插入的数据集合 - * @return 反馈是否插入成功 - * */ - Integer insertOne(DataSubmit dataSubmit); - - /** - * 根据ID 更新提交的信息 - * @param dataSubmit 更新的数据集合 - * @return 反馈是否更新成功 - * */ - Integer updateById(DataSubmit dataSubmit); - - /** - * 根据ID 更新提交的信息 - * @param dataSubmit 更新的数据集合，通常dataSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据 - * */ - List selectMine(DataSubmit dataSubmit); - - /** - * 根据当前用户统计所有任务个数 - * @param dataSubmit 通常dataSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据个数 - * */ - Integer countMine(DataSubmit dataSubmit); - - /** - * 根据当前用户统计所有任务个数 - * @param dataSubmit 通常dataSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据个数 - * */ - Integer countByStatusAndUser(DataSubmit dataSubmit); - - /** - * 根据当前用户统计所有任务个数 - * @param ds 通常dataSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据记录 - * */ - List selectByStatusAndUser(DataSubmit ds); - - DataSubmit queryById(Integer id); -} diff --git a/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java deleted file mode 100644 index 631607f5e7351be9a6c2828d58c78246bca1b226..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java +++ /dev/null @@ -1,122 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.DataTrace; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; -import tk.mybatis.mapper.common.Mapper; -import java.util.Date; -import java.util.List; - -/** - * @Title: DataTraceMapper - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Repository -public interface DataTraceMapper extends Mapper { - - /** - * 统计所有的文件数据个数 - * - * @return 返回统计结果 - */ - public Integer countAll(); - - /** - * 插入一个轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回插入结果 - */ - public Integer insertOne(DataTrace dataTrace); - - /** - * 更新一个轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回更新结果 - */ - public Integer updateById(DataTrace dataTrace); - - /** - * 删除一个轨迹数据 - * - * @param id 轨迹数据id - * @return 返回删除结果 - */ - public Integer deleteById(Integer id); - - /** - * 根据id查询轨迹数据 - * - * @param id 轨迹id - * @return 返回查询结果 - */ - public DataTrace queryById(Integer id); - - /** - * 根据时间查询轨迹数据 - * - * @param time 轨迹数据时间 - * @return 返回查询结果 - */ - public List queryByTime(Date time); - - /** - * 根据区域查询轨迹数据 - * - * @param region 轨迹数据所属区域 - * @return 返回查询结果 - */ - public List queryByRegion(String region); - - /** - * 根据安全等级查询轨迹数据 - * - * @param security 轨迹数据安全等级 - * @return 返回查询结果 - */ - public List queryAllByFileSecurity(String security); - - /** - * 根据安状态和用户查询轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回查询结果 - */ - public List selectByStatusAndUser(DataTrace dataTrace); - - /** - * 根据安全状态和用户统计轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回统计结果 - */ - public Integer countByStatusAndUser(DataTrace dataTrace); - - /** - * 根据输入条件查询轨迹数据 - * - * @param offset 偏移量 - * @param limit 每页显示条数 - * @param dataTrace 轨迹数据 - * @return 返回查询结果 - */ - public List queryFilesByObj(@Param("offset") Integer offset, @Param("limit") Integer limit, DataTrace dataTrace); - - /** - * 根据输入条件查询轨迹数据个数 - * - * @param dataTrace 轨迹数据 - * @return 返回查询结果 - */ - public Integer countFilesByObj(@Param("dataTrace") DataTrace dataTrace); -} diff --git a/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java deleted file mode 100644 index 3e656c78dcf7ab6e4ad4cadb2c721c16933c4bb2..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cetc32.dh.mybatis; - - - -import com.cetc32.dh.dto.DemandSubmitDTO; -import com.cetc32.dh.entity.DemandSubmit; -import com.cetc32.dh.entity.vDemand; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface DemandSubmitMapper { - - List findAll(); - - int deleteByPrimaryKey(Integer id); - - int insert(DemandSubmit record); - - int insertSelective(DemandSubmit record); - - DemandSubmit selectByPrimaryKey(Integer id); - - List selectByLimit(@Param("offset") Integer offset,@Param("limit") Integer limit); - - int countDemand(); - - int updateByPrimaryKeySelective(DemandSubmit record); - - int updateByPrimaryKey(DemandSubmit record); - - List findByKeyWord(String keyword); - - /** - * 根据ID 更新提交的信息 - * @param name 更新的数据集合，通常demandSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据 - * */ - List selectMine(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常demandSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据个数 - * */ - Integer countMine(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param demandSubmit 通常demandSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据个数 - * */ - Integer countByStatusAndUser(DemandSubmit demandSubmit); - - /** - * 根据当前用户统计所有任务个数 - * @param demandSubmit 通常demandSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据记录 - * */ - List selectByStatusAndUser(DemandSubmit demandSubmit); - - List queryFilesByObj(vDemand vdemand); - - List searchbystatus(DemandSubmitDTO demandSubmitDTO); -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java b/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java index 12d4441396f3e44c1b892400c4e55e0abc79c39d..252093a480af228fd6a7bc42e8e44be5d8d088bc 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java @@ -1,5 +1,6 @@ package com.cetc32.dh.mybatis; +import com.cetc32.dh.beans.StatisticBean; import com.cetc32.dh.entity.Department; import com.cetc32.dh.entity.NumberS; import org.apache.ibatis.annotations.Param; @@ -36,4 +37,6 @@ public interface DepartmentMapper extends MyMapper { int updateByPrimaryKey(Department record); List findByKeyWord(String keyword); + + List countByDepartment(); } diff --git a/src/main/java/com/cetc32/dh/mybatis/EstimateTaskMapper.java b/src/main/java/com/cetc32/dh/mybatis/EstimateTaskMapper.java deleted file mode 100644 index 0113b164f25e02eafb71fdfbf7948b61bbbce482..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/EstimateTaskMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.cetc32.dh.mybatis; - - -import com.cetc32.dh.entity.EstimateTask; -import com.cetc32.dh.entity.vEstimate; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface EstimateTaskMapper { - - List findAll(); - int deleteByPrimaryKey(Integer id); - - int insert(EstimateTask record); - - int insertSelective(EstimateTask record); - - - - EstimateTask selectByPrimaryKey(Integer id); - - List selectByLimit(@Param("offset") Integer offset,@Param("limit") Integer limit); - - int countEstimate(); - - - int updateByPrimaryKeySelective(EstimateTask record); - - int updateByPrimaryKey(EstimateTask record); - - List findByKeyWord(String keyword); - - /** - * 根据ID 更新提交的信息 - * @param name 更新的数据集合，通常demandSubmit一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据 - * */ - List selectMine(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常estimateTask一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据个数 - * */ - Integer countMine(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param estimateTask 通常estimateTask一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据个数 - * */ - Integer countByStatusAndUser(EstimateTask estimateTask); - - /** - * 根据当前用户统计所有任务个数 - * @param estimateTask 通常estimateTask一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据记录 - * */ - List selectByStatusAndUser(EstimateTask estimateTask); - - List queryFilesByObj(vEstimate vestimate); - - List allservice(String classify); - - List alltaskclassify(); -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java b/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java deleted file mode 100644 index 21e249a43a5b290a19a68386bd8a9b5d544fee6c..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.Organization; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface OrganizationMapper { - - List findall(); - - int deleteByPrimaryKey(Integer id); - - int insert(Organization record); - - int insertSelective(Organization record); - - List selectByLimit(@Param("offset") Integer offset,@Param("limit") Integer limit); - - Organization selectByPrimaryKey(Integer id); - - int countOrganization(); - - int updateByPrimaryKeySelective(Organization record); - - int updateByPrimaryKey(Organization record); - List findByKeyWord(String keyword); -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/ProductdemandMapper.java b/src/main/java/com/cetc32/dh/mybatis/ProductdemandMapper.java deleted file mode 100644 index 3adee90f56ce0f0321f0e5cbb5cb46dbcb3e80a8..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/mybatis/ProductdemandMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.Productdemand; -import com.cetc32.dh.entity.vProduct; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface ProductdemandMapper { - - List findAll(); - - int deleteByPrimaryKey(Integer id); - - int insert(Productdemand record); - - int insertSelective(Productdemand record); - - Productdemand selectByPrimaryKey(Integer id); - - List selectByLimit(@Param("offset") Integer offset,@Param("limit") Integer limit); - - int countProduct(); - - int updateByPrimaryKeySelective(Productdemand record); - - int updateByPrimaryKey(Productdemand record); - - List findByKeyWord(String keyword); - - /** - * 根据ID 更新提交的信息 - * @param name 更新的数据集合，通常productdemand一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据 - * */ - List selectMine(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常productdemand一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据个数 - * */ - Integer countMine(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param productdemand 通常productdemand一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据个数 - * */ - Integer countByStatusAndUser(Productdemand productdemand); - - /** - * 根据当前用户统计所有任务个数 - * @param productdemand 通常productdemand一次查询只包含submitor或者approver中的一个。 - * @return 反馈查询到的数据记录 - * */ - List selectByStatusAndUser(Productdemand productdemand); - - List queryFilesByObj(vProduct vproduct); -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/SysInfoMapper.java b/src/main/java/com/cetc32/dh/mybatis/SysInfoMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..7dcc455f437e1d22c5ada3bb6d15cf3ec7ecf3f0 --- /dev/null +++ b/src/main/java/com/cetc32/dh/mybatis/SysInfoMapper.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/7 上午11:13 + ******************************************************************************/ +package com.cetc32.dh.mybatis; + +import com.cetc32.dh.entity.SysInfo; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface SysInfoMapper { + public List selectAll(); + public void insertOrUpdateSysinfo(SysInfo sysInfo); + public List selectAllAppsInCodes(@Param("sysCode") String sysCodes + ,@Param("limit") Integer limit + ,@Param("offset")Integer offset + ,@Param("keyWord")String keyWord); + public Integer countAllAppsInCodes(@Param("sysCode") String sysCodes + ,@Param("keyWord")String keyWord); +} diff --git a/src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java b/src/main/java/com/cetc32/dh/mybatis/SystemVisitMapper.java similarity index 40% rename from src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java rename to src/main/java/com/cetc32/dh/mybatis/SystemVisitMapper.java index 5eae6111c323dd74dc9a6055b529be021071a710..5d4151d42b3953c887aadf955e3a52392e8d421b 100644 --- a/src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/SystemVisitMapper.java @@ -1,33 +1,22 @@ /******************************************************************************* + * Copyright（C） CETC-32 * @Description： - * @Author ：肖小霞 + * @Author ：徐文远 * @version：1.0 - * @date ： 2021/1/21 下午4:45 + * @date ： 2021/5/7 上午11:13 ******************************************************************************/ package com.cetc32.dh.mybatis; -import com.cetc32.dh.entity.Options; + +import com.cetc32.dh.entity.SystemVisitLog; +import com.cetc32.dh.entity.UserVisit; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import tk.mybatis.mapper.common.Mapper; import java.util.List; -/** - * @Title: OptionsMapper - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ @Repository -public interface OptionsMapper extends Mapper { - - /** - * 根据数据类别查找数据 - * - * @param category 数据类别 - * @return 返回查询结果 - */ - public List selectByCategory(String category); - +public interface SystemVisitMapper { + public void insertOrUpdateSystemVisit(SystemVisitLog sysInfo); + public List selectLatest7Days(@Param("userName") String userName); } diff --git a/src/main/java/com/cetc32/dh/mybatis/UserVisitMapper.java b/src/main/java/com/cetc32/dh/mybatis/UserVisitMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..5f58ee3abc063e17aa3e78ea23fa73938892ca96 --- /dev/null +++ b/src/main/java/com/cetc32/dh/mybatis/UserVisitMapper.java @@ -0,0 +1,23 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/7 上午11:13 + ******************************************************************************/ +package com.cetc32.dh.mybatis; + + +import com.cetc32.dh.entity.UserVisit; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface UserVisitMapper { + public List selectAll(); + public void insertOrUpdateUserVisit(UserVisit sysInfo); + public List selectHotSysByUser(@Param("limit") Integer limit ,@Param("username")String userName); + public Long countAllAppAccess(); +} diff --git a/src/main/java/com/cetc32/dh/scheduler/TriggerTask.java b/src/main/java/com/cetc32/dh/scheduler/TriggerTask.java new file mode 100644 index 0000000000000000000000000000000000000000..992a01c108915886892a1391283abe0f9cc49dc3 --- /dev/null +++ b/src/main/java/com/cetc32/dh/scheduler/TriggerTask.java @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description：定时任务类 + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/4/14 下午4:21 + ******************************************************************************/ +package com.cetc32.dh.scheduler; + +import com.cetc32.dh.common.utils.DateUtils; +import com.cetc32.dh.entity.BaseAdminUser; +import com.cetc32.dh.service.ActiveUserService; +import com.cetc32.dh.service.AdminUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.temporal.TemporalField; +import java.util.Date; + +@Configuration +@EnableScheduling +public class TriggerTask { + @Autowired + ActiveUserService activeUserService; + /** + * 每天凌晨执行任务，任务内容定时统计当天所有登陆过的用户 + * **/ + @Scheduled(cron="0 0 0 * * ? ") + public void collectDayActiveUser(){ + Date dateEnd = DateUtils.floorDay(new Date()); + Date dateStart= DateUtils.minusDay(dateEnd,1); + activeUserService.insertActiveUserLogDay(dateStart,dateEnd); + } + @Scheduled(cron="0 0 0/1 * * ? ") + public void collectHourActiveUser(){ + Date dateEnd =DateUtils.floorHour(new Date()); + Date dateStart= DateUtils.minusHour(dateEnd,1); + //dateStart.setTime(dateStart.getTime()- dateStart.getTime()%(2*60*60*1000l)); + activeUserService.insertActiveUserLogHour(dateStart,dateEnd); + } + /*@Scheduled(cron="0 0/1 * * * ? ") + public void test(){ + *//*Date dateEnd =DateUtils.floorHour(new Date()); + Date dateStart= DateUtils.minusHour(dateEnd,1); + //dateStart.setTime(dateStart.getTime()- dateStart.getTime()%(2*60*60*1000l)); + activeUserService.insertActiveUserLogHour(dateStart,dateEnd);*//* + System.out.println("Scheduled 正点"); + }*/ +} diff --git a/src/main/java/com/cetc32/dh/service/ActiveUserService.java b/src/main/java/com/cetc32/dh/service/ActiveUserService.java new file mode 100644 index 0000000000000000000000000000000000000000..08935c0f6d8eed6ed7cd9355e85ccb6ca774b31c --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/ActiveUserService.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/4/15 上午11:27 + ******************************************************************************/ +package com.cetc32.dh.service; + +import com.cetc32.dh.entity.ActiveUser; + +import java.util.Date; +import java.util.List; + +public interface ActiveUserService { + /** + * @parm limit 获取最近limit天活跃数字 + * @return 返回数据列表 + * */ + public List listActiveUser(Integer limit,String cate); + /** + * 插入指定日期活跃用户 + * @param startTime 起始时间 + * @param endTime 结束时间 + * */ + public void insertActiveUserLogDay(Date startTime, Date endTime); + /** + * 获取并更新特定时间 + * @param startTime 起始时间 + * @param endTime 结束时间 + * */ + public void insertActiveUserLogHour(Date startTime, Date endTime); +} diff --git a/src/main/java/com/cetc32/dh/service/AdminPermissionService.java b/src/main/java/com/cetc32/dh/service/AdminPermissionService.java deleted file mode 100644 index 915f0b33f0cbc503eb498e5ae07405c0c8f46539..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/AdminPermissionService.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @Description: 用户权限 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.service; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import com.cetc32.dh.entity.BaseAdminUser; -import java.util.List; -import java.util.Map; - -/** - * @Title: AdminPermissionService - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/30 9:44 - */ -public interface AdminPermissionService { - - Map addPermission(BaseAdminPermission permission); - - Map updatePermission(BaseAdminPermission permission); - - PageDataResult getPermissionList(Integer pageNum, Integer pageSize); - - List parentPermissionList(); - - Map del(long id); - - BaseAdminPermission getById(Object id); - - Map getUserPerms(BaseAdminUser user); - -} diff --git a/src/main/java/com/cetc32/dh/service/AdminRoleService.java b/src/main/java/com/cetc32/dh/service/AdminRoleService.java index 608d28a437278d46b0a3d7ca24c3fc8808deddf4..355f4a4001ad52a317fe291ee95546575a6c57ed 100644 --- a/src/main/java/com/cetc32/dh/service/AdminRoleService.java +++ b/src/main/java/com/cetc32/dh/service/AdminRoleService.java @@ -7,6 +7,7 @@ package com.cetc32.dh.service; * 更改描述： */ import com.cetc32.dh.beans.ResultUserRole; +import com.cetc32.dh.beans.StatisticBean; import com.cetc32.dh.entity.BaseAdminRole; import com.cetc32.dh.entity.NumberS; @@ -37,4 +38,6 @@ public interface AdminRoleService { int addRole(BaseAdminRole baseAdminRole); + List countByRole(); + } diff --git a/src/main/java/com/cetc32/dh/service/AdminUserService.java b/src/main/java/com/cetc32/dh/service/AdminUserService.java index eb6035417644d792b83418b7dc746964ce70fc9e..8ec8e05ad39fb740c1bbe2c66099a47060fb2524 100644 --- a/src/main/java/com/cetc32/dh/service/AdminUserService.java +++ b/src/main/java/com/cetc32/dh/service/AdminUserService.java @@ -25,9 +25,6 @@ import java.util.Map; */ public interface AdminUserService { - PageDataResult getUserList(UserSearchDTO userSearch, Integer pageNum, Integer pageSize); - - Map addUser(BaseAdminUser user); int insertUser(BaseAdminUser user); @@ -49,9 +46,17 @@ public interface AdminUserService { int delUser(Integer id, Integer status); - Map recoverUser(Integer id, Integer status); + List getAllUserList(); + + Integer getLoginUser(); + + Integer getWebLoginCount(); + + Integer getAppLoginCount(); + + Integer failedCount(); - PageDataResult getUserRole(Integer roleId,Integer pageNum, Integer pageSize); + int updateLogin(BaseAdminUser user); - BaseAdminUser queryById(Integer id); + Integer getAppLoginUser(); } diff --git a/src/main/java/com/cetc32/dh/service/CityService.java b/src/main/java/com/cetc32/dh/service/CityService.java deleted file mode 100644 index 8bfc334a79414adf5afd4ab36d5e6a7eb6d1913e..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/CityService.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service; - -import com.cetc32.dh.entity.City; -import java.util.List; - -/** - * @Title: CityService - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -public interface CityService { - - /** - * 判断多边形polygon2是否在多边形polygon1中 - * - * @return 返回判断结果 - * 备注:无 - */ - public Boolean judgePolygonContain(String polygon1, String polygon2); - - /** - * 判断某个点是否在一个面中 - * - * @return 返回判断结果 - * 备注:无 - */ - public Boolean judgePointContain(String point, String polygon); - - /** - * 根据citycode查询记录 - * - * @return 返回查询结果 - * 备注:无 - */ - public List selectByCityCode(String id); - - -} diff --git a/src/main/java/com/cetc32/dh/service/DataFileService.java b/src/main/java/com/cetc32/dh/service/DataFileService.java deleted file mode 100644 index e22d5731436b8f9edb69eb39955c1b6bc687436e..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/DataFileService.java +++ /dev/null @@ -1,138 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service; - -import com.cetc32.dh.entity.DataFile; - -import java.util.Date; -import java.util.List; - -/** - * @Title: DataFileService - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -public interface DataFileService { - - /** - * 统计所有的文件数据个数 - * - * @return 返回统计结果 - */ - public Integer count(); - - /** - * 插入一个文件数据 - * - * @param dataFile 文件数据 - * @return 返回插入结果 - */ - public Integer insertDataFile(DataFile dataFile); - - public Integer insertGain(DataFile dataFile); - - /** - * 更新一个文件数据 - * - * @param dataFile 文件数据 - * @return 返回更新结果 - */ - public Integer updatebyId(DataFile dataFile); - - /** - * 根据id删除一个文件数据 - * - * @param id 文件id - * @return 返回删除结果 - */ - public Integer deleteById(Long id); - - /** - * 根据id查询文件数据 - * - * @param id 文件id - * @return 返回查询结果 - */ - public DataFile queryById(Long id); - - /** - * 根据时间查询文件数据 - * - * @param time 文件时间 - * @return 返回查询结果 - */ - public List queryByTime(Date time); - - /** - * 根据区域查询文件数据 - * - * @param region 文件所属区域 - * @return 返回查询结果 - */ - public List queryByRegion(String region); - - /** - * 根据安全等级查询文件数据 - * - * @param fileSecurity 文件安全等级 - * @return 返回查询结果 - */ - public List queryAllByFileSecurity(String fileSecurity); - - /** - * 根据安状态和用户查询文件数据 - * - * @param dataFile 文件数据 - * @return 返回查询结果 - */ - public List selectByStatusAndUser(DataFile dataFile); - - /** - * 根据安全状态和用户统计文件数据 - * - * @param dataFile 文件数据 - * @return 返回统计结果 - */ - public Integer countByStatusAndUser(DataFile dataFile); - - /** - * 根据输入条件查询文件数据 - * - * @param offset 偏移量 - * @param limit 每页显示条数 - * @param dataFile 文件数据 - * @return 返回查询结果 - */ - public List queryFilesByObj(Integer offset, Integer limit, DataFile dataFile); - - /** - * 根据输入条件统计文件数据量 - * - * @param dataFile 文件数据 - * @return 返回统计结果 - */ - public Integer countFilesByObj(DataFile dataFile); - - /** - * 删除编目menuId下的所有文件数据 - * - * @param menuId 编目id - * @return 返回删除结果 - */ - public Integer deleteByMenuId(Integer menuId); - -// /** -// * 根据时间和状态（提交或审批） -// * @param date 日期 -// * @param status 状态 -// * @return 返回结果 -// * */ -// public Integer countTodayData(String date,String status); - -} diff --git a/src/main/java/com/cetc32/dh/service/DataMenuService.java b/src/main/java/com/cetc32/dh/service/DataMenuService.java deleted file mode 100644 index e990490304d3189dbb2387d1f4bcd2ed3de21b46..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/DataMenuService.java +++ /dev/null @@ -1,125 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service; - -import com.cetc32.dh.dto.DataMenuDTO; -import com.cetc32.dh.entity.DataMenu; - -import java.util.List; - -/** - * @Title: DataMenuService - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/13 11:19 - */ -public interface DataMenuService { - - /** - * 统计所有的编目数据个数 - * - * @return 返回统计结果 - */ - public Integer count(); - - /** - * 插入一个编目数据 - * - * @param dataMenu 编目数据 - * @return 返回插入结果 - */ - public Integer insertDataMenu(DataMenu dataMenu); - - /** - * 根据id查询编目数据 - * - * @param id 编目id - * @return 返回查询结果 - */ - public DataMenu queryById(Long id); - - /** - * 根据id删除一个编目数据 - * - * @param id 编目id - * @return 返回删除结果 - */ - public Integer deleteById(Long id); - - /** - * 根据父节点pid查询编目 - * - * @param pid 父节点 - * @return 返回查询结果 - */ - public DataMenu queryByPid(Long pid); - - /** - * 查询所有以id为父节点的编目 - * - * @param id 编目id - * @return 返回查询结果 - */ - public List queryByPIdSatisfyId(Long id); - - /** - * 更新编目数据 - * - * @param dataMenu 编目数据 - * @return 返回更新结果 - */ - public Integer updatebyId(DataMenu dataMenu); - - /** - * 查询编目id节点下的编目树信息 - * - * @param id 编目id - * @return 返回查询结果 - */ - public DataMenuDTO getMenuTree(Long id); - - /** - * 删除编目id下的树 - * - * @param id 编目id - * @return 返回删除结果 - */ - public Integer deleteMenuTree(Long id); - - /** - * 新增一个编目数据 - * - * @param dataMenu 编目数据 - * @return 返回新增结果 - */ - public String addDataMenu(DataMenu dataMenu); - - /** - * 查询所有的编目数据 - * - * @return 返回查询结果 - */ - public List selectAll(); - - - /** - * 统计编目id下子树中所有节点的数目 - * - * @param id 编目id - * @return 返回统计结果 - */ - public Integer countMenuChild(Long id); - - /** - * 查询编目键为key编目数据 - * - * @return 返回查询结果 - */ - public DataMenu queryByKey(String key); - -} diff --git a/src/main/java/com/cetc32/dh/service/DataPlpService.java b/src/main/java/com/cetc32/dh/service/DataPlpService.java deleted file mode 100644 index e0441e6bf9f30e0513fd85d7b64e9e6601148f09..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/DataPlpService.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service; - -import com.cetc32.dh.beans.DataCollected; -import com.cetc32.dh.entity.DataPlp; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @Title: DataPlpService - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -public interface DataPlpService { - - - public Integer insertCollected(DataCollected data); - - - public List selectPloygon(Date startTime, Date endTime, String polygon); - - /** - * 统计所有的点线面数据个数 - * - * @return 返回统计结果 - */ - public Integer countAll(); - - /** - * 插入一个点线面数据 - * - * @param dataPlp 插入的点线面数据 - * @return 返回是否插入成功 - */ - public Integer insertOne(DataPlp dataPlp); - - /** - * 根据id更新点线面数据记录 - * - * @param dataPlp 点线面数据 - * @return 返回是否更新成功 - */ - public Integer updateById(DataPlp dataPlp); - - /** - * 根据id删除一个点线面数据记录 - * - * @param id 点线面数据的id - * @return 返回是否删除成功 - */ - public Integer deleteById(Integer id); - - /** - * 根据id查询点线面数据记录 - * - * @param id 点线面数据的id - * @return 返回查询结果 - */ - public DataPlp queryById(Integer id); - - /** - * 根据状态和审批用户查询点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - public List selectByStatusAndUser(DataPlp dataPlp); - - /** - * 统计满足状态和审批用户条件的点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - public Integer countByStatusAndUser(DataPlp dataPlp); - - /** - * 根据输入的条件动态查询点线面数据 - * - * @param offset 偏移量 - * @param limit 每页显示的条数 - * @return 返回查询结果 - */ - public List queryFilesByObj(@Param("offset") Integer offset, @Param("limit") Integer limit, DataPlp dataPlp); - - /** - * 根据输入的条件动态统计查询的点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - public Integer countFilesByObj(DataPlp dataPlp); - -} diff --git a/src/main/java/com/cetc32/dh/service/DataSubmitService.java b/src/main/java/com/cetc32/dh/service/DataSubmitService.java deleted file mode 100644 index e3ddb93b8a11943afa29763dfa082ae9e8ee9529..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/DataSubmitService.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * @Title: service层接口文件 - * @author: 徐文远 - * @version: 1.0 - * @date: 2020/10/16 - * 备注:无 - * 更改描述：无 - */ -package com.cetc32.dh.service; - -import com.cetc32.dh.entity.DataSubmit; -import java.util.List; - -public interface DataSubmitService { - /** - * 提交请求后数据插入操作 - * @param dataSubmit 更新到数库的数据 - * @return 反馈是否成功 - * **/ - public Integer insertDataSubmit(DataSubmit dataSubmit); - - /** - * 拒绝用户此时数据导入申请 - * @param ds 写入到数库的数据 - * @return 反馈是否成功 - * **/ - public Integer rejectSubmit(DataSubmit ds); - - /** - * 接受用户此时数据导入申请 - * @param ds 更新到数库的数据 - * @return 反馈是否成功 - * **/ - public Integer acceptSubmit(DataSubmit ds); - - /** - * 查询当前登陆用户提交的导入申请 - * @param dataSubmit 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectMySubmit(DataSubmit dataSubmit); - - /** - * 查询当前登陆用户的审批过的以及未审批的提交信息 - * @param dataSubmit 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectMyApprove(DataSubmit dataSubmit); - - /** - * 根据当前用户统计所有任务个数 - * @param dataSubmit 通常dataSubmit一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - * */ - Integer countMineSubmit(DataSubmit dataSubmit); - - /** - * 根据当前用户统计所有任务个数 - * @param dataSubmit 通常dataSubmit一次查询只包含approver。 - * @return 反馈查询到的数据个数 - * */ - Integer countMineApprov(DataSubmit dataSubmit); - - /** - * 查询当前登陆用户需要审批的提交信息 - * @param dataSubmit 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectReadyApprove(DataSubmit dataSubmit); - - /** - * 根据当前用户统计所有任务个数 - * @param dataSubmit 通常dataSubmit一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - * */ - Integer countReadyApprove(DataSubmit dataSubmit); - - DataSubmit queryById(Integer id); - -} diff --git a/src/main/java/com/cetc32/dh/service/DataTraceService.java b/src/main/java/com/cetc32/dh/service/DataTraceService.java deleted file mode 100644 index ccb770b60af77eacec6fe32fd430dd11ddc75064..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/DataTraceService.java +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service; - -import com.cetc32.dh.entity.DataTrace; -import org.apache.ibatis.annotations.Param; -import java.util.List; - -/** - * @Title: DataTraceService - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -public interface DataTraceService { - - /** - * 统计所有的文件数据个数 - * - * @return 返回统计结果 - */ - public Integer countAll(); - - /** - * 插入一个轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回插入结果 - */ - public Integer insertOne(DataTrace dataTrace); - - /** - * 更新一个轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回更新结果 - */ - public Integer updateById(DataTrace dataTrace); - - /** - * 更新一个轨迹数据 - * - * @param id 轨迹数据id - * @return 返回更新结果 - */ - public Integer deleteById(Integer id); - - /** - * 根据id查询轨迹数据 - * - * @param id 轨迹id - * @return 返回查询结果 - */ - public DataTrace queryById(Integer id); - - /** - * 根据安状态和用户查询轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回查询结果 - */ - public List selectByStatusAndUser(DataTrace dataTrace); - - /** - * 根据安全状态和用户统计轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回统计结果 - */ - public Integer countByStatusAndUser(DataTrace dataTrace); - - /** - * 根据输入条件查询文件数据 - * - * @param offset 偏移量 - * @param limit 每页显示条数 - * @param dataTrace 轨迹数据 - * @return 返回查询结果 - */ - public List queryFilesByObj(@Param("offset") Integer offset, @Param("limit") Integer limit, DataTrace dataTrace); - - /** - * 根据输入条件统计轨迹数据量 - * - * @param dataTrace 轨迹数据 - * @return 返回统计结果 - */ - public Integer countFilesByObj(DataTrace dataTrace); -} diff --git a/src/main/java/com/cetc32/dh/service/DemandSubmitService.java b/src/main/java/com/cetc32/dh/service/DemandSubmitService.java deleted file mode 100644 index 4b9cb475045a1d86ca2ba3ff147a867c8d312bd1..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/DemandSubmitService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.cetc32.dh.service; -import com.cetc32.dh.dto.DemandSubmitDTO; -import com.cetc32.dh.entity.DemandSubmit; -import com.cetc32.dh.entity.vDemand; - -import java.util.List; - -public interface DemandSubmitService { - public List findAll(); - public int deleteByPrimaryKey(Integer id); - public int insert(DemandSubmit demandSubmit); - public int insertSelective(DemandSubmit demandSubmit); - public DemandSubmit selectByPrimaryKey(Integer id); - public List selectByLimit(Integer offset,Integer limit); - public int countDemand(); - public int updateByPrimaryKeySelective(DemandSubmit demandSubmit); - public int updateByPrimaryKey(DemandSubmit demandSubmit); - public List findByKeyWord(String keyword); - - /** - * 查询当前登陆用户提交的导入申请 - * @param name 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectMySubmit(String name); - - /** - * 查询当前登陆用户的审批过的以及未审批的提交信息 - * @param name 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectMyApprove(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常demandSubmit一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - * */ - Integer countMineSubmit(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常demandSubmit一次查询只包含approver。 - * @return 反馈查询到的数据个数 - * */ - Integer countMineApprov(String name); - - /** - * 查询当前登陆用户需要审批的提交信息 - * @param demandSubmit 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectReadyApprove(DemandSubmit demandSubmit); - - /** - * 根据当前用户统计所有任务个数 - * @param demandSubmit 通常demandSubmit一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - * */ - Integer countReadyApprove(DemandSubmit demandSubmit); - - List queryFilesByObj(vDemand vdemand); - - List searchbystatus(DemandSubmitDTO demandSubmitDTO); -} diff --git a/src/main/java/com/cetc32/dh/service/DepartmentService.java b/src/main/java/com/cetc32/dh/service/DepartmentService.java index cd14c15e50a1648a19f48393663e237105931bfd..e734ea2d3b65739b4643e200227a79e1ba8c7c04 100644 --- a/src/main/java/com/cetc32/dh/service/DepartmentService.java +++ b/src/main/java/com/cetc32/dh/service/DepartmentService.java @@ -1,5 +1,6 @@ package com.cetc32.dh.service; +import com.cetc32.dh.beans.StatisticBean; import com.cetc32.dh.dto.CommonTreeDTO; import com.cetc32.dh.entity.Department; import com.cetc32.dh.entity.NumberS; @@ -25,4 +26,5 @@ public interface DepartmentService { public int updateByPrimaryKey(Department department); public List findByKeyWord(String keyword); public List getTreeList(Integer pid); + public List countByDeparment(); } diff --git a/src/main/java/com/cetc32/dh/service/EstimateTaskService.java b/src/main/java/com/cetc32/dh/service/EstimateTaskService.java deleted file mode 100644 index ad218495f943ea102850e66b05df6e493e429ee1..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/EstimateTaskService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.cetc32.dh.service; - - -import com.cetc32.dh.entity.EstimateTask; -import com.cetc32.dh.entity.vEstimate; - -import java.util.List; - -public interface EstimateTaskService { - public List findAll(); - public int deleteByPrimaryKey(Integer id); - public int insert(EstimateTask estimateTask); - public int insertSelective(EstimateTask estimateTask); - public EstimateTask selectByPrimaryKey(Integer id); - public List selectByLimit(Integer offset, Integer limit); - public int countEstimate(); - public int updateByPrimaryKeySelective(EstimateTask estimateTask); - public int updateByPrimaryKey(EstimateTask estimateTask); - public List findByKeyWord(String keyword); - - /** - * 查询当前登陆用户提交的导入申请 - * @param name 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectMySubmit(String name); - - /** - * 查询当前登陆用户的审批过的以及未审批的提交信息 - * @param name 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectMyApprove(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常estimateTask一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - * */ - Integer countMineSubmit(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常estimateTask一次查询只包含approver。 - * @return 反馈查询到的数据个数 - * */ - Integer countMineApprov(String name); - - /** - * 查询当前登陆用户需要审批的提交信息 - * @param estimateTask 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectReadyApprove(EstimateTask estimateTask); - - /** - * 根据当前用户统计所有任务个数 - * @param estimateTask 通常estimateTask一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - * */ - Integer countReadyApprove(EstimateTask estimateTask); - - List queryFilesByObj(vEstimate vestimate); - - List allservice(String classify); - - List alltaskclassify(); -} diff --git a/src/main/java/com/cetc32/dh/service/OrganizationService.java b/src/main/java/com/cetc32/dh/service/OrganizationService.java deleted file mode 100644 index e041e724788d6271fbd58f44fd3d12d13a1ff42e..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/OrganizationService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cetc32.dh.service; - -import com.cetc32.dh.entity.Organization; - -import java.util.List; - -public interface OrganizationService { - - public List findAll(); - - public int insert(Organization organization); - - public int insertSelectie(Organization organization); - - public Organization selectByPrimaryKey(Integer id); - - public List selectByLimit(Integer offset , Integer limit); - - public int countOrganization(); - - public int deleteByPrimaryKey(Integer id); - - public int updateByPrimaryKeySelective(Organization organization); - - public int updateByPrimaryKey(Organization organization); - - public List findByKeyWord(String keyword); - -} diff --git a/src/main/java/com/cetc32/dh/service/ProductdemandService.java b/src/main/java/com/cetc32/dh/service/ProductdemandService.java deleted file mode 100644 index af7c8cf71a0664e7c08ccb276c13b795f4e0c903..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/ProductdemandService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cetc32.dh.service; - -import com.cetc32.dh.entity.Productdemand; -import com.cetc32.dh.entity.vProduct; - -import java.util.List; -import java.util.Map; - -public interface ProductdemandService { - - public List findAll(); - public int deleteByPrimaryKey(Integer id); - public int insert(Productdemand productdemand); - public int insertSelective(Productdemand productdemand); - public Productdemand selectByPrimaryKey(Integer id); - public List selectByLimit(Integer offset, Integer limit); - public int countProduct(); - public int updateByPrimaryKeySelective(Productdemand record); - public int updateByPrimaryKey(Productdemand record); - public List findByKeyWord(String keyword); - - /** - * 查询当前登陆用户提交的导入申请 - * @param name 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectMySubmit(String name); - - /** - * 查询当前登陆用户的审批过的以及未审批的提交信息 - * @param name 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectMyApprove(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常productdemand一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - * */ - Integer countMineSubmit(String name); - - /** - * 根据当前用户统计所有任务个数 - * @param name 通常productdemand一次查询只包含approver。 - * @return 反馈查询到的数据个数 - * */ - Integer countMineApprov(String name); - - /** - * 查询当前登陆用户需要审批的提交信息 - * @param productdemand 待查询的数据 - * @return 反馈查询到的结果 - * **/ - public List selectReadyApprove(Productdemand productdemand); - - /** - * 根据当前用户统计所有任务个数 - * @param productdemand 通常productdemand一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - * */ - Integer countReadyApprove(Productdemand productdemand); - - List queryFilesByObj(vProduct vproduct); - - Map PackageData(List data); -} diff --git a/src/main/java/com/cetc32/dh/service/SysInfoService.java b/src/main/java/com/cetc32/dh/service/SysInfoService.java new file mode 100644 index 0000000000000000000000000000000000000000..6c4108e6824bddcd6fe296fb5dd78fb61676405c --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/SysInfoService.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/7 上午11:18 + ******************************************************************************/ +package com.cetc32.dh.service; + +import com.cetc32.dh.entity.SysInfo; +import com.cetc32.dh.entity.SystemVisitLog; +import com.cetc32.dh.entity.UserVisit; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SysInfoService { + List selectAll(); + void insertOrUpdate(List sysInfos); + void updateUserAccessCount(String sysCode); + List selectMyHotAppTop6(); + List selectMyHotApp(); + public Long countAllAppAccess(); + public List selectAllMyApps(Integer limit,Integer offset,String keyWord); + public Integer countAllMyApps(String keyWord); + public List selectLatest7Days(); +} diff --git a/src/main/java/com/cetc32/dh/service/impl/ActiveUserServiceIml.java b/src/main/java/com/cetc32/dh/service/impl/ActiveUserServiceIml.java new file mode 100644 index 0000000000000000000000000000000000000000..eff214cf0d9216b3b3b85ab4193c0a050969404d --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/impl/ActiveUserServiceIml.java @@ -0,0 +1,94 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/4/15 下午4:36 + ******************************************************************************/ +package com.cetc32.dh.service.impl; + +import com.cetc32.dh.common.utils.DateUtils; +import com.cetc32.dh.entity.ActiveUser; +import com.cetc32.dh.mybatis.ActiveUserMapper; +import com.cetc32.dh.mybatis.BaseAdminUserMapper; +import com.cetc32.dh.service.ActiveUserService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Service +public class ActiveUserServiceIml implements ActiveUserService { + @Autowired + BaseAdminUserMapper baseAdminUserMapper; + @Autowired + ActiveUserMapper activeUserMapper; + + + + /** + * 根据小时或者当天查询当前时间向下取整数后的时间之后登陆人数 + * @param limit + * @return 返回数据列表 + * @parm limit 获取最近limit天活跃数字 + */ + @Override + public List listActiveUser(Integer limit,String cate) { + if(limit<0 || StringUtils.isBlank(cate)) + return null; + ActiveUser user=null; + Date now =new Date(); + switch(cate){ + case "HOUR":user =new ActiveUser(DateUtils.floorHour(now), + baseAdminUserMapper.countActiveUserBetween(DateUtils.floorHour(now),DateUtils.ceilDay(now)), + cate) + ;break; + case "DAY":user =new ActiveUser(DateUtils.floorDay(now), + baseAdminUserMapper.countActiveUserBetween(DateUtils.floorDay(now),DateUtils.ceilDay(now)), + cate);break; + default:return null; + } + List activeUsers = new ArrayList<>(); + if(user!=null) + activeUsers.add(user); + activeUsers.addAll(activeUserMapper.listByCateLimit(limit,new ActiveUser(cate))); + activeUsers.sort((o1,o2)->o1.getLdate().getTime()= endTime.getTime()){ + System.out.println("无效的更新参数"); + return ; + } + + int total= baseAdminUserMapper.countActiveUserBetween(startTime,endTime); + ActiveUser aUser= new ActiveUser(startTime,total,category); + activeUserMapper.insertStatistic(aUser); + } +} diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java deleted file mode 100644 index 82f75dbb23c40d08b46aa430fa618cb3a7f19598..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java +++ /dev/null @@ -1,210 +0,0 @@ -/** - * @Description: 用户权限接口实现 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.utils.DateUtils; -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.mybatis.BaseAdminPermissionMapper; -import com.cetc32.dh.mybatis.BaseAdminRoleMapper; -import com.cetc32.dh.service.AdminPermissionService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @Title: AdminPermissionServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/13 9:44 - */ -@Service -public class AdminPermissionServiceImpl implements AdminPermissionService { - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private BaseAdminPermissionMapper permissionMapper; - - @Autowired - private BaseAdminRoleMapper roleMapper; - - /** - * 增加权限 - * @param permission - * @return Map - */ - @Override - public Map addPermission(BaseAdminPermission permission) { - Map data = new HashMap(); - try { - permission.setCreateTime(DateUtils.getCurrentDate()); - permission.setUpdateTime(DateUtils.getCurrentDate()); - permission.setDelFlag(1); - int result = permissionMapper.insert(permission); - if(result == 0){ - data.put("code",0); - data.put("msg","新增失败！"); - logger.error("权限[新增]，结果=新增失败！"); - return data; - } - data.put("code",1); - data.put("msg","新增成功！"); - logger.info("权限[新增]，结果=新增成功！"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("权限[新增]异常！", e); - return data; - } - return data; - } - - /** - * 更新权限 - * @param permission - * @return Map - */ - @Override - public Map updatePermission(BaseAdminPermission permission) { - Map data = new HashMap(); - try{ - permission.setUpdateTime(DateUtils.getCurrentDate()); - int result = permissionMapper.updatePermission(permission); - if(result == 0){ - data.put("code",0); - data.put("msg","更新失败！"); - logger.error("权限[更新]，结果=更新失败！"); - return data; - } - data.put("code",1); - data.put("msg","更新成功！"); - logger.info("权限[更新]，结果=更新成功！"); - }catch (Exception e) { - e.printStackTrace(); - logger.error("权限[更新]异常！", e); - return data; - } - return data; - } - - /** - * 获取权限列表 - * @param pageNum - * @param pageSize - * @return PageDataResult - */ - @Override - public PageDataResult getPermissionList(Integer pageNum, Integer pageSize) { - PageDataResult pageDataResult = new PageDataResult(); - PageHelper.startPage(pageNum, pageSize); - List permissions = permissionMapper.getPermissionList(); - - if(permissions.size() != 0){ - PageInfo pageInfo = new PageInfo<>(permissions); - pageDataResult.setList(permissions); - pageDataResult.setTotals((int) pageInfo.getTotal()); - } - return pageDataResult; - } - - /** - * 获取父类权限列表 - * @return List - */ - @Override - public List parentPermissionList() { - return permissionMapper.parentPermissionList(); - } - - /** - * 根据id删除权限 - * @param id - * @return Map - */ - @Override - public Map del(long id) { - Map data = new HashMap<>(); - try { - // 删除权限菜单 - int result = permissionMapper.deleteByPrimaryKey(id); - if(result == 0){ - data.put("code",0); - data.put("msg","删除失败"); - logger.error("删除失败"); - return data; - } - data.put("code",1); - data.put("msg","删除成功"); - logger.info("删除成功"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("删除权限菜单异常！", e); - } - return data; - } - - /** - * 根据id获取基本用户权限 - * @param id - * @return BaseAdminPermission - */ - @Override - public BaseAdminPermission getById(Object id) { - return permissionMapper.selectByPrimaryKey(id); - } - - /** - * 获取用户user的权限 - * @param user - * @return Map - */ - @Override - public Map getUserPerms(BaseAdminUser user) { - Map data = new HashMap<>(); - Set per = new HashSet(); - List roleId = Stream.of(user.getRoleId().split(",")).map(Integer::parseInt).collect(Collectors.toList()); - List rids=new ArrayList<>(); - for(Integer rid:roleId) - { -// Role role = roleMapper.selectByPrimaryKey(rid); -// String permissions = role.getPermissions(); -// rids.addAll(Arrays.asList(permissions.split(","))); - } - rids=rids.stream().distinct().collect(Collectors.toList()); - - if (rids.size()>0) { - List permissionList = new ArrayList <>(); - for (String id : rids) { - // 角色对应的权限数据 - BaseAdminPermission perm = permissionMapper.selectByPrimaryKey(id); - if (null != perm ) { - // 授权角色下所有权限 - PermissionDTO permissionDTO = new PermissionDTO(); - BeanUtils.copyProperties(perm,permissionDTO); - //获取子权限 - List childrens = permissionMapper.getPermissionListByPId(perm.getId()); - permissionDTO.setChildrens(childrens); - permissionList.add(permissionDTO); - } - } - data.put("perm",permissionList); - } - return data; - } -} diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java index 1fdb46f0f264ed343e4ce4525a6328d1a44ead93..0044e657e58023460c11b1e67b6394a6e26ebbae 100644 --- a/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java @@ -8,11 +8,13 @@ package com.cetc32.dh.service.impl; import com.cetc32.dh.beans.ResultUserRole; +import com.cetc32.dh.beans.StatisticBean; import com.cetc32.dh.entity.BaseAdminRole; import com.cetc32.dh.entity.NumberS; import com.cetc32.dh.mybatis.BaseAdminPermissionMapper; import com.cetc32.dh.mybatis.BaseAdminRoleMapper; import com.cetc32.dh.service.AdminRoleService; +import org.omg.CORBA.PUBLIC_MEMBER; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -105,6 +107,11 @@ public class AdminRoleServiceImpl implements AdminRoleService { return baseAdminRoleMapper.getAllRoles(number); } + @Override + public List countByRole() { + return baseAdminRoleMapper.countByRole(); + } + /** * 获取所有用户角色列表 * @return List diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java index 1a6b4e2c2ab6dbfea823cd6468cfbb1cbd109ab9..fba508de4e36a87a2bfe1ca300b9f5c5be98b666 100644 --- a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java @@ -18,6 +18,7 @@ import com.cetc32.dh.dto.UserSearchDTO; import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.entity.Department; +import com.cetc32.dh.listener.ContainerStartedListener; import com.cetc32.dh.mybatis.AreaCommonMapper; import com.cetc32.dh.mybatis.BaseAdminRoleMapper; import com.cetc32.dh.mybatis.BaseAdminUserMapper; @@ -25,6 +26,7 @@ import com.cetc32.dh.mybatis.DepartmentMapper; import com.cetc32.dh.service.AdminUserService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import io.swagger.models.auth.In; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -59,83 +61,13 @@ public class AdminUserServiceImpl implements AdminUserService { @Autowired private AreaCommonMapper areaCommonMapper; - /** - * 获取用户列表 - * @param pageNum - * @param pageSize - * @param userSearch - * @return PageDataResult - */ - @Override - public PageDataResult getUserList(UserSearchDTO userSearch, Integer pageNum, Integer pageSize) { - PageDataResult pageDataResult = new PageDataResult(); - PageHelper.startPage(pageNum, pageSize); - List baseAdminUsers = baseAdminUserMapper.getUserList(userSearch); - - if(baseAdminUsers.size() != 0){ - PageInfo pageInfo = new PageInfo<>(baseAdminUsers); - pageDataResult.setList(baseAdminUsers); - pageDataResult.setTotals((int) pageInfo.getTotal()); - } - - return pageDataResult; - } @Override public int insertUser(BaseAdminUser user) { return baseAdminUserMapper.insertUser(user); } - /** - * 增加用户 - * @param user - * @return Map - */ - @Override - public Map addUser(BaseAdminUser user) { - Map data = new HashMap(); - try { - BaseAdminUser old = baseAdminUserMapper.getUserByUserName(user.getSysUserName(),null); - if(old != null){ - data.put("code",0); - data.put("msg","用户名已存在！"); - logger.error("用户[新增]，结果=用户名已存在！"); - return data; - } - String phone = user.getUserPhone(); - if(phone.length() != 11){ - data.put("code",0); - data.put("msg","手机号位数不对！"); - logger.error("置用户[新增或更新]，结果=手机号位数不对！"); - return data; - } - String username = user.getSysUserName(); - if(user.getSysUserPwd() == null){ - String password = DigestUtils.Md5(username,"123456"); - user.setSysUserPwd(password); - }else{ - String password = DigestUtils.Md5(username,user.getSysUserPwd()); - user.setSysUserPwd(password); - } - user.setRegTime(DateUtils.getCurrentDate()); - user.setUserStatus(1); - int result = baseAdminUserMapper.insert(user); - if(result == 0){ - data.put("code",0); - data.put("msg","新增失败！"); - logger.error("用户[新增]，结果=新增失败！"); - return data; - } - data.put("code",1); - data.put("msg","新增成功！"); - logger.info("用户[新增]，结果=新增成功！"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("用户[新增]异常！", e); - return data; - } - return data; - } + @Override public List findUserByCondition(BaseAdminUser user) @@ -148,18 +80,23 @@ public class AdminUserServiceImpl implements AdminUserService { // user.setDepartment(userInfo.getDepartment()); // user.setPage(userInfo.getPage()); // user.setResults(userInfo.getResults()); + //System.out.println(System.currentTimeMillis()); List users=baseAdminUserMapper.findUserByCondition(user); + //System.out.println(System.currentTimeMillis()); List baseAdminRoles =baseAdminRoleMapper.getRoleList(); + //System.out.println(System.currentTimeMillis()); List departments = departmentMapper.getDepartmentList(); - List areaCommons = areaCommonMapper.selectAll(); - + //System.out.println(System.currentTimeMillis()); + //List areaCommons = areaCommonMapper.selectAll(); + List areaCommons = ContainerStartedListener.getAreas(); + //System.out.println(System.currentTimeMillis()); Map roleMap= baseAdminRoles.stream().collect(Collectors.toMap(ResultUserRole::getId, ResultUserRole::getRoleName)); Map departmentsMap = departments.stream().collect(Collectors.toMap(Department::getId, Department::getName)); Map areaCommonsMap = areaCommons.stream().collect(Collectors.toMap(AreaCommon::getId, AreaCommon::getName)); - + //System.out.println(System.currentTimeMillis()); for(ResultUserInfoDe ru:users) { List roleNames=new ArrayList<>(); @@ -190,6 +127,7 @@ public class AdminUserServiceImpl implements AdminUserService { ru.setAreaCodeName(areaCodeName); ru.setDepartmentName(departmentName); } + //System.out.println(System.currentTimeMillis()); return users; } @@ -266,6 +204,7 @@ public class AdminUserServiceImpl implements AdminUserService { public int delUser(Integer id,Integer status) { try { // 删除用户 + //return baseAdminUserMapper.deleteInfo(id); return baseAdminUserMapper.updateUserStatus(id,status); } catch (Exception e) { @@ -291,30 +230,6 @@ public class AdminUserServiceImpl implements AdminUserService { return 0; } - /** - * 根据id和status恢复用户 - * @param id - * @param status - * @return Map - */ - @Override - public Map recoverUser(Integer id, Integer status) { - Map data = new HashMap<>(); - try { - int result = baseAdminUserMapper.updateUserStatus(id,status); - if(result == 0){ - data.put("code",0); - data.put("msg","恢复用户失败"); - } - data.put("code",1); - data.put("msg","恢复用户成功"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("恢复用户异常！", e); - } - return data; - } - /** * 根据用户名字查找用户（仅查找已激活的有效用户） * @param userName @@ -346,37 +261,43 @@ public class AdminUserServiceImpl implements AdminUserService { return baseAdminUserMapper.updatePwd(userName,password); } + public List getAllUserList(){ + return baseAdminUserMapper.getAllUserList(); + } + /** - * 根据权限查询用户 - * @param roleId - * @param pageNum - * @param pageSize - * @return PageDataResult + * 获取所有登陆用户 + * @return List */ @Override - public PageDataResult getUserRole(Integer roleId,Integer pageNum, Integer pageSize){ - PageDataResult pageDataResult = new PageDataResult(); - PageHelper.startPage(pageNum, pageSize); - List baseAdminUsers = baseAdminUserMapper.getUserRole(roleId); + public Integer getLoginUser(){ + return baseAdminUserMapper.getLoginUser(); + } - if(baseAdminUsers.size() != 0){ - PageInfo pageInfo = new PageInfo<>(baseAdminUsers); - pageDataResult.setList(baseAdminUsers); - pageDataResult.setTotals((int) pageInfo.getTotal()); - } + @Override + public Integer getWebLoginCount(){ + return baseAdminUserMapper.getWebLoginCount(); + } - return pageDataResult; + @Override + public Integer getAppLoginCount(){ + return baseAdminUserMapper.getAppLoginCount(); } - /** - * 根据用户id查询用户 - * @param id - * @return BaseAdminUser用户 - */ @Override - public BaseAdminUser queryById(Integer id){ - return baseAdminUserMapper.queryById(id); + public Integer failedCount(){ + return baseAdminUserMapper.failedCount(); + } + + @Override + public int updateLogin(BaseAdminUser user){ + return baseAdminUserMapper.updateLogin(user); + }; + + @Override + public Integer getAppLoginUser(){ + return baseAdminUserMapper.getAppLoginUser(); } } diff --git a/src/main/java/com/cetc32/dh/service/impl/AreaCommonServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AreaCommonServiceImpl.java index ffc7aa5c0b9f96973e49a210d2e664792d511447..c9a92fb51c01dbd93213f2dd6e326a053905ce3a 100644 --- a/src/main/java/com/cetc32/dh/service/impl/AreaCommonServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/AreaCommonServiceImpl.java @@ -3,6 +3,7 @@ package com.cetc32.dh.service.impl; import com.cetc32.dh.dto.CommonTreeDTO; import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.AreaCommonExample; +import com.cetc32.dh.listener.ContainerStartedListener; import com.cetc32.dh.mybatis.AreaCommonMapper; import com.cetc32.dh.service.AreaCommonService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,8 +29,12 @@ public class AreaCommonServiceImpl implements AreaCommonService { return list; } - - + /** + * 递归获取地区树 + * HZJ + * @param pid + * @return + */ @Override public List getAreaTreeByPid(String pid) { AreaCommonExample areaCommonExample = new AreaCommonExample(); @@ -64,35 +69,10 @@ public class AreaCommonServiceImpl implements AreaCommonService { */ @Override public List getAreaTreeList(String pid) { -// return getTreeList(pid); -// ArrayList areaCommonDTOList = new ArrayList(); -// List childList = getAreaTreeByPid(pid); -// if(childList!=null&&childList.size()>0){ -// -// for(AreaCommon areaCommon:childList){ -// AreaCommonDTO areaCommonDTO = new AreaCommonDTO(); -// List ls = getAreaTreeList(areaCommon.getId()); -// areaCommonDTO.setKey(areaCommon.getId()); -// areaCommonDTO.setValue(areaCommon.getName()); -// areaCommonDTO.setTitle(areaCommon.getName()); -// if(ls == null){ -// -// }else { -// areaCommonDTO.setChildren(ls); -// } -// areaCommonDTOList.add(areaCommonDTO); -// } -// -// }else { -// return null; -// } -// return areaCommonDTOList; -// } - -// public List getTreeList(String pid) { ArrayList commonDTOList = new ArrayList(); - List all=areaCommonMapper.selectAll(); + //List all=areaCommonMapper.selectAll(); + List all = ContainerStartedListener.getAreas(); AreaCommon rootTree = getById(pid); if(rootTree!=null){ CommonTreeDTO current=new CommonTreeDTO(rootTree.getName(),rootTree.getName(),rootTree.getId()); diff --git a/src/main/java/com/cetc32/dh/service/impl/CityServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityServiceImpl.java deleted file mode 100644 index c8b33b3c5da423c2c85e04f9fbbd70af92195d75..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/CityServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.entity.City; -import com.cetc32.dh.mybatis.CityMapper; -import com.cetc32.dh.service.CityService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.util.List; - -/** - * @Title: CityService实现类 - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Service -public class CityServiceImpl implements CityService { - - @Autowired - public CityMapper cityMapper; - - - /** - * 判断多边形polygon2是否在多边形polygon1中 - * - * @return 返回判断结果 - * 备注:无 - */ - @Override - public Boolean judgePolygonContain(String polygon1, String polygon2) { - // pointss ="POLYGON((98.31768 46.16992,127.59814 45.80590,108.78794 34.13706,93.2099 35.04692,98.31768 46.16992,98.31768 46.16992))"; - return cityMapper.judgePolygonContain(polygon1, polygon2); - } - - /** - * 判断某个点是否在一个面中 - * - * @return 返回判断结果 - * 备注:无 - */ - @Override - public Boolean judgePointContain(String point, String polygon) { - // pointss ="POLYGON((98.31768 46.16992,127.59814 45.80590,108.78794 34.13706,93.2099 35.04692,98.31768 46.16992,98.31768 46.16992))"; - return cityMapper.judgePointContain(point, polygon); - } - - /** - * 根据citycode查询记录 - * - * @return 返回查询结果 - * 备注:无 - */ - @Override - public List selectByCityCode(String id) { - return cityMapper.selectByCityCode(id); - } - - -} diff --git a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java deleted file mode 100644 index 43a77ca2abe7d8aa2c48e8330f8d6accfb21d653..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java +++ /dev/null @@ -1,328 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.entity.DataFile; -import com.cetc32.dh.mybatis.DataFileMapper; -import com.cetc32.dh.mybatis.DataMenuMapper; -import com.cetc32.dh.service.DataFileService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @Title: DataFileServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:04 - */ -@Service -public class DataFileServiceImpl implements DataFileService { - - @Autowired - public DataFileMapper dataFileMapper; - - @Autowired - public DataMenuMapper dataMenuMapper; - - /** - * 统计所有的文件数据个数 - * - * @return 返回统计结果 - */ - @Override - public Integer count() { - return dataFileMapper.countAll(); - } - - /** - * 插入一个文件数据 - * - * @param dataFile 文件数据 - * @return 返回插入结果 - */ - @Override - public Integer insertDataFile(DataFile dataFile) { - return dataFileMapper.insertOne(dataFile); - } - - /** - * 成果数据上报 - * - * @param dataFile - * @return Integer - */ - @Override - public Integer insertGain(DataFile dataFile) { - return dataFileMapper.insertGain(dataFile); - } - - - /** - * 更新一个文件数据 - * - * @param dataFile 文件数据 - * @return 返回更新结果 - */ - @Override - public Integer updatebyId(DataFile dataFile) { - return dataFileMapper.updateById(dataFile); - } - - /** - * 根据id删除一个文件数据 - * - * @param id 文件id - * @return 返回删除结果 - */ - @Override - public Integer deleteById(Long id) { - return dataFileMapper.deleteById(id); - } - - /** - * 根据id查询文件数据 - * - * @param id 文件id - * @return 返回查询结果 - */ - @Override - public DataFile queryById(Long id) { - return dataFileMapper.queryById(id); - } - - /** - * 根据时间查询文件数据 - * - * @param time 文件时间 - * @return 返回查询结果 - */ - @Override - public List queryByTime(Date time) { - return dataFileMapper.queryByTime(time); - } - - /** - * 根据区域查询文件数据 - * - * @param region 文件所属区域 - * @return 返回查询结果 - */ - @Override - public List queryByRegion(String region) { - return dataFileMapper.queryByRegion(region); - } - - /** - * 根据安全等级查询文件数据 - * - * @param fileSecurity 文件安全等级 - * @return 返回查询结果 - */ - @Override - public List queryAllByFileSecurity(String fileSecurity) { - return dataFileMapper.queryAllByFileSecurity(fileSecurity); - } - - /** - * 根据安状态和用户查询文件数据 - * - * @param dataFile 文件数据 - * @return 返回查询结果 - */ - @Override - public List selectByStatusAndUser(DataFile dataFile) { - - return dataFileMapper.selectByStatusAndUser(dataFile); - } - - /** - * 删除编目menuId下的所有文件数据 - * - * @param menuId 编目id - * @return 返回删除结果 - */ - @Override - public Integer deleteByMenuId(Integer menuId) { - return dataFileMapper.deleteByMenuId(menuId); - } - - /** - * 根据安全状态和用户统计文件数据 - * - * @param dataFile 文件数据 - * @return 返回统计结果 - */ - @Override - public Integer countByStatusAndUser(DataFile dataFile) { - return dataFileMapper.countByStatusAndUser(dataFile); - } - - - /** - * 根据输入条件查询文件数据 - * - * @param offset 偏移量 - * @param limit 每页显示条数 - * @param dataFile 文件数据 - * @return 返回查询结果 - */ - @Override - public List queryFilesByObj(Integer offset, Integer limit, DataFile dataFile) { - System.out.println(dataFile); - //文件名称 - if (dataFile.getFileName() != null) { - if (StringUtils.isNotBlank(dataFile.getFileName()) && !dataFile.getFileName().contains("%")) { - String fileName = "%" + dataFile.getFileName() + "%"; - dataFile.setFileName(fileName); - } else { - dataFile.setFileName(null); - } - - } - //数据标识 - if (dataFile.getFileConfig() != null) { - if (StringUtils.isNotBlank(dataFile.getFileConfig()) && !dataFile.getFileConfig().contains("%")) { - String fileConfig = "%" + dataFile.getFileConfig() + "%"; - dataFile.setFileConfig(fileConfig); - } else { - dataFile.setFileConfig(null); - } - } - //区域 - if (dataFile.getRegion() != null) { - if (StringUtils.isNotBlank(dataFile.getRegion()) && !dataFile.getFileConfig().contains("%")) { - String fileRegion = "%" + dataFile.getRegion() + "%"; - if (fileRegion.contains("全部区域")) { - fileRegion = null; - } - dataFile.setRegion(fileRegion); - } else { - dataFile.setRegion(null); - } - - } - //审批状态 - if (StringUtils.isBlank(dataFile.getStatus()) || dataFile.getStatus().equals("全部审批状态")) { - dataFile.setStatus(null); - } - //图像地理坐标系 - if (StringUtils.isBlank(dataFile.getGcs()) || dataFile.getGcs().equals("全部坐标系")) { - dataFile.setGcs(null); - } - //图像比例尺 - if (StringUtils.isBlank(dataFile.getScale()) || dataFile.getScale().equals("全部比例尺")) { - dataFile.setScale(null); - } - - //经度 - if (dataFile.getLan() != null && !dataFile.getLan().contains("%")) { - if (StringUtils.isNotBlank(dataFile.getLan())) { - String lan = "%" + dataFile.getLan() + "%"; - dataFile.setLan(lan); - } else { - dataFile.setLan(null); - } - } - //纬度 - if (dataFile.getLon() != null) { - if (StringUtils.isNotBlank(dataFile.getLon()) && !dataFile.getLon().contains("%")) { - String lon = "%" + dataFile.getLon() + "%"; - dataFile.setLon(lon); - } else { - dataFile.setLon(null); - } - - } - - return dataFileMapper.queryFilesByObj(offset, limit, dataFile); - } - - /** - * 根据输入条件统计文件数据量 - * - * @param dataFile 文件数据 - * @return 返回统计结果 - */ - @Override - public Integer countFilesByObj(DataFile dataFile) { - - System.out.println(dataFile); - //文件名称 - if (dataFile.getFileName() != null) { - if (StringUtils.isNotBlank(dataFile.getFileName()) && !dataFile.getFileName().contains("%")) { - String fileName = "%" + dataFile.getFileName() + "%"; - dataFile.setFileName(fileName); - } else { - dataFile.setFileName(null); - } - - } - //数据标识 - if (dataFile.getFileConfig() != null) { - if (StringUtils.isNotBlank(dataFile.getFileConfig()) && !dataFile.getFileConfig().contains("%")) { - String fileConfig = "%" + dataFile.getFileConfig() + "%"; - dataFile.setFileConfig(fileConfig); - } else { - dataFile.setFileConfig(null); - } - } - //区域 - if (dataFile.getRegion() != null) { - if (StringUtils.isNotBlank(dataFile.getRegion()) && !dataFile.getFileConfig().contains("%")) { - String fileRegion = "%" + dataFile.getRegion() + "%"; - if (fileRegion.contains("全部区域")) { - fileRegion = null; - } - dataFile.setRegion(fileRegion); - } else { - dataFile.setRegion(null); - } - - } - //审批状态 - if (StringUtils.isBlank(dataFile.getStatus()) || dataFile.getStatus().equals("全部审批状态")) { - dataFile.setStatus(null); - } - //图像地理坐标系 - if (StringUtils.isBlank(dataFile.getGcs()) || dataFile.getGcs().equals("全部坐标系")) { - dataFile.setGcs(null); - } - //图像比例尺 - if (StringUtils.isBlank(dataFile.getScale()) || dataFile.getScale().equals("全部比例尺")) { - dataFile.setScale(null); - } - - //经度 - if (dataFile.getLan() != null && !dataFile.getLan().contains("%")) { - if (StringUtils.isNotBlank(dataFile.getLan())) { - String lan = "%" + dataFile.getLan() + "%"; - dataFile.setLan(lan); - } else { - dataFile.setLan(null); - } - } - //纬度 - if (dataFile.getLon() != null) { - if (StringUtils.isNotBlank(dataFile.getLon()) && !dataFile.getLon().contains("%")) { - String lon = "%" + dataFile.getLon() + "%"; - dataFile.setLon(lon); - } else { - dataFile.setLon(null); - } - - } - - return dataFileMapper.countFilesByObj(dataFile); - } - - -} diff --git a/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java deleted file mode 100644 index 492724157c46b168e647863506cbdf5e656eba53..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java +++ /dev/null @@ -1,221 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.dto.DataMenuDTO; -import com.cetc32.dh.entity.DataMenu; -import com.cetc32.dh.mybatis.DataFileMapper; -import com.cetc32.dh.mybatis.DataMenuMapper; -import com.cetc32.dh.service.DataFileService; -import com.cetc32.dh.service.DataMenuService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Title: DataMenuServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:04 - */ -@Service -public class DataMenuServiceImpl implements DataMenuService { - - @Autowired - public DataMenuMapper dataMenuMapper; - - @Autowired - public DataFileMapper dataFileMapper; - - @Autowired - public DataFileService dataFileService; - - /** - * 统计所有的编目数据个数 - * - * @return 返回统计结果 - */ - @Override - public Integer count() { - return dataMenuMapper.countAll(); - } - - /** - * 插入一个编目数据 - * - * @param dataMenu 编目数据 - * @return 返回插入结果 - */ - @Override - public Integer insertDataMenu(DataMenu dataMenu) { - return dataMenuMapper.insertOne(dataMenu); - } - - /** - * 更新编目节点 - * - * @param dataMenu 编目数据 - * @return 更新信息 - */ - @Override - public Integer updatebyId(DataMenu dataMenu) { - return dataMenuMapper.updateById(dataMenu); - } - - /** - * 根据id查询编目数据 - * - * @param id 编目id - * @return 返回查询结果 - */ - @Override - public DataMenu queryById(Long id) { - return dataMenuMapper.queryById(id); - } - - /** - * 根据id删除一个编目数据 - * - * @param id 编目id - * @return 返回删除结果 - */ - @Override - public Integer deleteById(Long id) { - return dataMenuMapper.deleteById(id); - } - - /** - * 根据父节点pid查询编目 - * - * @param pid 父节点 - * @return 返回查询结果 - */ - @Override - public DataMenu queryByPid(Long pid) { - return dataMenuMapper.queryByPid(pid); - } - - /** - * 查询所有以id为父节点的编目 - * - * @param id 编目id - * @return 返回查询结果 - */ - @Override - public List queryByPIdSatisfyId(Long id) { - return dataMenuMapper.queryByPIdSatisfyId(id); - } - - - /** - * 查询编目id节点下的编目树信息 - * - * @param id 编目id - * @return 返回查询结果 - */ - @Override - public DataMenuDTO getMenuTree(Long id) { - - ArrayList sub = new ArrayList(); - DataMenu dataMenu = queryById(id); - DataMenuDTO dataMenuDTO = new DataMenuDTO(); -// BeanUtils.copyProperties(dataMenu,dataMenuDTO); - dataMenuDTO.setTitle(dataMenu.getMenuName()); - dataMenuDTO.setValue(id.toString()); - dataMenuDTO.setKey(dataMenu.getKey()); - dataMenuDTO.setHtmlUrl(dataMenu.getHtmlUrl()); - dataMenuDTO.setIcon(dataMenu.getIcon()); - dataMenuDTO.setDisabled(dataMenu.getDisabled()); - dataMenuDTO.setAddkids(dataMenu.getAddkids()); - List childList = queryByPIdSatisfyId(id); - if (childList.size() == 0) { -// dataMenuDTO.setChildren(null); - return dataMenuDTO; - } - dataMenuDTO.setChildren(sub); - - for (int i = 0; i < childList.size(); i++) { - Long myId = childList.get(i).getId(); - dataMenuDTO.getChildren().add(getMenuTree(myId)); - } - return dataMenuDTO; - } - - /** - * 删除编目id下的树 - * - * @param id 编目id - * @return 返回删除结果 - */ - @Override - public Integer deleteMenuTree(Long id) { - Integer count = 0; - List childList = queryByPIdSatisfyId(id); - for (int i = 0; i < childList.size(); i++) { - count += deleteMenuTree(childList.get(i).getId()); - } - dataFileService.deleteByMenuId(id.intValue()); - count += deleteById(id); - return count; - } - - /** - * 统计编目id下子树中所有节点的数目 - * - * @param id 编目id - * @return 返回统计结果 - */ - @Override - public Integer countMenuChild(Long id) { - Integer count = 0; - List childList = queryByPIdSatisfyId(id); - for (int i = 0; i < childList.size(); i++) { - count += countMenuChild(childList.get(i).getId()); - } - count += childList.size(); - return count; - } - - /** - * 新增一个编目数据 - * - * @param dataMenu 编目数据 - * @return 返回新增结果 - */ - @Override - public String addDataMenu(DataMenu dataMenu) { - String message = "添加成功"; - Integer count = insertDataMenu(dataMenu); - if (count != 1) { - message = "添加失败"; - } - return message; - } - - /** - * 查询所有的编目数据 - * - * @return 返回查询结果 - */ - public List selectAll() { - return dataMenuMapper.selectAll(); - } - - /** - * 查询编目键为key编目数据 - * - * @return 返回查询结果 - */ - public DataMenu queryByKey(String key) { - return dataMenuMapper.queryByKey(key); - } - - -} diff --git a/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java deleted file mode 100644 index c507ab5e211ad888849ab6fb3b8dd834bdede10c..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java +++ /dev/null @@ -1,197 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.beans.DataCollected; -import com.cetc32.dh.entity.DataPlp; -import com.cetc32.dh.mybatis.DataPlpMapper; -import com.cetc32.dh.service.DataPlpService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @Title: DataPlpServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Service -public class DataPlpServiceImpl implements DataPlpService { - - @Autowired - DataPlpMapper dataPlpMapper; - - @Override - public Integer insertCollected(DataCollected data) { - return dataPlpMapper.insertCollected(data); - } - - @Override - public List selectPloygon(Date startTime, Date endTime, String polygon) { - return dataPlpMapper.selectPloygon(startTime, endTime, polygon); - } - - /** - * 统计所有的点线面数据个数 - * - * @return 返回统计结果 - */ - @Override - public Integer countAll() { - return dataPlpMapper.countAll(); - } - - - /** - * 插入一个点线面数据 - * - * @param dataPlp 插入的点线面数据 - * @return 返回是否插入成功 - */ - @Override - public Integer insertOne(DataPlp dataPlp) { - return dataPlpMapper.insertOne(dataPlp); - } - - /** - * 根据id更新点线面数据记录 - * - * @param dataPlp 点线面数据 - * @return 返回是否更新成功 - */ - @Override - public Integer updateById(DataPlp dataPlp) { - return dataPlpMapper.updateById(dataPlp); - } - - - /** - * 根据id查询点线面数据记录 - * - * @param id 点线面数据的id - * @return 返回查询结果 - */ - @Override - public Integer deleteById(Integer id) { - return dataPlpMapper.deleteById(id); - } - - /** - * 根据文件id点线面数据 - * - * @param id - * @return DataPlp - */ - @Override - public DataPlp queryById(Integer id) { - return dataPlpMapper.queryById(id); - } - - /** - * 根据状态和审批用户查询点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - @Override - public List selectByStatusAndUser(DataPlp dataPlp) { - return dataPlpMapper.selectByStatusAndUser(dataPlp); - } - - /** - * 统计满足状态和审批用户条件的点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - @Override - public Integer countByStatusAndUser(DataPlp dataPlp) { - return null; - } - - /** - * 根据输入的条件动态查询点线面数据 - * - * @param offset 偏移量 - * @param limit 每页显示的条数 - * @return 返回查询结果 - */ - @Override - public List queryFilesByObj(Integer offset, Integer limit, DataPlp dataPlp) { - System.out.println(dataPlp); -// -// if(dataPlp.getFileName()!=null){ -// String fileName="%"+dataPlp.getFileName()+"%"; -// dataPlp.setFileName(fileName); -// } - //区域 - if (dataPlp.getRegion() != null) { - if (StringUtils.isNotBlank(dataPlp.getRegion()) && !dataPlp.getRegion().contains("%")) { - String fileRegion = "%" + dataPlp.getRegion() + "%"; - if (fileRegion.contains("全部区域")) { - fileRegion = null; - } - dataPlp.setRegion(fileRegion); - } else { - dataPlp.setRegion(null); - } - } - if (StringUtils.isBlank(dataPlp.getStatus()) || dataPlp.getStatus().equals("全部审批状态")) { - dataPlp.setStatus(null); - } - if (dataPlp.getEventType() != null) { - if (StringUtils.isBlank(dataPlp.getEventType()) || dataPlp.getEventType().equals("全部数据类型")) { - dataPlp.setEventType(null); - } - } - - return dataPlpMapper.queryFilesByObj(offset, limit, dataPlp); - } - - /** - * 根据输入的条件动态统计查询的点线面数据 - * - * @param dataPlp 点线面数据 - * @return 返回查询结果 - */ - @Override - public Integer countFilesByObj(DataPlp dataPlp) { - - System.out.println(dataPlp); -// -// if(dataPlp.getFileName()!=null){ -// String fileName="%"+dataPlp.getFileName()+"%"; -// dataPlp.setFileName(fileName); -// } - //区域 - if (dataPlp.getRegion() != null) { - if (StringUtils.isNotBlank(dataPlp.getRegion()) && !dataPlp.getRegion().contains("%")) { - String fileRegion = "%" + dataPlp.getRegion() + "%"; - if (fileRegion.contains("全部区域")) { - fileRegion = null; - } - dataPlp.setRegion(fileRegion); - } else { - dataPlp.setRegion(null); - } - } - if (StringUtils.isBlank(dataPlp.getStatus()) || dataPlp.getStatus().equals("全部审批状态")) { - dataPlp.setStatus(null); - } - if (dataPlp.getEventType() != null) { - if (StringUtils.isBlank(dataPlp.getEventType()) || dataPlp.getEventType().equals("全部数据类型")) { - dataPlp.setEventType(null); - } - } - return dataPlpMapper.countFilesByObj(dataPlp); - } -} diff --git a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java deleted file mode 100644 index db520e3524ea4e4bb501a7dde9ca42b85559c97d..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java +++ /dev/null @@ -1,194 +0,0 @@ -/** - * @Title: service层接实现类 - * @author: 徐文远 - * @version: 1.0 - * @date: 2020/10/16 - * 备注:无 - * 更改描述：无 - */ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.entity.DataSubmit; -import com.cetc32.dh.mybatis.DataSubmitMapper; -import com.cetc32.dh.service.DataSubmitService; -import org.apache.shiro.util.Assert; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Title: DataSubmitServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:04 - */ -@Service -public class DataSubmitServiceImpl implements DataSubmitService { - - DataSubmitMapper dsMapper; - - /** - * 提交请求后数据插入操作 - * - * @param ds 更新到数库的数据 - * @return 反馈是否成功 - **/ - @Override - public Integer insertDataSubmit(DataSubmit ds) { - if (ds == null) { - return -1; - } - if (ds.getApprover() == null || ds.getPath() == null || ds.getArea() == null || ds.getYear() == null) { - return -1; - } else { - return dsMapper.insertOne(ds); - } - } - - /** - * 拒绝用户此时数据导入申请 - * - * @param ds 写入到数库的数据 - * @return 反馈是否成功 - **/ - @Override - public Integer rejectSubmit(DataSubmit ds) { - if (ds == null) { - return -1; - } - if (ds.getId() == null) { - return -1; - } - ds.setStatus(-1); - ds.setApprover("审批人已拒绝"); - return dsMapper.updateById(ds); - - } - - /** - * 接受用户此时数据导入申请 - * - * @param ds 更新到数库的数据 - * @return 反馈是否成功 - **/ - @Override - public Integer acceptSubmit(DataSubmit ds) { - if (ds == null) { - return -1; - } - if (ds.getId() == null) { - return -1; - } - ds.setStatus(1); - ds.setApprover("审批人已审批"); - return dsMapper.updateById(ds); - } - - /** - * 查询当前登陆用户提交的导入申请 - * - * @param dataSubmit 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectMySubmit(DataSubmit dataSubmit) { - if (dataSubmit == null) { - return null; - } - dataSubmit.setApprover(null); - return dsMapper.selectMine(dataSubmit); - } - - /** - * 查询当前登陆用户的审批过的以及未审批的提交信息 - * - * @param dataSubmit 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectMyApprove(DataSubmit dataSubmit) { - if (dataSubmit == null) { - return null; - } - dataSubmit.setSubmitor(null); - return dsMapper.selectMine(dataSubmit); - } - - - /** - * 根据当前用户统计所有任务个数 - * - * @param dataSubmit 通常dataSubmit一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - */ - public Integer countMineSubmit(DataSubmit dataSubmit) { - Assert.notNull(dataSubmit); - if (null == dataSubmit.getSubmitor()) - return -1; - dataSubmit.setApprover(null); - return dsMapper.countMine(dataSubmit); - } - - /** - * 根据当前用户统计所有任务个数 - * - * @param dataSubmit 通常dataSubmit一次查询只包含approver。 - * @return 反馈查询到的数据个数 - */ - public Integer countMineApprov(DataSubmit dataSubmit) { - Assert.notNull(dataSubmit); - if (null == dataSubmit.getApprover()) - return -1; - dataSubmit.setSubmitor(null); - return dsMapper.countMine(dataSubmit); - } - - /** - * 查询当前登陆用户需要审批的提交信息 - * - * @param dataSubmit 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectReadyApprove(DataSubmit dataSubmit) { - - return dsMapper.selectByStatusAndUser(dataSubmit); - } - - /** - * 根据当前用户统计所有任务个数 - * - * @param dataSubmit 通常dataSubmit一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - */ - @Override - public Integer countReadyApprove(DataSubmit dataSubmit) { - return dsMapper.countByStatusAndUser(dataSubmit); - } - - /** - * DataSubmitMapper注入方法，必须用@Autowired注解 - * - * @param dsMapper 待注入的bean - * @return 反馈为空 - **/ - @Autowired - public void setDsMapper(DataSubmitMapper dsMapper) { - this.dsMapper = dsMapper; - } - - /** - * 根据当前id查找DataSubmit实体 - * - * @param id 根据id查询 - * @return DataSubmit - */ - @Override - public DataSubmit queryById(Integer id) { - return dsMapper.queryById(id); - } -} - - diff --git a/src/main/java/com/cetc32/dh/service/impl/DataTraceServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataTraceServiceImpl.java deleted file mode 100644 index 7e58a6b7cbbc8095b6e541ac4140f79b788ca6ed..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/DataTraceServiceImpl.java +++ /dev/null @@ -1,160 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.entity.DataTrace; -import com.cetc32.dh.mybatis.DataTraceMapper; -import com.cetc32.dh.service.DataTraceService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.util.List; - -/** - * @Title: DataTraceServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Service -public class DataTraceServiceImpl implements DataTraceService { - - @Autowired - DataTraceMapper dataTraceMapper; - - /** - * 统计所有的文件数据个数 - * - * @return 返回统计结果 - */ - @Override - public Integer countAll() { - return dataTraceMapper.countAll(); - } - - /** - * 插入一个轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回插入结果 - */ - @Override - public Integer insertOne(DataTrace dataTrace) { - return dataTraceMapper.insertOne(dataTrace); - } - - /** - * 更新一个轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回更新结果 - */ - @Override - public Integer updateById(DataTrace dataTrace) { - return dataTraceMapper.updateById(dataTrace); - } - - - /** - * 删除一个轨迹数据 - * - * @param id 轨迹数据id - * @return 返回删除结果 - */ - @Override - public Integer deleteById(Integer id) { - return dataTraceMapper.deleteById(id); - } - - /** - * 根据id查询轨迹数据 - * - * @param id 轨迹id - * @return 返回查询结果 - */ - @Override - public DataTrace queryById(Integer id) { - return dataTraceMapper.queryById(id); - } - - /** - * 根据安状态和用户查询轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回查询结果 - */ - @Override - public List selectByStatusAndUser(DataTrace dataTrace) { - return dataTraceMapper.selectByStatusAndUser(dataTrace); - } - - /** - * 根据安全状态和用户统计轨迹数据 - * - * @param dataTrace 轨迹数据 - * @return 返回统计结果 - */ - @Override - public Integer countByStatusAndUser(DataTrace dataTrace) { - return dataTraceMapper.countByStatusAndUser(dataTrace); - } - - - /** - * 根据输入条件查询文件数据 - * - * @param offset 偏移量 - * @param limit 每页显示条数 - * @param dataTrace 轨迹数据 - * @return 返回查询结果 - */ - @Override - public List queryFilesByObj(Integer offset, Integer limit, DataTrace dataTrace) { - - if (StringUtils.isBlank(dataTrace.getStatus()) || dataTrace.getStatus().equals("全部审批状态")) { - dataTrace.setStatus(null); - } - if (dataTrace.getFileConfig() != null) { - if (StringUtils.isNotBlank(dataTrace.getFileConfig()) && !dataTrace.getFileConfig().contains("%")) { - String fileConfig = "%" + dataTrace.getFileConfig() + "%"; - dataTrace.setFileConfig(fileConfig); - } else { - dataTrace.setFileConfig(null); - } - } - - - return dataTraceMapper.queryFilesByObj(offset, limit, dataTrace); - } - - /** - * 根据输入条件统计轨迹数据量 - * - * @param dataTrace 轨迹数据 - * @return 返回统计结果 - */ - @Override - public Integer countFilesByObj(DataTrace dataTrace) { - - if (StringUtils.isBlank(dataTrace.getStatus()) || dataTrace.getStatus().equals("全部审批状态")) { - dataTrace.setStatus(null); - } - if (dataTrace.getFileConfig() != null) { - if (StringUtils.isNotBlank(dataTrace.getFileConfig()) && !dataTrace.getFileConfig().contains("%")) { - String fileConfig = "%" + dataTrace.getFileConfig() + "%"; - dataTrace.setFileConfig(fileConfig); - } else { - dataTrace.setFileConfig(null); - } - } - - return dataTraceMapper.countFilesByObj(dataTrace); - } - - -} diff --git a/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java b/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java deleted file mode 100644 index 010dc0142e0946ed192cbb1139768cbef21d4024..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.dto.DemandSubmitDTO; -import com.cetc32.dh.entity.DataSubmit; -import com.cetc32.dh.entity.DemandSubmit; -import com.cetc32.dh.entity.vDemand; -import com.cetc32.dh.mybatis.DemandSubmitMapper; -import com.cetc32.dh.service.DemandSubmitService; -import io.swagger.models.auth.In; -import org.apache.shiro.util.Assert; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class DemandSubmitServiceImppl implements DemandSubmitService { - @Autowired - DemandSubmitMapper demandSubmitMapper; - - public List findAll(){ - return demandSubmitMapper.findAll(); - } - - public int deleteByPrimaryKey(Integer id){ - if(id==null) - return -1; - return demandSubmitMapper.deleteByPrimaryKey(id); - } - - public int insert(DemandSubmit demandSubmit){ - return demandSubmitMapper.insert(demandSubmit); - } - - public int insertSelective(DemandSubmit demandSubmit){ - return demandSubmitMapper.insertSelective(demandSubmit); - } - - public DemandSubmit selectByPrimaryKey(Integer id){ - if(id==null) - return null; - return demandSubmitMapper.selectByPrimaryKey(id); - } - - public List selectByLimit(Integer offset, Integer limit){ - return demandSubmitMapper.selectByLimit(offset,limit); - } - - public int countDemand(){ - return demandSubmitMapper.countDemand(); - } - - public int updateByPrimaryKeySelective(DemandSubmit demandSubmit){ - return demandSubmitMapper.updateByPrimaryKeySelective(demandSubmit); - } - - public int updateByPrimaryKey(DemandSubmit demandSubmit){ - return demandSubmitMapper.updateByPrimaryKey(demandSubmit); - } - - public List findByKeyWord(String keyword){ - keyword = "%" + keyword + "%"; - List search = demandSubmitMapper.findByKeyWord(keyword); - return search; - } - - /** - * 查询当前登陆用户提交的导入申请 - * - * @param name 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectMySubmit(String name) { - return demandSubmitMapper.selectMine(name); - } - - /** - * 查询当前登陆用户的审批过的以及未审批的提交信息 - * - * @param name 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectMyApprove(String name) { - return demandSubmitMapper.selectMine(name); - } - - - /** - * 根据当前用户统计所有任务个数 - * - * @param name 通常demandSubmit一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - */ - public Integer countMineSubmit(String name) { - return demandSubmitMapper.countMine(name); - } - - /** - * 根据当前用户统计所有任务个数 - * - * @param name 通常demandSubmit一次查询只包含approver。 - * @return 反馈查询到的数据个数 - */ - public Integer countMineApprov(String name) { - return demandSubmitMapper.countMine(name); - } - - /** - * 查询当前登陆用户需要审批的提交信息 - * - * @param demandSubmit 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectReadyApprove(DemandSubmit demandSubmit) { - - return demandSubmitMapper.selectByStatusAndUser(demandSubmit); - } - - /** - * 根据当前用户统计所有任务个数 - * - * @param demandSubmit 通常demandSubmit一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - */ - @Override - public Integer countReadyApprove(DemandSubmit demandSubmit) { - return demandSubmitMapper.countByStatusAndUser(demandSubmit); - } - - @Override - public List queryFilesByObj(vDemand vDemand){ - return demandSubmitMapper.queryFilesByObj(vDemand); - } - - @Override - public List searchbystatus(DemandSubmitDTO demandSubmitDTO){ - return demandSubmitMapper.searchbystatus(demandSubmitDTO); - } -} diff --git a/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java index 9bd6fca1efb1f0da9dc4457fad4dcf693d257135..2695c75ecc1047fa972dd2e1f38e76bf83df4e9d 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java @@ -1,5 +1,6 @@ package com.cetc32.dh.service.impl; +import com.cetc32.dh.beans.StatisticBean; import com.cetc32.dh.dto.CommonTreeDTO; import com.cetc32.dh.entity.Department; import com.cetc32.dh.entity.NumberS; @@ -120,4 +121,9 @@ public class DepartmentServiceImpl implements DepartmentService { } } + @Override + public List countByDeparment() { + return departmentMapper.countByDepartment(); + //return null; + } } diff --git a/src/main/java/com/cetc32/dh/service/impl/EstimateTaskServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/EstimateTaskServiceImpl.java deleted file mode 100644 index 0757c60b739f1f2e8790b983bb7dc015135551f1..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/EstimateTaskServiceImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.entity.EstimateTask; -import com.cetc32.dh.entity.vEstimate; -import com.cetc32.dh.mybatis.EstimateTaskMapper; -import com.cetc32.dh.service.EstimateTaskService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class EstimateTaskServiceImpl implements EstimateTaskService { - @Autowired - EstimateTaskMapper estimateTaskMapper; - public List findAll(){ return estimateTaskMapper.findAll();} - - public int deleteByPrimaryKey(Integer id){ - if(id==null) - return -1; - return estimateTaskMapper.deleteByPrimaryKey(id); - } - - public int insert(EstimateTask estimateTask){ - return estimateTaskMapper.insert(estimateTask); - } - - public int insertSelective(EstimateTask estimateTask){ - return estimateTaskMapper.insertSelective(estimateTask); - } - - public EstimateTask selectByPrimaryKey(Integer id){ - if(id==null) - return null; - return estimateTaskMapper.selectByPrimaryKey(id); - } - - public List selectByLimit(Integer offset, Integer limit){ - return estimateTaskMapper.selectByLimit(offset, limit); - } - - public int countEstimate() { return estimateTaskMapper.countEstimate();} - - public int updateByPrimaryKeySelective(EstimateTask estimateTask){ - return estimateTaskMapper.updateByPrimaryKeySelective(estimateTask); - } - - public int updateByPrimaryKey(EstimateTask estimateTask){ - return estimateTaskMapper.updateByPrimaryKey(estimateTask); - } - - public List findByKeyWord(String keyword){ - keyword = "%" + keyword + "%"; - List search = estimateTaskMapper.findByKeyWord(keyword); - return search; - } - - /** - * 查询当前登陆用户提交的导入申请 - * - * @param name 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectMySubmit(String name) { - return estimateTaskMapper.selectMine(name); - } - - /** - * 查询当前登陆用户的审批过的以及未审批的提交信息 - * - * @param name 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectMyApprove(String name) { - return estimateTaskMapper.selectMine(name); - } - - - /** - * 根据当前用户统计所有任务个数 - * - * @param name 通常estimateTask一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - */ - public Integer countMineSubmit(String name) { - return estimateTaskMapper.countMine(name); - } - - /** - * 根据当前用户统计所有任务个数 - * - * @param name 通常estimateTask一次查询只包含approver。 - * @return 反馈查询到的数据个数 - */ - public Integer countMineApprov(String name) { - return estimateTaskMapper.countMine(name); - } - - /** - * 查询当前登陆用户需要审批的提交信息 - * - * @param estimateTask 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectReadyApprove(EstimateTask estimateTask) { - - return estimateTaskMapper.selectByStatusAndUser(estimateTask); - } - - /** - * 根据当前用户统计所有任务个数 - * - * @param estimateTask 通常estimateTask一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - */ - @Override - public Integer countReadyApprove(EstimateTask estimateTask) { - return estimateTaskMapper.countByStatusAndUser(estimateTask); - } - - - @Override - public List queryFilesByObj(vEstimate vEstimate){ - return estimateTaskMapper.queryFilesByObj(vEstimate); - } - - @Override - public List allservice(String classify){ - return estimateTaskMapper.allservice(classify); - } - - @Override - public List alltaskclassify(){ - return estimateTaskMapper.alltaskclassify(); - } -} diff --git a/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java b/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java deleted file mode 100644 index 6754d252931bb6d7243e15f70aec150e7de9ee5b..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：肖小霞 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.entity.Options; -import com.cetc32.dh.mybatis.OptionsMapper; -import com.cetc32.dh.service.OptionsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Title: OptionsServiceImpl - * @Description: - * @author: xiao - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Service -public class OptionsImpl implements OptionsService { - - @Autowired - public OptionsMapper optionsMapper; - - /** - * 根据数据类别查找数据 - * - * @param category 数据类别 - * @return 返回查询结果 - */ - @Override - public List selectByCategory(String category) { - return optionsMapper.selectByCategory(category); - } -} diff --git a/src/main/java/com/cetc32/dh/service/impl/OrganizationServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/OrganizationServiceImpl.java deleted file mode 100644 index ffc6ff947975ff97d1ef2cc066eff631b6b6e1d7..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/OrganizationServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.entity.Organization; -import com.cetc32.dh.mybatis.OrganizationMapper; -import com.cetc32.dh.service.OrganizationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class OrganizationServiceImpl implements OrganizationService { - @Autowired - OrganizationMapper organizationMapper; - - public List findAll(){ return organizationMapper.findall();} - - public int insertSelectie(Organization organization){ - return organizationMapper.insertSelective(organization); - } - - public Organization selectByPrimaryKey(Integer id){ - if(id==null) - return null; - return organizationMapper.selectByPrimaryKey(id); - } - - public List selectByLimit(Integer offset , Integer limit){ - return organizationMapper.selectByLimit(offset,limit); - } - - public int countOrganization(){ - return organizationMapper.countOrganization(); - } - - public int deleteByPrimaryKey(Integer id){ - if(id==null) - return -1; - return organizationMapper.deleteByPrimaryKey(id); - } - - public int updateByPrimaryKeySelective(Organization organization){ - return organizationMapper.updateByPrimaryKeySelective(organization); - } - - public int updateByPrimaryKey(Organization organization){ - return organizationMapper.updateByPrimaryKey(organization); - } - - public List findByKeyWord(String keyword){ - keyword="%"+keyword+"%"; - List search=organizationMapper.findByKeyWord(keyword); - return search; - } - - @Override - public int insert(Organization organization){ - return organizationMapper.insert(organization); - } -} - diff --git a/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java deleted file mode 100644 index 920e7d39fa109420387841c3c1209485aa81387d..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.dto.LineBoth; -import com.cetc32.dh.dto.TwoNode; -import com.cetc32.dh.entity.AreaCommon; -import com.cetc32.dh.entity.Productdemand; -import com.cetc32.dh.entity.vProduct; -import com.cetc32.dh.mybatis.ProductdemandMapper; -import com.cetc32.dh.service.AreaCommonService; -import com.cetc32.dh.service.ProductdemandService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Service -public class ProductdemandServiceImpl implements ProductdemandService { - @Autowired - ProductdemandMapper productdemandMapper; - @Autowired - AreaCommonService areaCommonService; - - public List findAll() { return productdemandMapper.findAll();} - - public int deleteByPrimaryKey(Integer id){ - if(id==null) - return -1; - return productdemandMapper.deleteByPrimaryKey(id); - } - - public int insert(Productdemand productdemand){ - return productdemandMapper.insert(productdemand); - } - - public int insertSelective(Productdemand record){ - return productdemandMapper.insertSelective(record); - } - - public Productdemand selectByPrimaryKey(Integer id){ - if(id==null) - return null; - return productdemandMapper.selectByPrimaryKey(id); - } - - public List selectByLimit(Integer offset, Integer limit){ - return productdemandMapper.selectByLimit(offset, limit); - } - - public int countProduct() { return productdemandMapper.countProduct();} - - public int updateByPrimaryKeySelective(Productdemand productdemand){ - return productdemandMapper.updateByPrimaryKeySelective(productdemand); - } - - public int updateByPrimaryKey(Productdemand productdemand){ - return productdemandMapper.updateByPrimaryKey(productdemand); - } - - public List findByKeyWord(String keyword){ - keyword ="%"+keyword+"%"; - List search_by_keyword = productdemandMapper.findByKeyWord(keyword); - return search_by_keyword; - } - - /** - * 查询当前登陆用户提交的导入申请 - * - * @param name 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectMySubmit(String name) { - return productdemandMapper.selectMine(name); - } - - /** - * 查询当前登陆用户的审批过的以及未审批的提交信息 - * - * @param name 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectMyApprove(String name) { - return productdemandMapper.selectMine(name); - } - - - /** - * 根据当前用户统计所有任务个数 - * - * @param name 通常productdemand一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - */ - public Integer countMineSubmit(String name) { - return productdemandMapper.countMine(name); - } - - /** - * 根据当前用户统计所有任务个数 - * - * @param name 通常productdemand一次查询只包含approver。 - * @return 反馈查询到的数据个数 - */ - public Integer countMineApprov(String name) { - return productdemandMapper.countMine(name); - } - - /** - * 查询当前登陆用户需要审批的提交信息 - * - * @param productdemand 待查询的数据 - * @return 反馈查询到的结果 - **/ - @Override - public List selectReadyApprove(Productdemand productdemand) { - - return productdemandMapper.selectByStatusAndUser(productdemand); - } - - /** - * 根据当前用户统计所有任务个数 - * - * @param productdemand 通常productdemand一次查询只包含submitor。 - * @return 反馈查询到的数据个数 - */ - @Override - public Integer countReadyApprove(Productdemand productdemand) { - return productdemandMapper.countByStatusAndUser(productdemand); - } - - @Override - public List queryFilesByObj(vProduct vProduct){ - return productdemandMapper.queryFilesByObj(vProduct); - } - -// @Override -// public Map PackageData(List data){ -// List twoNodes = new ArrayList<>(); -// List lineBoths = new ArrayList<>(); -// List areaCommonList = areaCommonService.getAreasByIdList(data); -// for(int i=0;i map = new HashMap<>(); -// map.put("list1",twoNodes); -// map.put("connlist",lineBoths); -// return map; -// } - @Override - public Map PackageData(List data){ - List twoNodes = new ArrayList<>(); - List lineBoths = new ArrayList<>(); - for(int i = 0 ;i map = new HashMap<>(); - map.put("list1",twoNodes); - map.put("connlist",lineBoths); - return map; - } - -} diff --git a/src/main/java/com/cetc32/dh/service/impl/SysInfoServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/SysInfoServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..b01a794b91a063650bb95f1fb4bde96792163464 --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/impl/SysInfoServiceImpl.java @@ -0,0 +1,161 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/5/7 上午11:19 + ******************************************************************************/ +package com.cetc32.dh.service.impl; + +import com.cetc32.dh.common.utils.DateUtils; +import com.cetc32.dh.entity.SysInfo; +import com.cetc32.dh.entity.SystemVisitLog; +import com.cetc32.dh.entity.UserVisit; +import com.cetc32.dh.mybatis.SysInfoMapper; +import com.cetc32.dh.mybatis.SystemVisitMapper; +import com.cetc32.dh.mybatis.UserVisitMapper; +import com.cetc32.dh.service.SysInfoService; +import com.cetc32.webutil.common.util.SecurityUserUtil; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +@Service +public class SysInfoServiceImpl implements SysInfoService { + @Autowired + SysInfoMapper sysInfoMapper; + @Autowired + UserVisitMapper userVisitMapper; + @Autowired + SystemVisitMapper systemVisitMapper; + + @Override + public List selectAll() { + return sysInfoMapper.selectAll(); + } + + @Override + public void insertOrUpdate(List sysInfos) { + if(sysInfos==null || sysInfos.size()==0) + return; + for(SysInfo s:sysInfos){ + try{ + sysInfoMapper.insertOrUpdateSysinfo(s); + }catch (Exception e ){ + e.printStackTrace(); + } + } + } + + @Override + public void updateUserAccessCount(String sysCode) { + java.sql.Date d = new java.sql.Date(new Date().getTime()); + UserVisit vu =new UserVisit(sysCode, SecurityUserUtil.getUser().getUsername()); + SystemVisitLog svl = new SystemVisitLog(sysCode + ,SecurityUserUtil.getUser().getUsername() + ,new java.sql.Date(new Date().getTime())); + //, DateUtils.floorDay(new Date())); + try{ + userVisitMapper.insertOrUpdateUserVisit(vu); + systemVisitMapper.insertOrUpdateSystemVisit(svl); + }catch (Exception e){ + e.printStackTrace(); + + } + } + + @Override + public List selectMyHotAppTop6() { + String userName = SecurityUserUtil.getUser().getUsername(); + return userVisitMapper.selectHotSysByUser(6, userName); + } + + @Override + public List selectMyHotApp() { + return userVisitMapper.selectHotSysByUser(null, SecurityUserUtil.getUser().getUsername()); + } + + @Override + public Long countAllAppAccess(){ + return userVisitMapper.countAllAppAccess(); + } + + @Override + public List selectAllMyApps(Integer limit,Integer offset,String keyWord){ + String searCodes = getSysCodes(); + if(StringUtils.isNotBlank(keyWord)){ + if("%%".equals(keyWord.trim()) + || "%".equals(keyWord)){ + keyWord=""; + }else{ + keyWord = keyWord.trim(); + if(!keyWord.startsWith("%")) + keyWord = "%" + keyWord; + if(!keyWord.endsWith("%")) + keyWord += "%"; + if("%%%".equals(keyWord)){ + keyWord="%%"; + } + } + } + return sysInfoMapper.selectAllAppsInCodes(searCodes,limit,offset,keyWord); + } + + @NotNull + private String getSysCodes() { + List permissions = SecurityUserUtil.getUser().getPermissions(); + HashSet sysCodes = new HashSet<>(); + + for (String p : permissions) { + if (StringUtils.isNotBlank(p)) + sysCodes.add(p.substring(0, 4)); + } + return "'"+(sysCodes.toString() + .replace("[", "") + .replace("]", "") + .replaceAll(" S"," 'S") + .replaceAll(",","',")).trim().concat("'"); + } + + @Override + public Integer countAllMyApps(String keyWord) { + String searCodes = getSysCodes(); + + return sysInfoMapper.countAllAppsInCodes(searCodes,keyWord); + } + + @Override + public List selectLatest7Days() { + return systemVisitMapper.selectLatest7Days(SecurityUserUtil.getUser().getUsername()); + //List systemVisitLogsList = systemVisitMapper.selectLatest7Days(SecurityUserUtil.getUser().getUsername()); + } + + public boolean contains(List array,Object object) { + Object[] a = array.toArray(); + int s = array.size(); + if (object != null) { + for (int i = 0; i < s; i++) { + if (object.equals(a[i])) { + return true; + } + } + } else { + for (int i = 0; i < s; i++) { + if (a[i] == null) { + return true; + } + } + } + return false; + } + + +} + + + diff --git a/src/main/java/com/cetc32/dh/utils/DateUtils.java b/src/main/java/com/cetc32/dh/utils/DateUtils.java deleted file mode 100644 index 0a22d816715c0bd4b72103fc7f24efc336924f71..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/utils/DateUtils.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cetc32.dh.utils; - -import org.apache.commons.lang.StringUtils; - -import java.text.SimpleDateFormat; -import java.util.Date; - -public class DateUtils { - public static final SimpleDateFormat yyyy_MM_dd =new SimpleDateFormat("yyyy-MM-dd"); - public static Date yyyy_MM_dd2Date(String str){ - try{ - if(StringUtils.isEmpty(str)) - return null; - System.out.println("format date String:"+str); - return yyyy_MM_dd.parse(str); - }catch(Exception e){ - return new Date(); - } - } -} - diff --git a/src/main/java/com/cetc32/dh/utils/JsonUtils.java b/src/main/java/com/cetc32/dh/utils/JsonUtils.java deleted file mode 100644 index 3b4a396884117bd1a729a9b0236469fdcc82310c..0000000000000000000000000000000000000000 --- a/src/main/java/com/cetc32/dh/utils/JsonUtils.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @Description: json转换 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.utils; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.util.List; - -/** - * @Title: JsonUtils - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/13 11:19 - */ -public class JsonUtils { - - // 定义jackson对象 - private static final ObjectMapper MAPPER = new ObjectMapper(); - - /** - * 将对象转换成json字符串 - * @param data - * @return String - */ - public static String objectToJson(Object data) { - try { - String string = MAPPER.writeValueAsString(data); - return string; - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - return null; - } - - /** - * 将json结果集转化为对象 - * @param jsonData - * @param beanType - * @param - * @return - */ - public static T jsonToPojo(String jsonData, Class beanType) { - try { - T t = MAPPER.readValue(jsonData, beanType); - return t; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - /** - * 将json数据转换成pojo对象list - * @param jsonData - * @param beanType - * @return - */ - public static List jsonToList(String jsonData, Class beanType) { - JavaType javaType = MAPPER.getTypeFactory().constructParametricType(List.class, beanType); - try { - List list = MAPPER.readValue(jsonData, javaType); - return list; - } catch (Exception e) { - e.printStackTrace(); - } - - return null; - } - -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c3a13fb747f97117280bb8df1a13523759f73c03..bb475b128d1e31979be83720f899edc8d2f792f4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,25 +1,7 @@ server: - port: 8081 - server.connectionTimeout: 18000000 - - - -## redis setting -# jedis.pool.host=localhost -# jedis.pool.port=6379 -# jedis.pool.timeout=3000000 -# jedis.pool.config.maxTotal=100 -# jedis.pool.config.maxIdle=10 -# jedis.pool.config.maxWaitMillis=10000 -# -# -# #thymeleaf -# spring.thymeleaf.prefix=classpath:/templates/ -# spring.thymeleaf.suffix=.html -# spring.thymeleaf.mode=LEGACYHTML5 -# spring.thymeleaf.encoding=UTF-8 -# spring.thymeleaf.cache=false - + port: 8087 + server: + connectionTimeout: 18000000 spring: application: @@ -30,30 +12,33 @@ spring: password: 123456 driver-class-name: org.postgresql.Driver -# datasource: -# url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 -# username: root -# password: 123 -# initial-size: 1 -# min-idle: 1 -# max-active: 20 -# test-on-borrow: true -# driver-class-name: com.mysql.cj.jdbc.Driver -# type: com.zaxxer.hikari.HikariDataSource + # datasource: + # url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 + # username: root + # password: 123 + # initial-size: 1 + # min-idle: 1 + # max-active: 20 + # test-on-borrow: true + # driver-class-name: com.mysql.cj.jdbc.Driver + # type: com.zaxxer.hikari.HikariDataSource servlet: multipart: max-file-size: 5GB max-request-size: 5GB -#设置静态资源路径，多个以逗号分隔 + #设置静态资源路径，多个以逗号分隔 resources: static-locations: classpath:static/,file:static/ + thymeleaf: + cache: false + mode: HTML mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 - configuration: - map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 + configuration: + map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 generator: targetProject: src/main/java @@ -69,6 +54,9 @@ storePath: /root/ upLoadPath: ${storePath}upLoad rootPath: /root/daohang/data -myPath: ${rootPath}/myPath/ +myPath: ${rootPath}myPath writePath: ${rootPath}/product -flowPath: ${rootPath}/flowpath/ +eip: http://192.168.1.5:8080/ +verifyUrl: http://192.168.1.42:8087/rest/auth/verify?token= +passportUrl: http://192.168.1.42:8087/?ReturnUrl= +defaultLoginRequiredEnable: false diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000000000000000000000000000000000000..3a8d4ee2288bfe1c7a3ca0ad1caa8c14de0c8f4a --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,67 @@ +server: + port: 8087 + server.connectionTimeout: 18000000 + +spring: + application: + name: dhManager + datasource: + url: jdbc:postgresql://127.0.0.1:5432/dhmanage + username: postgres + password: 123456 + driver-class-name: org.postgresql.Driver +# hikari: +# jdbc-url: jdbc:postgresql://192.168.1.60:5432/dhmanage +# driver-class-name: org.postgresql.Driver +# username: postgres +# password: 123456 + + + servlet: + multipart: + max-file-size: 5GB + max-request-size: 5GB + redis: + jedis: + pool: + max-wait: 10000 + max-idle: 10 + max-active: 100 + host: localhost + port: 6524 + password: E6346913E58C304C + database: 0 + +#设置静态资源路径，多个以逗号分隔 + resources: + static-locations: classpath:static/,file:static/ + thymeleaf: + cache: false + mode: HTML +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 + configuration: + map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 + +generator: + targetProject: src/main/java + mappers: tk.mybatis.mapper.common.Mapper + javaModel-targetPackage: com.cetc32.dh.entity + sqlMap-targetPackage: mapper + javaClient-targetPackage: com.cetc32.dh.mybatis +logging: + level: + com.cetc32.dh.mybatis: debug + +storePath: /root/ +upLoadPath: ${storePath}upLoad + +rootPath: /root/daohang/data +myPath: ${rootPath}myPath +writePath: ${rootPath}/product +basePassport: http://116.85.36.63:8080/DH +eip: http://192.168.1.209:8080/ +verifyUrl: http://192.168.1.206:8888/rest/auth/verify?token= +passportUrl: http://192.168.1.206:8888/?ReturnUrl= +defaultLoginRequiredEnable: true diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml index dc6ca8789994d8bcc4c2cf52c6de40ebd87bdbc5..6ba04e1f898e58c88ebc3c5bf608bb8eaec29d4e 100644 --- a/src/main/resources/application-xwy.yml +++ b/src/main/resources/application-xwy.yml @@ -1,31 +1,13 @@ server: - port: 8102 - server.connectionTimeout: 18000000 - - - -## redis setting -# jedis.pool.host=localhost -# jedis.pool.port=6379 -# jedis.pool.timeout=3000000 -# jedis.pool.config.maxTotal=100 -# jedis.pool.config.maxIdle=10 -# jedis.pool.config.maxWaitMillis=10000 -# -# -# #thymeleaf -# spring.thymeleaf.prefix=classpath:/templates/ -# spring.thymeleaf.suffix=.html -# spring.thymeleaf.mode=LEGACYHTML5 -# spring.thymeleaf.encoding=UTF-8 -# spring.thymeleaf.cache=false - + port: 8081 + server: + connectionTimeout: 18000000 spring: application: name: dhManager datasource: - url: jdbc:postgresql://localhost:5432/dh + url: jdbc:postgresql://192.168.1.60:5432/test_db username: postgres password: 123456 driver-class-name: org.postgresql.Driver @@ -49,6 +31,9 @@ spring: #设置静态资源路径，多个以逗号分隔 resources: static-locations: classpath:static/,file:static/ + thymeleaf: + cache: false + mode: HTML mybatis: mapper-locations: classpath:mapper/*.xml type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 @@ -63,7 +48,7 @@ generator: javaClient-targetPackage: com.cetc32.dh.mybatis logging: level: - com.cetc32.dh.mybatis: debug + com.cetc32: debug storePath: /root/ upLoadPath: ${storePath}upLoad @@ -71,8 +56,17 @@ upLoadPath: ${storePath}upLoad rootPath: /root/daohang/data myPath: ${rootPath}myPath writePath: ${rootPath}/product -flowPath: ${rootPath}/flowpath/ - -verifyUrl: http://127.0.0.1:8081/rest/auth/verify?token= -passportUrl: http://127.0.0.1:8081/?ReturnUrl= -defaultLoginRequiredEnable: true \ No newline at end of file +eip: http://192.168.1.209:8080/ +#verifyUrl: ${sso.authcenter}/rest/auth/verify?token= +#passportUrl: ${sso.authcenter}/?ReturnUrl= +#defaultLoginRequiredEnable: false +sso: + authcenter: http://192.168.1.206:8081 + verifyUrl: ${sso.authcenter}/rest/auth/verify?token= + passportUrl: ${sso.authcenter}/?ReturnUrl= + defaultLoginRequiredEnable: false + permission: S000^接口用户@/rest/auth/**;*权限管理@/**; + sysurl : http://192.168.1.206:${server.port} + sysname : 认证中心门户 + registerUrl : ${sso.authcenter}/rest/api/sys/sync + #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/** diff --git a/src/main/resources/application-xxx.yml b/src/main/resources/application-xxx.yml new file mode 100644 index 0000000000000000000000000000000000000000..9d7fd0ca6cd98292c15fe08912271a940272c331 --- /dev/null +++ b/src/main/resources/application-xxx.yml @@ -0,0 +1,72 @@ +server: + port: 8087 + server: + connectionTimeout: 18000000 + +spring: + application: + name: dhManager + datasource: + url: jdbc:postgresql://192.168.1.60:5432/dhmanage + username: postgres + password: 123456 + driver-class-name: org.postgresql.Driver + + # datasource: + # url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 + # username: root + # password: 123 + # initial-size: 1 + # min-idle: 1 + # max-active: 20 + # test-on-borrow: true + # driver-class-name: com.mysql.cj.jdbc.Driver + # type: com.zaxxer.hikari.HikariDataSource + + servlet: + multipart: + max-file-size: 5GB + max-request-size: 5GB + + #设置静态资源路径，多个以逗号分隔 + resources: + static-locations: classpath:static/,file:static/ + thymeleaf: + cache: false + mode: HTML +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 + configuration: + map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 + +generator: + targetProject: src/main/java + mappers: tk.mybatis.mapper.common.Mapper + javaModel-targetPackage: com.cetc32.dh.entity + sqlMap-targetPackage: mapper + javaClient-targetPackage: com.cetc32.dh.mybatis +logging: + level: + com.cetc32.dh.mybatis: debug + +storePath: /root/ +upLoadPath: ${storePath}upLoad + +rootPath: /root/daohang/data +myPath: ${rootPath}myPath +writePath: ${rootPath}/product +eip: http://192.168.1.209:8080/ +#verifyUrl: ${sso.authcenter}/rest/auth/verify?token= +#passportUrl: ${sso.authcenter}/?ReturnUrl= +#defaultLoginRequiredEnable: false +sso: + authcenter: http://192.168.1.206:8087 + verifyUrl: ${sso.authcenter}/rest/auth/verify?token= + passportUrl: ${sso.authcenter}/?ReturnUrl= + defaultLoginRequiredEnable: false + permission: S000^接口用户@/rest/auth/**;*权限管理@/**; + sysurl : http://192.168.1.206:${server.port} + sysname : 认证中心门户 + registerUrl : ${sso.authcenter}/rest/api/sys + #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/** diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 69e2ab0fc80744a95efed69a16c4bc9afc6d0c47..0016a48052dd3dd3e914f0770a7aae0968e90a15 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ #spring: # profiles: -# active: dev +# active: xxx # #热部署生效 diff --git a/src/main/resources/generator.xml b/src/main/resources/generator.xml index c8dbe819d99d1a2659251630e2a58dbcfd1d5c11..ae8c7c5f8bbaacd21ac1e85b7e19ebf17adfdfbc 100644 --- a/src/main/resources/generator.xml +++ b/src/main/resources/generator.xml @@ -9,7 +9,7 @@ - + @@ -25,7 +25,7 @@ - + - \ No newline at end of file + diff --git a/src/main/resources/generator_mysql.xml b/src/main/resources/generator_mysql.xml index f8be6736b4ec9250f5c446f7722666ad21968a8e..5e06f76d19441d0a1ec413691a5a74b59004f31a 100644 --- a/src/main/resources/generator_mysql.xml +++ b/src/main/resources/generator_mysql.xml @@ -8,7 +8,7 @@ - + diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties deleted file mode 100644 index 4c7436ca4b49eae0dd5b4246ecbed572eb3dfda4..0000000000000000000000000000000000000000 --- a/src/main/resources/jdbc.properties +++ /dev/null @@ -1,32 +0,0 @@ -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dhmanage?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false -##spring.datasource.driverClassName=com.mysql.jdbc.Driver -#spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -#spring.datasource.username=root -#spring.datasource.password=123 - -spring.datasource.url=jdbc:postgresql://192.168.1.60:5432/dhmanage -spring.datasource.username=postgres -spring.datasource.password=123456 -spring.datasource.driver-class-name=org.postgresql.Driver - -#Mybatis扫描 -mybatis.mapper-locations=classpath*:com/**/mapper/**.xml - -# Generator -generator.targetProject=src/main/java -#mapper的父类 -generator.mappers=tk.mybatis.mapper.common.Mapper -#pojo所在报名 -generator.javaModel-targetPackage=com.cetc32.dh.entity -#mapper.xml位于resource文件夹下的哪个目录中 -generator.sqlMap-targetPackage=mapper -#mapper包名 -generator.javaClient-targetPackage=com.cetc32.dh.mybatis - -#配置文件传输 -spring.servlet.multipart.enabled =true -spring.servlet.multipart.file-size-threshold =0 -#单个数据的大小 -spring.servlet.multipart.max-file-size = 50GB -#总数据的大小 -spring.servlet.multipart.max-request-size=50GB diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000000000000000000000000000000000..6220dfbd25fbb6c185f8a4ce4d9191665d21e171 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,263 @@ + + + + + + + + + + + logback-spring + + + + + + + + + + + + + + + + debug + + + + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${logging.path}/web_debug.log + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + UTF-8 + + + + + + + + ${logging.path}/web-debug-%d{yyyy-MM-dd}.%i.log + + + + 100MB + + + + 15 + + + + + + + + debug + + ACCEPT + + DENY + + + + + + + + ${logging.path}/web_info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${logging.path}/web-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${logging.path}/web_warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${logging.path}/web-warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${logging.path}/web_error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${logging.path}/web-error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/ActiveUserMapper.xml b/src/main/resources/mapper/ActiveUserMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..26f4d13838dcb901e7a87a13291d506d0a01e781 --- /dev/null +++ b/src/main/resources/mapper/ActiveUserMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + insert into login_log(ldate,total,cate) values(#{ldate},#{total},#{cate}) + on conflict (ldate,cate) do update set total =#{total} + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/AreaCommonMapper.xml b/src/main/resources/mapper/AreaCommonMapper.xml index 05147fea9a1a94aa04e3b8afad5cc6cbaf9c3fe7..018865c80059ab497600b36ebf882f9de74d435d 100644 --- a/src/main/resources/mapper/AreaCommonMapper.xml +++ b/src/main/resources/mapper/AreaCommonMapper.xml @@ -37,7 +37,7 @@ - SELECT * FROM area_common diff --git a/src/main/resources/mapper/BaseAdminPermissionMapper.xml b/src/main/resources/mapper/BaseAdminPermissionMapper.xml deleted file mode 100644 index f9e68b8eda486a68aed4986fc55960e51abd6ba7..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/BaseAdminPermissionMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - UPDATE base_admin_permission - - - name = #{name}, - - - pid = #{pid}, - - - descpt = #{descpt}, - - - url = #{url}, - - - update_time = #{updateTime} - - - WHERE id = #{id} - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/BaseAdminRoleMapper.xml b/src/main/resources/mapper/BaseAdminRoleMapper.xml index c859562ef0a52ab08367bd7ce7b005cdc6b80f46..6486ec4fabd4709ff87baa6151c8ab6ffcc85066 100644 --- a/src/main/resources/mapper/BaseAdminRoleMapper.xml +++ b/src/main/resources/mapper/BaseAdminRoleMapper.xml @@ -34,6 +34,7 @@ SELECT FROM base_admin_role limit #{results} OFFSET #{offset} + order by id asc + + + select base_admin_role.id, base_admin_role.role_name as name ,total as value from base_admin_role LEFT JOIN ( + select REPLACE(role_id,',','') as roleId ,count(*) as total from base_admin_user where base_admin_user.role_id is not null group by REPLACE(role_id,',','') ) as usercnt + on cast(usercnt.roleId as int) = base_admin_role."id" + + diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml index 7f02a135ca964ba5859c0b3a8138bc011b0a3ae1..f34d142e921bb6e35ff6189dcbfdc00cfb1ae526 100644 --- a/src/main/resources/mapper/BaseAdminUserMapper.xml +++ b/src/main/resources/mapper/BaseAdminUserMapper.xml @@ -11,44 +11,26 @@ - + + + + + + + + + - id,sys_user_name,sys_user_pwd,user_status,reg_time,user_phone,role_id,areacode,security,department + id,sys_user_name,sys_user_pwd,user_status,reg_time,user_phone,role_id,areacode,security,department, web_login_count, web_login_status, web_login_time, app_login_status, + app_login_time, app_login_count, loginfailed,realname - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE base_admin_user @@ -64,10 +46,39 @@ user_status = #{userStatus}, + + web_login_status = #{webLoginStatus}, + + + web_login_time = #{webLoginDate}, + + + web_login_count = #{webLoginCount}, + + + app_login_status = #{appLoginStatus}, + + + app_login_time = #{appLoginDate}, + + + app_login_count = #{appLoginCount}, + + + loginfailed = #{loginFailed}, + + role_id = #{roleId}, - user_phone = #{userPhone}, - areacode = #{areacode}, + + department = #{department} + + + areacode = #{areacode}, + + + user_phone = #{userPhone}, + WHERE id = #{id} @@ -99,7 +110,7 @@ SELECT FROM base_admin_user WHERE sys_user_name = #{userName} - and user_status = 1 + - SELECT id,sys_user_name as username,role_id as role,security,department,areacode,user_status as userStatus from base_admin_user + SELECT id,sys_user_name as username,role_id as role,security,department as department,areacode as areacode,user_status as userStatus , + reg_time as regTime, web_login_time as webLoginDate, web_login_status as webLoginStatus ,web_login_count as webLoginCount, + app_login_time as appLoginDate, app_login_status as appLoginStatus ,app_login_count as appLoginCount, + loginfailed as loginFailed,realname as realName ,user_phone as userPhone + from base_admin_user - - user_status = 1 - user_status = #{userStatus} @@ -131,23 +143,31 @@ and areacode LIKE '%' || #{areacode} || '%' - and department LIKE '%' || #{department} ||'%' + and department LIKE CONCAT('%' , #{department} , '%') and security = #{security} + + and loginfailed >= #{loginFailed} + - order by id ASC - LIMIT #{results} OFFSET #{offset} + + order by ${sortField} ${sortOrder} + + + ORDER BY id desc + + LIMIT #{results} OFFSET #{offset} - - @@ -226,6 +227,30 @@ department, + + web_login_count, + + + web_login_status, + + + web_login_time, + + + app_login_status, + + + app_login_time, + + + app_login_count, + + + loginfailed, + + + realname, + @@ -255,6 +280,30 @@ #{department}, + + #{webLoginCount,jdbcType=BIGINT}, + + + #{webLoginStatus,jdbcType=INTEGER}, + + + #{webLoginDate,jdbcType=TIMESTAMP}, + + + #{appLoginStatus,jdbcType=INTEGER}, + + + #{appLoginDate,jdbcType=TIMESTAMP}, + + + #{appLoginCount,jdbcType=BIGINT}, + + + #{loginFailed,jdbcType=INTEGER}, + + + #{realName,jdbcType=VARCHAR}, + @@ -263,8 +312,99 @@ select from base_admin_user where id= #{id,jdbcType=INTEGER} + + + + + + + - \ No newline at end of file + + + + + + + + UPDATE base_admin_user + + + sys_user_name = #{sysUserName}, + + + sys_user_pwd = #{sysUserPwd}, + + + security = #{security}, + + + user_status = #{userStatus}, + + + web_login_status = #{webLoginStatus}, + + + web_login_time = #{webLoginDate}, + + + web_login_count = #{webLoginCount}, + + + app_login_status = #{appLoginStatus}, + + + app_login_time = #{appLoginDate}, + + + app_login_count = #{appLoginCount}, + + + loginfailed = #{loginFailed}, + + + role_id = #{roleId}, + + + user_phone = #{userPhone}, + + + areacode = #{areacode}, + + + department = #{department}, + + + WHERE id = #{id} + + + + diff --git a/src/main/resources/mapper/CityMapper.xml b/src/main/resources/mapper/CityMapper.xml deleted file mode 100644 index 9f36a904dc6478c34466bdfe37d231420b5cb17b..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/CityMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml deleted file mode 100644 index e993f46506a8194d9b771e8b186dea51383d8204..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/DataFileMapper.xml +++ /dev/null @@ -1,570 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT nextval('data_file_id_seq'::regclass) as id - - insert into data_file - - - - id, - - - file_name, - - - - - file_security, - - - - file_path, - - - create_time, - - - region, - - - - file_time, - - - - file_size, - - - - file_numbers, - - - - file_discription, - - - - approver, - - - - submitor, - - - - gcs, - - - - scan_level, - - - - scale, - - - - lan, - - - - lon, - - - - status, - - - - menu_id, - - - - file_config, - - - - area - - - - - - - #{id}, - - - #{fileName ,jdbcType=VARCHAR}, - - - - - #{fileSecurity,jdbcType=VARCHAR}, - - - - #{filePath,jdbcType=VARCHAR}, - - - now(), - - - #{region,jdbcType=VARCHAR}, - - - - #{fileTime,jdbcType=TIMESTAMP}, - - - - #{fileSize,jdbcType=VARCHAR}, - - - - #{fileNumbers,jdbcType=INTEGER}, - - - - #{fileDiscription,jdbcType=VARCHAR}, - - - - #{approver,jdbcType=VARCHAR}, - - - - #{submitor,jdbcType=VARCHAR}, - - - - #{gcs,jdbcType=VARCHAR}, - - - - #{scanLevel,jdbcType=INTEGER}, - - - - #{scale,jdbcType=VARCHAR}, - - - - #{lan,jdbcType=VARCHAR}, - - - - #{lon,jdbcType=VARCHAR}, - - - - #{status,jdbcType=VARCHAR}, - - - - #{menuId,jdbcType=INTEGER}, - - - - #{fileConfig,jdbcType=VARCHAR}, - - - - #{area,jdbcType=VARCHAR}, - - - - - - insert into data_file - - - - file_name, - - - - menu_id, - - - - file_path, - - - create_time, - - - region, - - - - file_time, - - - - file_size, - - - - gcs, - - - - scan_level, - - - - scale, - - - - file_config, - - - - area, - - - - - - - - - #{fileName ,jdbcType=VARCHAR}, - - - - #{menuId,jdbcType=INTEGER}, - - - - #{filePath,jdbcType=VARCHAR}, - - - now(), - - - #{region,jdbcType=VARCHAR}, - - - - #{fileTime,jdbcType=TIMESTAMP}, - - - - #{fileSize,jdbcType=VARCHAR}, - - - - #{gcs,jdbcType=VARCHAR}, - - - - #{scanLevel,jdbcType=INTEGER}, - - - - #{scale,jdbcType=VARCHAR}, - - - - #{fileConfig,jdbcType=VARCHAR}, - - - - #{area,jdbcType=VARCHAR}, - - - - - - - - update data_file - - - file_name = #{fileName,jdbcType=VARCHAR}, - - - - file_security = #{fileSecurity,jdbcType=VARCHAR}, - - - file_path = #{filePath,jdbcType=VARCHAR}, - - - region = #{region,jdbcType=VARCHAR}, - - - file_time = #{fileTime,jdbcType=TIMESTAMP}, - - - file_size = #{fileSize,jdbcType=VARCHAR}, - - - file_numbers = #{fileNumbers,jdbcType=INTEGER}, - - - file_discription = #{fileDiscription,jdbcType=VARCHAR}, - - - approver = #{approver,jdbcType=VARCHAR}, - - - - submitor = #{submitor,jdbcType=VARCHAR}, - - - - gcs = #{gcs,jdbcType=VARCHAR}, - - - - scan_level = #{scanLevel,jdbcType=INTEGER}, - - - - scale = #{scale,jdbcType=VARCHAR}, - - - - lan = #{lan,jdbcType=VARCHAR}, - - - - lon = #{lon,jdbcType=VARCHAR}, - - - - status = #{status,jdbcType=VARCHAR}, - - - - menu_id = #{menuId,jdbcType=INTEGER}, - - - - file_config = #{fileConfig,jdbcType=VARCHAR}, - - - - area = #{area,jdbcType=VARCHAR}, - - - approve_time = now() - - - where id = #{id,jdbcType=BIGINT} - - - - - - delete from data_file - where id = #{id,jdbcType=BIGINT} - - - - delete from data_file - where menu_id = #{menuId,jdbcType=INTEGER} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/DataMenuMapper.xml b/src/main/resources/mapper/DataMenuMapper.xml deleted file mode 100644 index 5c0f6ccfac4723314ab75e1ca04d91d977e46a11..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/DataMenuMapper.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - SELECT nextval('data_menu_id_seq'::regclass) as id - - insert into data_menu - - - - id, - - - - menu_name, - - - - pid, - - - - discription, - - - - url, - - - - key, - - - - html_url, - - - - disabled, - - - - icon, - - - - addkids, - - - - - - - - - #{id,jdbcType=BIGINT}, - - - - #{menuName ,jdbcType=VARCHAR}, - - - - #{pid,jdbcType=BIGINT}, - - - - #{discription,jdbcType=VARCHAR}, - - - - #{url,jdbcType=VARCHAR}, - - - - #{key,jdbcType=VARCHAR}, - - - - #{htmlUrl,jdbcType=VARCHAR}, - - - - #{disabled,jdbcType=BIT}, - - - - #{icon,jdbcType=VARCHAR}, - - - - #{addkids,jdbcType=BIT}, - - - - - - - - - update data_menu - - - menu_name = #{menuName,jdbcType=VARCHAR}, - - - pid = #{pid,jdbcType=BIGINT}, - - - discription = #{discription,jdbcType=VARCHAR}, - - - - url = #{url,jdbcType=VARCHAR}, - - - - key = #{key,jdbcType=VARCHAR}, - - - - html_url = #{htmlUrl,jdbcType=VARCHAR}, - - - - disabled = #{disabled,jdbcType=BIT}, - - - - addkids = #{addkids,jdbcType=BIT}, - - - - icon = #{icon,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - - - - - - - - - - - - - - - - delete from data_menu - where id = #{id,jdbcType=BIGINT} - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/DataPlpMapper.xml b/src/main/resources/mapper/DataPlpMapper.xml deleted file mode 100644 index bdef12f1b688a3afe075bacbf12b74eb33baa7ec..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/DataPlpMapper.xml +++ /dev/null @@ -1,432 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into data_plp - - - - id, - - - - user_id, - - - - event_type, - - - - points, - - - - region, - - - create_time, - - - description, - - - - security, - - - - - approver, - - - - approve_time, - - - - status, - - - - file_config, - - - - file_name, - - - - file_time, - - - - photo_byte, - - - - submitor, - - - - menu_id, - - - - reserver2, - - - - - - - - - #{id,jdbcType=INTEGER}, - - - - #{userId,jdbcType=INTEGER}, - - - - #{eventType ,jdbcType=VARCHAR}, - - - - #{points,jdbcType=VARCHAR}, - - - - #{region,jdbcType=VARCHAR}, - - - now(), - - - #{description,jdbcType=VARCHAR}, - - - - #{security,jdbcType=VARCHAR}, - - - - #{approver,jdbcType=VARCHAR}, - - - - #{approveTime,jdbcType=TIMESTAMP}, - - - - #{status,jdbcType=VARCHAR}, - - - - #{fileConfig,jdbcType=VARCHAR}, - - - - #{fileName,jdbcType=VARCHAR}, - - - - #{fileTime,jdbcType=VARCHAR}, - - - - #{photoByte,jdbcType=VARCHAR}, - - - - #{submitor,jdbcType=VARCHAR}, - - - - #{menuId,jdbcType=INTEGER}, - - - - #{reserver2,jdbcType=VARCHAR}, - - - - - - - insert into data_plp - - - - userid, - - - - file_type, - - - - points, - - - - region, - - - - create_time, - - - - description, - - - - photo_byte - - - - - - - - - #{userid,jdbcType=INTEGER}, - - - - #{eventtype ,jdbcType=VARCHAR}, - - - - #{points,jdbcType=VARCHAR}, - - - - #{cityname,jdbcType=VARCHAR}, - - - - #{uploadtime,jdbcType=VARCHAR}, - - - - #{describe,jdbcType=VARCHAR}, - - - - #{photo,jdbcType=VARCHAR} - - - - - - - - - update data_plp - - - - user_id = #{userId,jdbcType=INTEGER}, - - - - event_type = #{eventType ,jdbcType=VARCHAR}, - - - - points = #{points,jdbcType=VARCHAR}, - - - - region = #{region,jdbcType=VARCHAR}, - - - - description = #{description,jdbcType=VARCHAR}, - - - - security = #{security,jdbcType=VARCHAR}, - - - - approver = #{approver,jdbcType=VARCHAR}, - - - - status = #{status,jdbcType=VARCHAR}, - - - - file_config = #{fileConfig,jdbcType=VARCHAR}, - - - - file_name = #{fileName,jdbcType=VARCHAR}, - - - - file_time = #{fileTime,jdbcType=VARCHAR}, - - - - photo_byte = #{photoByte,jdbcType=VARCHAR}, - - - - submitor = #{submitor,jdbcType=VARCHAR}, - - - - menu_id = #{menuId,jdbcType=INTEGER}, - - - - reserver2 = #{reserver2,jdbcType=VARCHAR}, - - approve_time = now() - - where id = #{id,jdbcType=INTEGER} - - - - - - delete from data_plp - where id = #{id,jdbcType=INTEGER} - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml deleted file mode 100644 index d7d05420478181bd8794841aa94f8e505eb8bea3..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/DataSubmitMapper.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - insert into data_submit - - - - id, - - - - subtype, - - - - plevel, - - - - submitor, - - - - status, - - - - path, - - - - approver, - - - - menuid, - - - - - title, - - - - area, - - - - year, - - - - file_type, - - - - subtime, - - - - review_time, - - - - file_size, - - - - file_numbers, - - - - file_discription, - - - - - - - - - - #{id}, - - - - #{subtype}, - - - - #{plevel}, - - - - #{submitor}, - - - - - #{status}, - - - - #{path}, - - - - #{approver}, - - - - #{menuid}, - - - - - #{title}, - - - - #{area}, - - - - #{year}, - - - - #{fileType}, - - - - #{subtime}, - - - - #{reviewTime}, - - - - #{fileSize}, - - - - #{fileNumbers}, - - - - #{fileDiscription}, - - - - - - - - - update data_submit - - - status = #{status}, - - - plevel = #{plevel}, - - - menuId = #{menuid}, - - - year = #{year}, - - - area = #{area}, - - - approver = #{approver}, - - - title = #{title}, - - - path = #{path}, - - - subtype = #{subtype}, - - - submitor = #{submitor}, - - - file_type = #{fileType}, - - - subtime = #{subtime}, - - - review_time = #{reviewTime}, - - - file_size = #{fileSize}, - - - file_numbers = #{fileNumbers}, - - - file_discription = #{fileDiscription}, - - - - where id = #{id} - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/DataTraceMapper.xml b/src/main/resources/mapper/DataTraceMapper.xml deleted file mode 100644 index b1a7f5f8bb799e440d4b0f2b0840cf1e10a4bbfa..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/DataTraceMapper.xml +++ /dev/null @@ -1,489 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into data_trace - - - - id, - - - - user_id, - - - - points, - - - create_time, - - - description, - - - - security, - - - - approver, - - - - approve_time, - - - - status, - - - - file_config, - - - - file_time, - - - - lat, - - - - lon, - - - - linkid, - - - - speed, - - - - direction, - - - - locsource, - - - - coordinateerror, - - - - deviceid, - - - - encrylongitude, - - - - enccrylatitude, - - - - flag, - - - - submitor, - - - - file_path, - - - - file_size, - - - - start_time, - - - - end_time, - - - - file_name, - - - - menu_id, - - - - - - - - - #{id,jdbcType=INTEGER}, - - - - #{userId,jdbcType=INTEGER}, - - - - #{points,jdbcType=VARCHAR}, - - - now(), - - - #{description,jdbcType=VARCHAR}, - - - - #{security,jdbcType=VARCHAR}, - - - - #{approver,jdbcType=VARCHAR}, - - - - #{approveTime,jdbcType=TIMESTAMP}, - - - - #{status,jdbcType=VARCHAR}, - - - - #{fileConfig,jdbcType=VARCHAR}, - - - - #{fileTime,jdbcType=VARCHAR}, - - - - #{lat,jdbcType=VARCHAR}, - - - - #{lon,jdbcType=VARCHAR}, - - - - #{linkid,jdbcType=VARCHAR}, - - - - #{speed,jdbcType=INTEGER}, - - - - #{direction,jdbcType=INTEGER}, - - - - #{locsource,jdbcType=INTEGER}, - - - - #{coordinateerror,jdbcType=INTEGER}, - - - - #{deviceid,jdbcType=VARCHAR}, - - - - #{encrylongitude,jdbcType=INTEGER}, - - - - #{enccrylatitude,jdbcType=INTEGER}, - - - - #{flag,jdbcType=BIT}, - - - - #{submitor,jdbcType=VARCHAR}, - - - - #{filePath,jdbcType=VARCHAR}, - - - - #{fileSize,jdbcType=VARCHAR}, - - - - #{startTime,jdbcType=TIMESTAMP}, - - - - #{endTime,jdbcType=TIMESTAMP}, - - - - #{fileName,jdbcType=VARCHAR}, - - - - #{menuId,jdbcType=INTEGER}, - - - - - - - - update data_trace - - - - user_id = #{userId,jdbcType=INTEGER}, - - - - points = #{points,jdbcType=VARCHAR}, - - - - description = #{description,jdbcType=VARCHAR}, - - - - security = #{security,jdbcType=VARCHAR}, - - - - approver = #{approver,jdbcType=VARCHAR}, - - - - status = #{status,jdbcType=VARCHAR}, - - - - file_config = #{fileConfig,jdbcType=VARCHAR}, - - - - file_time = #{fileTime,jdbcType=VARCHAR}, - - - - lat = #{lat,jdbcType=VARCHAR}, - - - - lon = #{lon,jdbcType=VARCHAR}, - - - - linkid = #{linkid,jdbcType=VARCHAR}, - - - - speed = #{speed,jdbcType=INTEGER}, - - - - direction = #{direction,jdbcType=INTEGER}, - - - - locsource = #{locsource,jdbcType=INTEGER}, - - - - coordinateerror = #{coordinateerror,jdbcType=INTEGER}, - - - - deviceid = #{deviceid,jdbcType=VARCHAR}, - - - - encrylongitude = #{encrylongitude,jdbcType=INTEGER}, - - - - enccrylatitude = #{enccrylatitude,jdbcType=INTEGER}, - - - - flag = #{flag,jdbcType=BIT}, - - - - submitor = #{submitor,jdbcType=VARCHAR}, - - - - file_path = #{filePath,jdbcType=VARCHAR}, - - - - file_size = #{fileSize,jdbcType=VARCHAR}, - - - - start_time = #{startTime,jdbcType=TIMESTAMP}, - - - - end_time = #{endTime,jdbcType=TIMESTAMP}, - - - - file_name = #{fileName,jdbcType=VARCHAR}, - - - - menu_id = #{menuId,jdbcType=INTEGER}, - - - approve_time = now() - - - where id = #{id,jdbcType=INTEGER} - - - - - - delete from data_trace - where id = #{id,jdbcType=INTEGER} - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/DemandSubmitMapper.xml b/src/main/resources/mapper/DemandSubmitMapper.xml deleted file mode 100644 index b0209d2691492bd37bd6dbc963323902765ba567..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/DemandSubmitMapper.xml +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - id, project_name, demand_name, demand_des, status, reporter, departmentid, approver, - approce_time, endtime, demand_classify, demand_attachment,areachoice,creattime,area,areaname - - - - - - - - - delete from demand_submit - where id = #{id,jdbcType=INTEGER} - - - insert into demand_submit (id, project_name, demand_name, - demand_des, status, reporter, - departmentid, approver, approce_time, - endtime, demand_classify, demand_attachment,areachoice,creattime,area,areaname - ) - values (#{id,jdbcType=INTEGER}, #{projectName,jdbcType=VARCHAR}, #{demandName,jdbcType=VARCHAR}, - #{demandDes,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{reporter,jdbcType=VARCHAR}, - #{departmentid,jdbcType=INTEGER}, #{approver,jdbcType=VARCHAR}, #{approceTime,jdbcType=TIMESTAMP}, - #{endtime,jdbcType=DATE}, #{demandClassify,jdbcType=VARCHAR}, #{demandAttachment,jdbcType=VARCHAR}, - #{areachoice,jdbcType=VARCHAR},#{creattime,jdbcType=TIMESTAMP},#{area,jdbcType=VARCHAR}, #{areaname,jdbcType=VARCHAR} - ) - - - insert into demand_submit - - - id, - - - project_name, - - - demand_name, - - - demand_des, - - - status, - - - reporter, - - - departmentid, - - - approver, - - - approce_time, - - - endtime, - - - demand_classify, - - - demand_attachment, - - - areachoice, - - - creattime, - - - area, - - - areaname, - - - - - #{id,jdbcType=INTEGER}, - - - #{projectName,jdbcType=VARCHAR}, - - - #{demandName,jdbcType=VARCHAR}, - - - #{demandDes,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - #{reporter,jdbcType=VARCHAR}, - - - #{departmentid,jdbcType=INTEGER}, - - - #{approver,jdbcType=VARCHAR}, - - - #{approceTime,jdbcType=TIMESTAMP}, - - - #{endtime,jdbcType=DATE}, - - - #{demandClassify,jdbcType=VARCHAR}, - - - #{demandAttachment,jdbcType=VARCHAR}, - - - #{areachoice,jdbcType=VARCHAR}, - - - #{creattime,jdbcType=TIMESTAMP}, - - - #{area,jdbcType=VARCHAR}, - - - #{areaname,jdbcType=VARCHAR}, - - - - - update demand_submit - - - project_name = #{projectName,jdbcType=VARCHAR}, - - - demand_name = #{demandName,jdbcType=VARCHAR}, - - - demand_des = #{demandDes,jdbcType=VARCHAR}, - - - status = #{status,jdbcType=VARCHAR}, - - - reporter = #{reporter,jdbcType=VARCHAR}, - - - departmentid = #{departmentid,jdbcType=INTEGER}, - - - approver = #{approver,jdbcType=VARCHAR}, - - - approce_time = #{approceTime,jdbcType=TIMESTAMP}, - - - endtime = #{endtime,jdbcType=DATE}, - - - demand_classify = #{demandClassify,jdbcType=VARCHAR}, - - - demand_attachment = #{demandAttachment,jdbcType=VARCHAR}, - - - areachoice = #{areachoice,jdbcType=VARCHAR}, - - - creattime = #{creattime,jdbcType=TIMESTAMP}, - - - area=#{area,jdbcType=VARCHAR}, - - - areaname=#{areaname,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update demand_submit - set project_name = #{projectName,jdbcType=VARCHAR}, - demand_name = #{demandName,jdbcType=VARCHAR}, - demand_des = #{demandDes,jdbcType=VARCHAR}, - status = #{status,jdbcType=VARCHAR}, - reporter = #{reporter,jdbcType=VARCHAR}, - departmentId = #{departmentid,jdbcType=INTEGER}, - approver = #{approver,jdbcType=VARCHAR}, - approce_time = #{approceTime,jdbcType=TIMESTAMP}, - endtime = #{endtime,jdbcType=DATE}, - demand_classify = #{demandClassify,jdbcType=VARCHAR}, - demand_attachment = #{demandAttachment,jdbcType=VARCHAR}, - areachoice = #{areachoice,jdbcType=VARCHAR}, - creattime = #{creattime,jdbcType=TIMESTAMP}, - area=#{area,jdbcType=VARCHAR}, - areaname=#{areaname,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml index 242599f6bdbec20719848e867c516d9e2e195290..1116504ab14613b317f5aa5110e42d741e33bee7 100644 --- a/src/main/resources/mapper/DepartmentMapper.xml +++ b/src/main/resources/mapper/DepartmentMapper.xml @@ -145,4 +145,11 @@ organizationid = #{organizationid,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER} - \ No newline at end of file + + diff --git a/src/main/resources/mapper/EstimateTaskMapper.xml b/src/main/resources/mapper/EstimateTaskMapper.xml deleted file mode 100644 index dd28fc01234778785398314a74277bdadf69c94c..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/EstimateTaskMapper.xml +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id, name, task_classify, task_type, task_path, starttime, endtime, creator, creattime, - status,approver,demandid,approvtime - - - - - - - - - - delete from estimate_task - where id = #{id,jdbcType=INTEGER} - - - insert into estimate_task (id, name, task_classify, - task_type, task_path, starttime, - endtime, creator, creattime, - status,approver,demandid,approvtime) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{taskClassify,jdbcType=VARCHAR}, - #{taskType,jdbcType=VARCHAR}, #{taskPath,jdbcType=VARCHAR}, #{starttime,jdbcType=TIMESTAMP}, - #{endtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, #{creattime,jdbcType=TIMESTAMP}, - #{status,jdbcType=VARCHAR},#{approver,jdbcType=VARCHAR},#{demadid,jdbcType=INTEGER},#{approvtime,jdbcType=TIMESTAMP}) - - - insert into estimate_task - - - id, - - - name, - - - task_classify, - - - task_type, - - - task_path, - - - starttime, - - - endtime, - - - creator, - - - creattime, - - - status, - - - approver, - - - demandid, - - - approvtime, - - - - - #{id,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{taskClassify,jdbcType=VARCHAR}, - - - #{taskType,jdbcType=VARCHAR}, - - - #{taskPath,jdbcType=VARCHAR}, - - - #{starttime,jdbcType=TIMESTAMP}, - - - #{endtime,jdbcType=TIMESTAMP}, - - - #{creator,jdbcType=VARCHAR}, - - - #{creattime,jdbcType=TIMESTAMP}, - - - #{status,jdbcType=VARCHAR}, - - - #{approver,jdbcType=VARCHAR}, - - - #{demandid,jdbcType=INTEGER}, - - - #{approvtime,jdbcType=TIMESTAMP}, - - - - - update estimate_task - - - name = #{name,jdbcType=VARCHAR}, - - - task_classify = #{taskClassify,jdbcType=VARCHAR}, - - - task_type = #{taskType,jdbcType=VARCHAR}, - - - task_path = #{taskPath,jdbcType=VARCHAR}, - - - starttime = #{starttime,jdbcType=TIMESTAMP}, - - - endtime = #{endtime,jdbcType=TIMESTAMP}, - - - creator = #{creator,jdbcType=VARCHAR}, - - - creattime = #{creattime,jdbcType=TIMESTAMP}, - - - status = #{status,jdbcType=VARCHAR}, - - - approver = #{approver,jdbcType=VARCHAR}, - - - demandid = #{demandid,jdbcType=INTEGER}, - - - approvtime=#{approvtime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update estimate_task - set name = #{name,jdbcType=VARCHAR}, - task_classify = #{taskClassify,jdbcType=VARCHAR}, - task_type = #{taskType,jdbcType=VARCHAR}, - task_path = #{taskPath,jdbcType=VARCHAR}, - starttime = #{starttime,jdbcType=TIMESTAMP}, - endtime = #{endtime,jdbcType=TIMESTAMP}, - creator = #{creator,jdbcType=VARCHAR}, - creattime = #{creattime,jdbcType=TIMESTAMP}, - status = #{status,jdbcType=VARCHAR}, - approver = #{approver,jdbcType=VARCHAR}, - demandid = #{demandid,jdbcType=INTEGER}, - approvtime=#{approvtime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OptionsMapper.xml b/src/main/resources/mapper/OptionsMapper.xml deleted file mode 100644 index 83f191186620a9cbcd9bd60d3998653f4f641439..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/OptionsMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml deleted file mode 100644 index f7be181114bb83d66f779fa71c85b1465be83ac2..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/OrganizationMapper.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - id, name,description - - - - - - - - - - - - - delete from organization - where id = #{id,jdbcType=INTEGER} - - - insert into organization (id, name, description - ) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR} - ) - - - insert into organization - - - id, - - - name, - - - description, - - - - - #{id,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - - - update organization - - - name = #{name,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update organization - set name = #{name,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/ProductdemandMapper.xml b/src/main/resources/mapper/ProductdemandMapper.xml deleted file mode 100644 index c6de3d797b6d4a24d7d58f793f806690c8f323d4..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/ProductdemandMapper.xml +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id, name, demand_classify, demandyear, taskdocument, starttime, endtime, status,approver,demandid, - creator,flowresult,creattime,approvtime,area - - - - - - - - delete from productdemand - where id = #{id,jdbcType=INTEGER} - - - insert into productdemand (id, name, demand_classify, - demandyear, taskdocument, starttime, - endtime, status,approver,demandid,creator,flowresult,creattime,approvtime,area) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{demandClassify,jdbcType=VARCHAR}, - #{demandyear,jdbcType=TIMESTAMP}, #{taskdocument,jdbcType=VARCHAR}, #{starttime,jdbcType=TIMESTAMP}, - #{endtime,jdbcType=TIMESTAMP}, #{status,jdbcType=VARCHAR},#{approver,jdbcType=VARCHAR},#{demandid,jdbcType=INTEGER},#{creator,jdbcType=VARCHAR}, - #{flowresult,jdbcType=VARCHAR},#{creattime,jdbcType=TIMESTAMP},#{approvtime,jdbcType=TIMESTAMP}, - #{area,jdbcType=VARCHAR}) - - - insert into productdemand - - - id, - - - name, - - - demand_classify, - - - demandyear, - - - taskdocument, - - - starttime, - - - endtime, - - - status, - - - approver, - - - demandid, - - - creator, - - - flowresult, - - - creattime, - - - approvtime, - - - area - - - - - #{id,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{demandClassify,jdbcType=VARCHAR}, - - - #{demandyear,jdbcType=TIMESTAMP}, - - - #{taskdocument,jdbcType=VARCHAR}, - - - #{starttime,jdbcType=TIMESTAMP}, - - - #{endtime,jdbcType=TIMESTAMP}, - - - #{status,jdbcType=VARCHAR}, - - - #{approver,jdbcType=VARCHAR}, - - - #{demandid,jdbcType=INTEGER}, - - - #{creator,jdbcType=VARCHAR}, - - - #{flowresult,jdbcType=VARCHAR}, - - - #{creattime,jdbcType=TIMESTAMP}, - - - #{approvtime,jdbcType=TIMESTAMP}, - - - #{area,jdbcType=VARCHAR}, - - - - - update productdemand - - - name = #{name,jdbcType=VARCHAR}, - - - demand_classify = #{demandClassify,jdbcType=VARCHAR}, - - - demandyear = #{demandyear,jdbcType=TIMESTAMP}, - - - taskdocument = #{taskdocument,jdbcType=VARCHAR}, - - - starttime = #{starttime,jdbcType=TIMESTAMP}, - - - endtime = #{endtime,jdbcType=TIMESTAMP}, - - - status = #{status,jdbcType=VARCHAR}, - - - approver = #{approver,jdbcType=VARCHAR}, - - - demandid = #{demandid,jdbcType=INTEGER}, - - - creator = #{creator,jdbcType=VARCHAR}, - - - flowresult=#{flowresult,jdbcType = VARCHAR}, - - - creattime=#{creattime,jdbcType=TIMESTAMP}, - - - approvtime=#{approvtime,jdbcType=TIMESTAMP}, - - - area = #{area,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update productdemand - set name = #{name,jdbcType=VARCHAR}, - demand_classify = #{demandClassify,jdbcType=VARCHAR}, - demandyear = #{demandyear,jdbcType=TIMESTAMP}, - taskdocument = #{taskdocument,jdbcType=VARCHAR}, - starttime = #{starttime,jdbcType=TIMESTAMP}, - endtime = #{endtime,jdbcType=TIMESTAMP}, - status = #{status,jdbcType=VARCHAR}, - approver = #{approver,jdbcType=VARCHAR}, - demandid = #{demandid,jdbcType=INTEGER}, - creator = #{creator,jdbcType=VARCHAR}, - flowresult=#{flowresult,jdbcType=VARCHAR}, - creattime=#{creattime,jdbcType=TIMESTAMP}, - approvtime=#{approvtime,jdbcType=TIMESTAMP}, - area=#{area,jdbcType=VARCHAR}, - where id = #{id,jdbcType=INTEGER} - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/SysInfoMapper.xml b/src/main/resources/mapper/SysInfoMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..cf793842d4ec45eedb64033dbd0b3ef6609a9066 --- /dev/null +++ b/src/main/resources/mapper/SysInfoMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + syscode,sysname,url,pcode + + + + + insert into sysinfos(syscode,sysname,pcode,url) values(#{sysCode},#{sysName},#{pCode},#{url}) + on conflict (syscode) do update set sysname =#{sysName},url = #{url} + + + + + + diff --git a/src/main/resources/mapper/SystemVisitMapper.xml b/src/main/resources/mapper/SystemVisitMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..c487c7e95d164e9ba1e6caac1d6908c1e2c596e0 --- /dev/null +++ b/src/main/resources/mapper/SystemVisitMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + syscode,logtime,username,total + + + + insert into systemvisit_log(syscode,username,total,logtime) values(#{sysCode},#{userName},#{total},#{logTime}) + on conflict (syscode,username,logtime) do + update set total = systemvisit_log.total +1 + where systemvisit_log.syscode=#{sysCode} and systemvisit_log.username =#{userName} and systemvisit_log.logtime = #{logTime} + + + + + + + + diff --git a/src/main/resources/mapper/UserVisitMapper.xml b/src/main/resources/mapper/UserVisitMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..b8428ab4246a268916ffba8273066d7847678c9e --- /dev/null +++ b/src/main/resources/mapper/UserVisitMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + syscode,sysname,username,visit + + + + insert into uservisit(syscode,username,visit) values(#{sysCode},#{userName},#{visit}) + on conflict (syscode,username) do + update set visit = uservisit.visit +1 + where uservisit.username= #{userName} and uservisit.syscode = #{sysCode} + + + + + diff --git a/src/main/resources/static/css/bootstrap.min.css b/src/main/resources/static/css/bootstrap.min.css new file mode 100644 index 0000000000000000000000000000000000000000..d65c66b1ba297eeb3b5976b71c64c736b41bb763 --- /dev/null +++ b/src/main/resources/static/css/bootstrap.min.css @@ -0,0 +1,5 @@ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} \ No newline at end of file diff --git a/src/main/resources/static/css/dmaku.css b/src/main/resources/static/css/dmaku.css new file mode 100644 index 0000000000000000000000000000000000000000..02e53bb946183dbeb3571934c29d30eba14e87a9 --- /dev/null +++ b/src/main/resources/static/css/dmaku.css @@ -0,0 +1,100 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/3/1 下午3:40 + ******************************************************************************/ + +/**************************************************************** + * * + * * + * * + * 努力创建完善、持续更新插件以及模板 * + * * +****************************************************************/ +@charset "utf-8"; +/* CSS reset */ +*{ font-family:"microsoft yahei",simsun,Tahoma,sans-serif;} +body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0; } +fieldset,img {border:0; } +ol,ul {list-style:none; } +h1,h2,h3,h4,h5,h6,button,input,select,textarea {font-size:100%;} +button::-moz-focus-inner,input::-moz-focus-inner{padding:0; border:0;} +table {border-collapse:collapse;border-spacing:0;} +i, cite, em, var, dfn, address {font-style: normal;} +body{ font-size:14px;} +a{color: #313131;text-decoration: none; } +a:hover{text-decoration: underline;} +a:active, a:focus{outline:none} +.fl{float: left;} +.fr{float: right;} +.clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; font-size:0;} +.clearfix{zoom:1;clear:both;} +.clear{clear:both; height:0; line-height:0; font-size:0;} +.hidden,.none{display: none;} + + + +/*.w1060{ width:1060px; height:auto; margin:0 auto;}*/ +.padding_nei{ /*写padding不撑开*/ + -webkit-box-sizing:border-box; + -moz-box-sizing:border-box; + -ms-box-sizing:border-box; + -o-box-sizing:border-box; + box-sizing:border-box; +} +.main01 .sousuo div{ + -webkit-border-radius: 17px; + -moz-border-radius: 17px; + -ms-border-radius:17px; + -o-border-radius:17px; + border-radius:17px; + } + +.w1100{ width:1100px; height:auto; margin:0 auto;} +.w1096{ width:1096px; height:auto; margin:0 auto;} + +/*注册页面*/ +.login_bj{ background:url(../img/bj_zhuce.jpg) no-repeat top center;} +.zhuce_body{ float:left; width:100%; height:auto;} +.zhuce_body .logo{ width:114px; height:54px; margin:53px 0 0 65px;} +.zhuce_body .zhuce_kong{ position:absolute; top:50%; left:50%; width:316px; height:408px; margin-left:-158px; margin-top:-239px;} +.zhuce_body .zhuce_kong .zc{width:316px; height:408px;} +.zhuce_body .zhuce_kong .zc .bj_bai{ float:left; width:314px; height:408px; padding-left:50px; background:#FFF;} +.zhuce_body .zhuce_kong .zc .bj_bai h3{ font:16px/70px "微软雅黑", "黑体"; color:#333333; width:270px; text-align:center;} +.zhuce_body .zhuce_kong .zc .bj_right{ float:left;width:185px; height:408px; padding-left:41px; background:#f8f8f8;} +.zhuce_kong > p{font:16px/70px "微软雅黑", "黑体"; text-align:center; color:#fff;} +.zhuce_body .zhuce_kong .zc .bj_bai .kuang_txt{ width:236px; height:32px; border:1px solid #dddddd; line-height:32px; padding-left:32px; color:#b1a9a9; margin-bottom:10px; } +.zhuce_body .zhuce_kong .zc .bj_bai .btn_zhuce{ width:236px; height:33px; background:#37b5f9; font-size:14px; line-height:33px; text-align:center; border:0px; color:#fff; border-radius:3px; cursor:pointer;} + +.zhuce_body .zhuce_kong .zc .bj_bai .phone{background:url(../img/zc_06.jpg) no-repeat 10px 10px;} +.zhuce_body .zhuce_kong .zc .bj_bai .email{background:url(../img/zc_lock.jpg) no-repeat 10px 10px;} +.zhuce_body .zhuce_kong .zc .bj_bai .possword{background:url(../img/zc_16.jpg) no-repeat 10px 10px;} +.zhuce_body .zhuce_kong .zc .bj_bai .yanzm{background:url(../img/zc_19.jpg) no-repeat 10px 10px; } + +.zhuce_body .zhuce_kong .zc .bj_bai .hui_kuang{ float:left; width:97px; height:31px; border:1px solid #dddddd;} +.zhuce_body .zhuce_kong .zc .bj_bai .shuaxin{ float:left; margin:0px 0 0 150px; width:14px; height:14px;} +.zhuce_body .zhuce_kong .zc .bj_bai div{ float:left; width:100%; line-height:43px;} +.zhuce_body .zhuce_kong .zc .bj_bai div input{ float:left; margin-top:15px;} +.zhuce_body .zhuce_kong .zc .bj_bai div span{ padding-left:5px;} +.zhuce_body .zhuce_kong .zc .bj_bai div .lan{ color:#19aaf8; padding-left:0px;} + + +.zhuce_body .zhuce_kong .zc .bj_right P { width:135px; font:12px/60px ""; color:#999999;} +.zhuce_body .zhuce_kong .zc .bj_right P a{ color:#37b5f9;} +.zhuce_body .zhuce_kong .zc .bj_right > a{ float:left; width:82px; height:28px; padding-left:51px; line-height:28px; margin-bottom:12px; border-radius:3px; } +.zhuce_body .zhuce_kong .zc .bj_right .zhuce_qq{ border:1px solid #37b5f9; color:#37b5f9; background:url(../img/zc_03.jpg) no-repeat 28px 7px #fff;} +.zhuce_body .zhuce_kong .zc .bj_right .zhuce_wb{ border:1px solid #f26d7e; color:#f26d7e; background:url(../img/zc_10.jpg) no-repeat 28px 7px #fff;} +.zhuce_body .zhuce_kong .zc .bj_right .zhuce_wx{ border:1px solid #00c800; color:#00c800; background:url(../img/zc_15.jpg) no-repeat 28px 7px #fff;} + +/*登录页面*/ +.zhuce_body .login_kuang{ position:absolute; top:50%; left:50%; width:512px; height:325px; margin-left:-256px; margin-top:-162px;} +.zhuce_body .login_kuang .zc{ width:512px; height:auto;} +.zhuce_body .login_kuang .zc .bj_bai{ float:left; width:261px; height:256px; padding-left:38px; background:#FFF;} +.zhuce_body .login_kuang .zc .bj_bai h3{ font:16px/70px "微软雅黑", "黑体"; color:#37b5f9; width:230px; text-align:left;} +.zhuce_body .login_kuang .zc .bj_right{ float:left;width:173px; height:256px; padding-left:37px; background:#f8f8f8;} +.zhuce_body .login_kuang .zc .bj_bai .kuang_txt{ width:220px; height:32px; border:1px solid #dddddd; background:#faffbd; line-height:32px; padding-left:4px; color:#b1a9a9; margin-bottom:10px; } +.zhuce_body .login_kuang .zc .bj_bai a{ color:#37b5f9; float:right; margin-right:35px;} +.zhuce_body .login_kuang .zc .bj_bai .btn_zhuce{ width:227px; height:33px; background:#37b5f9; font-size:14px; line-height:33px; text-align:center; border:0px; color:#fff; border-radius:3px; cursor:pointer;} +.zhuce_body .login_kuang .zc .bj_bai .btn_zhuce:hover,.login_qita_kuang .zc .left .btn_zhuce:hover{ background:#0065d0;} diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-Bold.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..1f22f07c99bd4d4b8fba9e00094df4e58e69def1 Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-Bold.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-BoldOblique.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-BoldOblique.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b8886cb5e099b264f5fa03d517f7c457a6bcce72 Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-BoldOblique.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-ExtraLight.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-ExtraLight.ttf new file mode 100644 index 0000000000000000000000000000000000000000..9c6cf9f9174efc6284517520af889d9cc2e84c26 Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-ExtraLight.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-Oblique.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-Oblique.ttf new file mode 100644 index 0000000000000000000000000000000000000000..300ea68b6c7e86999b09b109330037705e09aaaf Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans-Oblique.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSans.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans.ttf new file mode 100644 index 0000000000000000000000000000000000000000..5267218852f631928716a8005d7bf4b492aaf83d Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSans.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-Bold.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..cbcdd31d6002ad441ca5cc3b5d6aa8d32b97eb7d Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-Bold.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-BoldOblique.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-BoldOblique.ttf new file mode 100644 index 0000000000000000000000000000000000000000..da513440a2b2ac4746af4bbb62ba57c01fcce210 Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-BoldOblique.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-Oblique.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-Oblique.ttf new file mode 100644 index 0000000000000000000000000000000000000000..0185ce95a51d7cd86ada7c90709f34f10d6336f8 Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono-Oblique.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono.ttf new file mode 100644 index 0000000000000000000000000000000000000000..278cd7813974104fdcc1a873afbbd01a49d1e567 Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSansMono.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-Bold.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..d683eb282bc0e2ae21f0d45f47b639e400f295ac Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-Bold.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-BoldItalic.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-BoldItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b4831f76548d5e8be363827f5b6dcf8e869a6f8c Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-BoldItalic.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-Italic.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-Italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..45b508b829b3ccf15b22d646e40e681d2f67ddda Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif-Italic.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif.ttf b/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif.ttf new file mode 100644 index 0000000000000000000000000000000000000000..39dd3946d3d06442d8d25556e7c1c37663893688 Binary files /dev/null and b/src/main/resources/static/css/fonts/DejaVu/DejaVuSerif.ttf differ diff --git a/src/main/resources/static/css/fonts/DejaVu/LICENSE.txt b/src/main/resources/static/css/fonts/DejaVu/LICENSE.txt new file mode 100644 index 0000000000000000000000000000000000000000..254e2cc42a6d0135cccf2047768b9e44f25e666f --- /dev/null +++ b/src/main/resources/static/css/fonts/DejaVu/LICENSE.txt @@ -0,0 +1,99 @@ +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $ diff --git a/src/main/resources/static/css/fonts/DejaVu/dejavu.less b/src/main/resources/static/css/fonts/DejaVu/dejavu.less new file mode 100644 index 0000000000000000000000000000000000000000..71c2fa3a496a78a4b4c487b6eef8fe9e3b648532 --- /dev/null +++ b/src/main/resources/static/css/fonts/DejaVu/dejavu.less @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/3/2 上午10:15 + ******************************************************************************/ + +/*! + + + + + + + + + + + + + + + + + + + + + + +*/ +/* sans-serif */ +@font-face { + font-family: "DejaVu Sans"; + src: url("DjaVu/DejaVuSans.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Sans"; + font-weight: bold; + src: url("DjaVu/DejaVuSans-Bold.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Sans"; + font-style: italic; + src: url("DjaVu/DejaVuSans-Oblique.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Sans"; + font-weight: bold; + font-style: italic; + src: url("DjaVu/DejaVuSans-BoldOblique.ttf?v=1.1") format("truetype"); +} + +/* serif */ +@font-face { + font-family: "DejaVu Serif"; + src: url("DjaVu/DejaVuSerif.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Serif"; + font-weight: bold; + src: url("DjaVu/DejaVuSerif-Bold.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Serif"; + font-style: italic; + src: url("DjaVu/DejaVuSerif-Italic.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Serif"; + font-weight: bold; + font-style: italic; + src: url("DjaVu/DejaVuSerif-BoldItalic.ttf?v=1.1") format("truetype"); +} + +/* monospace */ +@font-face { + font-family: "DejaVu Mono"; + src: url("DjaVu/DejaVuSansMono.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Mono"; + font-weight: bold; + src: url("DjaVu/DejaVuSansMono-Bold.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Mono"; + font-style: italic; + src: url("DjaVu/DejaVuSansMono-Oblique.ttf?v=1.1") format("truetype"); +} +@font-face { + font-family: "DejaVu Mono"; + font-weight: bold; + font-style: italic; + src: url("DjaVu/DejaVuSansMono-BoldOblique.ttf?v=1.1") format("truetype"); +} diff --git a/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.eot b/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.eot new file mode 100644 index 0000000000000000000000000000000000000000..f8cb2325ed9518865bfd775b289e69741ba22a67 Binary files /dev/null and b/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.eot differ diff --git a/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.svg b/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.svg new file mode 100644 index 0000000000000000000000000000000000000000..19cfa8eafc9cae7870860fb552dd722edd2484af --- /dev/null +++ b/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.svg @@ -0,0 +1,188 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.ttf b/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.ttf new file mode 100644 index 0000000000000000000000000000000000000000..062aed535ab9809ec6bebe546556b906964088a0 Binary files /dev/null and b/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.ttf differ diff --git a/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.woff b/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.woff new file mode 100644 index 0000000000000000000000000000000000000000..7c2b4f7ae91ab12d54db1fe320482bf4cfd10916 Binary files /dev/null and b/src/main/resources/static/css/fonts/glyphs/KendoUIGlyphs.woff differ diff --git a/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.eot b/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.eot new file mode 100644 index 0000000000000000000000000000000000000000..072be59736003a758ed059d26a28994b4f9594b8 Binary files /dev/null and b/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.eot differ diff --git a/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.svg b/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.svg new file mode 100644 index 0000000000000000000000000000000000000000..36ddfdd228f31958c941d22a534c88a1bc2316a9 --- /dev/null +++ b/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.svg @@ -0,0 +1,1005 @@ + + + + + + +{ + "fontFamily": "WebComponentsIcons", + "majorVersion": 1, + "minorVersion": 0, + "fontURL": "http://www.telerik.com", + "description": "Web Components Icon Font\nFont generated by IcoMoon.", + "copyright": "Telerik, A Progress Company", + "designer": "Telerik, A Progress Company", + "designerURL": "http://www.telerik.com", + "license": "Apache License, Version 2.0", + "licenseURL": "http://www.apache.org/licenses/LICENSE-2.0.html", + "version": "Version 1.0", + "fontId": "WebComponentsIcons", + "psName": "WebComponentsIcons", + "subFamily": "Regular", + "fullName": "WebComponentsIcons" +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.ttf b/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b3ed85bd2c56b8a92f41a4100945243bb0ba6084 Binary files /dev/null and b/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.ttf differ diff --git a/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.woff b/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.woff new file mode 100644 index 0000000000000000000000000000000000000000..638b1b9bf0426c3fbd528384ddf922548c913942 Binary files /dev/null and b/src/main/resources/static/css/fonts/glyphs/WebComponentsIcons.woff differ diff --git a/src/main/resources/static/css/gm1.css b/src/main/resources/static/css/gm1.css new file mode 100644 index 0000000000000000000000000000000000000000..803bc03e3c7165d4f0661edec27023ad4103ed70 --- /dev/null +++ b/src/main/resources/static/css/gm1.css @@ -0,0 +1,279 @@ +* { + padding: 0; + margin: 0; + text-decoration: none; + list-style: none; } + +a { + color: black; } +body{ + background-image: url("../img/5731485aN1134b4f0.jpg"); + background-repeat: no-repeat; + background-size: 100% auto; +} +header { + width: 1100px; + height: 58px; + margin: 0 130px; + position: relative; + top: 10px; } + header p { + margin-left: 215px; + margin-top: -40px; + font-weight: 400; + font-size: 24px; } + header .top-1 { + float: left; + position: absolute; + top: 40px; + left: 950px; } + header .top-1 img { + float: left; + position: absolute; + top: 4px; } + header .top-1 span { + font-size: 12px; + color: gray; + margin-left: 25px; } + +.top-2 { + width: 1366px; + height: 35px; + background: #FFF8F0; + margin-top: 15px; } + .top-2 .top-2a { + float: left; + height: 35px; + line-height: 35px; } + .top-2 .top-2a img { + float: left; + position: absolute; + left: 255px; + top: 82px; } + .top-2 .top-2a p { + font-size: 12px; + margin: 0 280px; + color: gray; } + .top-2 .top-2a span { + font-size: 12px; + font-weight: 600; + color: black; } + +.top-3 { + /*width: 1365px; + /*background: #e93854;*/ + position: absolute; +} + .top-3 .img_1 { + width: 990px; + height: 475px; + margin: 0 auto; } + .top-3 #sign { + width: 350px; + height: 378px; + background: #fff; + position: absolute; + margin-top: calc(40vh - 189px); + margin-left: calc(50vw - 175px); + /*top: 28px; + left: 800px;*/ + z-index: 11; } + .top-3 #sign .si_top { + width: 100%; + height: 40px; + line-height: 40px; + font-size: 12px; + text-align: center; + color: #999999; } + .top-3 #sign .si_cen { + color: #F4F4F4; + border-bottom: 1px solid #f4f4f4; + width: 100%; + line-height: 50px; + position: relative; + z-index: 1111; } + .top-3 #sign .si_cen h2 { + color: #666; + float: left; + width: 48%; + text-align: center; + font-weight: 400; + cursor: pointer; + font-size: 18px; } + .top-3 #sign .si_cen span { + float: left; } + .top-3 #sign .si_cen .act { + color: red; + font-weight: 700; } + .top-3 #sign .tab { + display: none; } + .top-3 #sign .si_bom { + position: relative; } + .top-3 #sign .si_bom:hover .bom_1 { + transform: translateX(-80px); } + .top-3 #sign .si_bom:hover .bom_2 { + opacity: 1; } + .top-3 #sign .si_bom .bom_1 { + margin-left: 95px; + margin-top: 20px; + padding: 2px 3px; + border: 1px solid #F4F4F4; + transition: all .5s; } + .top-3 #sign .si_bom .bom_2 { + position: absolute; + top: 60px; + left: 195px; + opacity: 0; + z-index: 111; + transition: all 1s; } + .top-3 #sign .si_bom h6 { + color: #666666; + margin: 10px 0 5px 100px; } + .top-3 #sign .si_bom h6 span { + padding-right: 10px; } + .top-3 #sign .si_bom p { + width: 100%; + height: 40px; + line-height: 40px; + margin: 10px 0; + text-align: center; } + .top-3 #sign .si_bom p span { + font-size: 14px; + margin-right: 15px; } + .top-3 #sign .si_bom p span a { + color: #bfa6b3; } + .top-3 #sign .si_bom p img { + vertical-align: middle; } + .top-3 #sign .si_bom1 { + width: 100%; + height: 257px; + position: relative; } + .top-3 #sign .si_bom1 .error { + position: absolute; + top: -25px; + left: 30px; + z-index: 111; + font-size: 12px; + color: #e4393c; + padding-left: 30px; + border: 1px solid #faccc6; + line-height: 20px; + height: 20px; + padding-right: 85px; + background: #ffebeb; + display: none; } + .top-3 #sign .si_bom1 .error div { + width: 16px; + height: 16px; + float: left; + margin-right: 12px; + margin-top: 2px; + background: -104px -49px no-repeat; } + .top-3 #sign .si_bom1 ul { + width: 100%; } + .top-3 #sign .si_bom1 ul .top_1 { + margin-top: 75px; } + .top-3 #sign .si_bom1 ul li { + width: 253px; + height: 40px; + line-height: 40px; + margin: 30px 30px; } + .top-3 #sign .si_bom1 ul li input { + width: 211px; + height: 38px; + float: left; + border: 1px solid #999; + outline: none; + border-left: none !important; } + .top-3 #sign .si_bom1 ul li img { + vertical-align: middle; + float: left; } + .top-3 #sign .si_bom1 ul li button { + width: 100%; + height: 40px; + color: snow; + border: none; + background: #FF0000; + position: relative; + outline: none; + cursor: pointer; } + .top-3 #sign .si_bom1 ul li button a { + display: inline-block; + width: 100%; + height: 40px; + position: absolute; + top: 0; + left: 0; + color: snow; + font-size: 20px; + line-height: 40px; } + .top-3 #sign .si_bom1 ul li a { + float: right; } + .top-3 #sign .si_bom1 ul .bri { + margin: 0 30px; + height: 30px; + margin-top: -10px; } + .top-3 #sign .si_bom1 ul .bri a { + font-size: 12px; } + .top-3 #sign .si_bom1 ul .bri a:hover { + color: red; + text-decoration: underline; } + .top-3 #sign .si_bom1 ul .ent { + margin: 0 30px; } + .top-3 #sign .red { + color: red; } + .top-3 #sign .si_out { + width: 100%; + height: 40px; + line-height: 40px; + border-top: 1px solid #F4F4F4; } + .top-3 #sign .si_out ul { + margin: 10px 25px; } + .top-3 #sign .si_out ul li { + margin: 0 8px; + float: left; + text-align: center; } + .top-3 #sign .si_out ul li span { + margin-right: 7px; + font-size: 12px; } + .top-3 #sign .si_out ul li img { + vertical-align: middle; } + .top-3 #sign .si_out ul li:hover a span { + border-bottom: 1px solid red; + color: red; } + .top-3 #sign .si_out ul .f4 { + color: #F4F4F4; } + .top-3 #sign .si_out .rig { + float: right; } + .top-3 #sign .si_out h5 { + padding-right: 20px; } + .top-3 #sign .si_out h5 img { + vertical-align: middle; } + .top-3 #sign .si_out h5 a { + color: red; + font-size: 12px; } + +footer { + width: 1100px; + height: 30px; + margin: 6px 220px; } + footer ul { + width: 1100px; + float: left; } + footer ul li { + float: left; + margin: 8px; } + footer ul a { + font-size: 12px; + color: dimgray; } + footer ul li a:hover { + color: red; } + footer ul .little { + font-size: 10px; + line-height: 22px; } + footer span { + font-size: 12px; + color: dimgray; + margin: -15px 335px; } + +/*# sourceMappingURL=JD1.css.map */ diff --git a/src/main/resources/static/css/gm1.css.bak b/src/main/resources/static/css/gm1.css.bak new file mode 100644 index 0000000000000000000000000000000000000000..56b4ad1e14b7a7d10681549d7765d01c07ecf879 --- /dev/null +++ b/src/main/resources/static/css/gm1.css.bak @@ -0,0 +1,272 @@ +* { + padding: 0; + margin: 0; + text-decoration: none; + list-style: none; } + +a { + color: black; } + +header { + width: 1100px; + height: 58px; + margin: 0 130px; + position: relative; + top: 10px; } + header p { + margin-left: 215px; + margin-top: -40px; + font-weight: 400; + font-size: 24px; } + header .top-1 { + float: left; + position: absolute; + top: 40px; + left: 950px; } + header .top-1 img { + float: left; + position: absolute; + top: 4px; } + header .top-1 span { + font-size: 12px; + color: gray; + margin-left: 25px; } + +.top-2 { + width: 1366px; + height: 35px; + background: #FFF8F0; + margin-top: 15px; } + .top-2 .top-2a { + float: left; + height: 35px; + line-height: 35px; } + .top-2 .top-2a img { + float: left; + position: absolute; + left: 255px; + top: 82px; } + .top-2 .top-2a p { + font-size: 12px; + margin: 0 280px; + color: gray; } + .top-2 .top-2a span { + font-size: 12px; + font-weight: 600; + color: black; } + +.top-3 { + width: 1365px; + background: #E93854; + position: relative; } + .top-3 .img_1 { + width: 990px; + height: 475px; + margin: 0 auto; } + .top-3 #sign { + width: 350px; + height: 428px; + background: #fff; + position: absolute; + top: 28px; + left: 800px; + z-index: 11; } + .top-3 #sign .si_top { + width: 100%; + height: 40px; + line-height: 40px; + font-size: 12px; + text-align: center; + color: #999999; } + .top-3 #sign .si_cen { + color: #F4F4F4; + border-bottom: 1px solid #f4f4f4; + width: 100%; + line-height: 50px; + position: relative; + z-index: 1111; } + .top-3 #sign .si_cen h2 { + color: #666; + float: left; + width: 48%; + text-align: center; + font-weight: 400; + cursor: pointer; + font-size: 18px; } + .top-3 #sign .si_cen span { + float: left; } + .top-3 #sign .si_cen .act { + color: red; + font-weight: 700; } + .top-3 #sign .tab { + display: none; } + .top-3 #sign .si_bom { + position: relative; } + .top-3 #sign .si_bom:hover .bom_1 { + transform: translateX(-80px); } + .top-3 #sign .si_bom:hover .bom_2 { + opacity: 1; } + .top-3 #sign .si_bom .bom_1 { + margin-left: 95px; + margin-top: 20px; + padding: 2px 3px; + border: 1px solid #F4F4F4; + transition: all .5s; } + .top-3 #sign .si_bom .bom_2 { + position: absolute; + top: 60px; + left: 195px; + opacity: 0; + z-index: 111; + transition: all 1s; } + .top-3 #sign .si_bom h6 { + color: #666666; + margin: 10px 0 5px 100px; } + .top-3 #sign .si_bom h6 span { + padding-right: 10px; } + .top-3 #sign .si_bom p { + width: 100%; + height: 40px; + line-height: 40px; + margin: 10px 0; + text-align: center; } + .top-3 #sign .si_bom p span { + font-size: 14px; + margin-right: 15px; } + .top-3 #sign .si_bom p span a { + color: #bfa6b3; } + .top-3 #sign .si_bom p img { + vertical-align: middle; } + .top-3 #sign .si_bom1 { + width: 100%; + height: 257px; + position: relative; } + .top-3 #sign .si_bom1 .error { + position: absolute; + top: -25px; + left: 30px; + z-index: 111; + font-size: 12px; + color: #e4393c; + padding-left: 30px; + border: 1px solid #faccc6; + line-height: 20px; + height: 20px; + padding-right: 85px; + background: #ffebeb; + display: none; } + .top-3 #sign .si_bom1 .error div { + width: 16px; + height: 16px; + float: left; + margin-right: 12px; + margin-top: 2px; + background: url(../JD_img/pwd-icons-new.png) -104px -49px no-repeat; } + .top-3 #sign .si_bom1 ul { + width: 100%; } + .top-3 #sign .si_bom1 ul .top_1 { + margin-top: 75px; } + .top-3 #sign .si_bom1 ul li { + width: 253px; + height: 40px; + line-height: 40px; + margin: 30px 30px; } + .top-3 #sign .si_bom1 ul li input { + width: 211px; + height: 38px; + float: left; + border: 1px solid #999; + outline: none; + border-left: none !important; } + .top-3 #sign .si_bom1 ul li img { + vertical-align: middle; + float: left; } + .top-3 #sign .si_bom1 ul li button { + width: 100%; + height: 40px; + color: snow; + border: none; + background: #FF0000; + position: relative; + outline: none; + cursor: pointer; } + .top-3 #sign .si_bom1 ul li button a { + display: inline-block; + width: 100%; + height: 40px; + position: absolute; + top: 0; + left: 0; + color: snow; + font-size: 20px; + line-height: 40px; } + .top-3 #sign .si_bom1 ul li a { + float: right; } + .top-3 #sign .si_bom1 ul .bri { + margin: 0 30px; + height: 30px; + margin-top: -10px; } + .top-3 #sign .si_bom1 ul .bri a { + font-size: 12px; } + .top-3 #sign .si_bom1 ul .bri a:hover { + color: red; + text-decoration: underline; } + .top-3 #sign .si_bom1 ul .ent { + margin: 0 30px; } + .top-3 #sign .red { + color: red; } + .top-3 #sign .si_out { + width: 100%; + height: 40px; + line-height: 40px; + border-top: 1px solid #F4F4F4; } + .top-3 #sign .si_out ul { + margin: 10px 25px; } + .top-3 #sign .si_out ul li { + margin: 0 8px; + float: left; + text-align: center; } + .top-3 #sign .si_out ul li span { + margin-right: 7px; + font-size: 12px; } + .top-3 #sign .si_out ul li img { + vertical-align: middle; } + .top-3 #sign .si_out ul li:hover a span { + border-bottom: 1px solid red; + color: red; } + .top-3 #sign .si_out ul .f4 { + color: #F4F4F4; } + .top-3 #sign .si_out .rig { + float: right; } + .top-3 #sign .si_out h5 { + padding-right: 20px; } + .top-3 #sign .si_out h5 img { + vertical-align: middle; } + .top-3 #sign .si_out h5 a { + color: red; + font-size: 12px; } + +footer { + width: 1100px; + height: 30px; + margin: 6px 220px; } + footer ul { + width: 1100px; + float: left; } + footer ul li { + float: left; + margin: 8px; } + footer ul a { + font-size: 12px; + color: dimgray; } + footer ul li a:hover { + color: red; } + footer ul .little { + font-size: 10px; + line-height: 22px; } + footer span { + font-size: 12px; + color: dimgray; + margin: -15px 335px; } + +/*# sourceMappingURL=JD1.css.map */ diff --git a/src/main/resources/static/css/img/cicle_B.png b/src/main/resources/static/css/img/cicle_B.png new file mode 100644 index 0000000000000000000000000000000000000000..308c6e294be3049e5a9a2ded855179e090d635bb Binary files /dev/null and b/src/main/resources/static/css/img/cicle_B.png differ diff --git a/src/main/resources/static/css/img/cicle_G.png b/src/main/resources/static/css/img/cicle_G.png new file mode 100644 index 0000000000000000000000000000000000000000..2433443d07184fac89f1a3fcf7c57796717c4d1a Binary files /dev/null and b/src/main/resources/static/css/img/cicle_G.png differ diff --git a/src/main/resources/static/css/img/cicle_R.png b/src/main/resources/static/css/img/cicle_R.png new file mode 100644 index 0000000000000000000000000000000000000000..f66657f5c911350b4b9f662c7bae218a53410f0e Binary files /dev/null and b/src/main/resources/static/css/img/cicle_R.png differ diff --git a/src/main/resources/static/css/img/cicle_W.png b/src/main/resources/static/css/img/cicle_W.png new file mode 100644 index 0000000000000000000000000000000000000000..17d1f8df5e360bb1a0dd89f11e0a1d675d09428e Binary files /dev/null and b/src/main/resources/static/css/img/cicle_W.png differ diff --git a/src/main/resources/static/css/img/cicle_Y.png b/src/main/resources/static/css/img/cicle_Y.png new file mode 100644 index 0000000000000000000000000000000000000000..994e49646b2384481202325a52ca9f68b7763cd8 Binary files /dev/null and b/src/main/resources/static/css/img/cicle_Y.png differ diff --git a/src/main/resources/static/css/img/diy/1_close.png b/src/main/resources/static/css/img/diy/1_close.png new file mode 100644 index 0000000000000000000000000000000000000000..68ccb3c3b90170df7cddab1fe6e8e455c3854573 Binary files /dev/null and b/src/main/resources/static/css/img/diy/1_close.png differ diff --git a/src/main/resources/static/css/img/diy/1_open.png b/src/main/resources/static/css/img/diy/1_open.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ff36d3a99012028c6cf3d4009719108e31bc79 Binary files /dev/null and b/src/main/resources/static/css/img/diy/1_open.png differ diff --git a/src/main/resources/static/css/img/diy/2.png b/src/main/resources/static/css/img/diy/2.png new file mode 100644 index 0000000000000000000000000000000000000000..9eff506ba391fa1ddf0dc44d02ae84403700321b Binary files /dev/null and b/src/main/resources/static/css/img/diy/2.png differ diff --git a/src/main/resources/static/css/img/diy/3.png b/src/main/resources/static/css/img/diy/3.png new file mode 100644 index 0000000000000000000000000000000000000000..d7ba6d0c675c35197e2dae8a379155e67c0ac6cb Binary files /dev/null and b/src/main/resources/static/css/img/diy/3.png differ diff --git a/src/main/resources/static/css/img/diy/4.png b/src/main/resources/static/css/img/diy/4.png new file mode 100644 index 0000000000000000000000000000000000000000..753e2bfd5725b1f32cda4e41c36a448a4b12c280 Binary files /dev/null and b/src/main/resources/static/css/img/diy/4.png differ diff --git a/src/main/resources/static/css/img/diy/5.png b/src/main/resources/static/css/img/diy/5.png new file mode 100644 index 0000000000000000000000000000000000000000..0c5eccd562c303cf5197629ef5f2666b6180bd48 Binary files /dev/null and b/src/main/resources/static/css/img/diy/5.png differ diff --git a/src/main/resources/static/css/img/diy/6.png b/src/main/resources/static/css/img/diy/6.png new file mode 100644 index 0000000000000000000000000000000000000000..070b8352d7770e6be4b6f3cbc61f7ee21ae3e4da Binary files /dev/null and b/src/main/resources/static/css/img/diy/6.png differ diff --git a/src/main/resources/static/css/img/diy/7.png b/src/main/resources/static/css/img/diy/7.png new file mode 100644 index 0000000000000000000000000000000000000000..532b037f2045cfa26c62d23cb928ff7405f6fc18 Binary files /dev/null and b/src/main/resources/static/css/img/diy/7.png differ diff --git a/src/main/resources/static/css/img/diy/8.png b/src/main/resources/static/css/img/diy/8.png new file mode 100644 index 0000000000000000000000000000000000000000..a8f3a86e7091de4acdd38745f74b30f0f3d40f9e Binary files /dev/null and b/src/main/resources/static/css/img/diy/8.png differ diff --git a/src/main/resources/static/css/img/diy/9.png b/src/main/resources/static/css/img/diy/9.png new file mode 100644 index 0000000000000000000000000000000000000000..4db73cd41c95bc74496175625ce9ed3737e599f5 Binary files /dev/null and b/src/main/resources/static/css/img/diy/9.png differ diff --git a/src/main/resources/static/css/img/line_conn.gif b/src/main/resources/static/css/img/line_conn.gif new file mode 100644 index 0000000000000000000000000000000000000000..d561d36a915776730eb3069cee4c949f027667ed Binary files /dev/null and b/src/main/resources/static/css/img/line_conn.gif differ diff --git a/src/main/resources/static/css/img/loading.gif b/src/main/resources/static/css/img/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..e8c289293b11c889703d83dce6631fce90da4630 Binary files /dev/null and b/src/main/resources/static/css/img/loading.gif differ diff --git a/src/main/resources/static/css/img/triangle.png b/src/main/resources/static/css/img/triangle.png new file mode 100644 index 0000000000000000000000000000000000000000..1af5e0a8d05b86bbf9834c1c2bb42b4814c795f8 Binary files /dev/null and b/src/main/resources/static/css/img/triangle.png differ diff --git a/src/main/resources/static/css/img/zTreeStandard.gif b/src/main/resources/static/css/img/zTreeStandard.gif new file mode 100644 index 0000000000000000000000000000000000000000..50c94fd41ef9f1f7c07442d669923fd7a3226f55 Binary files /dev/null and b/src/main/resources/static/css/img/zTreeStandard.gif differ diff --git a/src/main/resources/static/css/img/zTreeStandard.png b/src/main/resources/static/css/img/zTreeStandard.png new file mode 100644 index 0000000000000000000000000000000000000000..ffda01ef1cccc398ee4e2327f4093ba1130a4961 Binary files /dev/null and b/src/main/resources/static/css/img/zTreeStandard.png differ diff --git a/src/main/resources/static/css/zTreeStyle.css b/src/main/resources/static/css/zTreeStyle.css new file mode 100644 index 0000000000000000000000000000000000000000..a6a3da9e735bd580ffabc81a23f53ae9e4f7574e --- /dev/null +++ b/src/main/resources/static/css/zTreeStyle.css @@ -0,0 +1,97 @@ +/*------------------------------------- +zTree Style + +version: 3.5.18 +author: Hunter.z +email: hunter.z@263.net +website: http://code.google.com/p/jquerytree/ + +-------------------------------------*/ + +.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif} +.ztree {margin:0; padding:5px; color:#333} +.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0} +.ztree li ul{ margin:0; padding:0 0 0 18px} +.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;} + +.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent; + text-decoration:none; vertical-align:top; display: inline-block} +.ztree li a:hover {text-decoration:underline} +.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;} +.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;} +.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid; + opacity:0.8; filter:alpha(opacity=80)} +.ztree li a.tmpTargetNode_prev {} +.ztree li a.tmpTargetNode_next {} +.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0; + font-size:12px; border:1px #7EC4CC solid; *border:0px} +.ztree li span {line-height:16px; margin-right:2px} +.ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle; + border:0 none; cursor: pointer;outline:none; + background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; + background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")} + +.ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto} +.ztree li span.button.chk.checkbox_false_full {background-position:0 0} +.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px} +.ztree li span.button.chk.checkbox_false_part {background-position:0 -28px} +.ztree li span.button.chk.checkbox_false_part_focus {background-position:0 -42px} +.ztree li span.button.chk.checkbox_false_disable {background-position:0 -56px} +.ztree li span.button.chk.checkbox_true_full {background-position:-14px 0} +.ztree li span.button.chk.checkbox_true_full_focus {background-position:-14px -14px} +.ztree li span.button.chk.checkbox_true_part {background-position:-14px -28px} +.ztree li span.button.chk.checkbox_true_part_focus {background-position:-14px -42px} +.ztree li span.button.chk.checkbox_true_disable {background-position:-14px -56px} +.ztree li span.button.chk.radio_false_full {background-position:-28px 0} +.ztree li span.button.chk.radio_false_full_focus {background-position:-28px -14px} +.ztree li span.button.chk.radio_false_part {background-position:-28px -28px} +.ztree li span.button.chk.radio_false_part_focus {background-position:-28px -42px} +.ztree li span.button.chk.radio_false_disable {background-position:-28px -56px} +.ztree li span.button.chk.radio_true_full {background-position:-42px 0} +.ztree li span.button.chk.radio_true_full_focus {background-position:-42px -14px} +.ztree li span.button.chk.radio_true_part {background-position:-42px -28px} +.ztree li span.button.chk.radio_true_part_focus {background-position:-42px -42px} +.ztree li span.button.chk.radio_true_disable {background-position:-42px -56px} + +.ztree li span.button.switch {width:18px; height:18px} +.ztree li span.button.root_open{background-position:-92px -54px} +.ztree li span.button.root_close{background-position:-74px -54px} +.ztree li span.button.roots_open{background-position:-92px 0} +.ztree li span.button.roots_close{background-position:-74px 0} +.ztree li span.button.center_open{background-position:-92px -18px} +.ztree li span.button.center_close{background-position:-74px -18px} +.ztree li span.button.bottom_open{background-position:-92px -36px} +.ztree li span.button.bottom_close{background-position:-74px -36px} +.ztree li span.button.noline_open{background-position:-92px -72px} +.ztree li span.button.noline_close{background-position:-74px -72px} +.ztree li span.button.root_docu{ background:none;} +.ztree li span.button.roots_docu{background-position:-56px 0} +.ztree li span.button.center_docu{background-position:-56px -18px} +.ztree li span.button.bottom_docu{background-position:-56px -36px} +.ztree li span.button.noline_docu{ background:none;} + +.ztree li span.button.ico_open{margin-right:2px; background-position:-110px -16px; vertical-align:top; *vertical-align:middle} +.ztree li span.button.ico_close{margin-right:2px; background-position:-110px 0; vertical-align:top; *vertical-align:middle} +.ztree li span.button.ico_docu{margin-right:2px; background-position:-110px -32px; vertical-align:top; *vertical-align:middle} +.ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle} +.ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle} + +.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle} + +ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)} + +span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute; + background-color:transparent; background-repeat:no-repeat; background-attachment: scroll; + background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")} + +ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)} +.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute} + +/* level style*/ +/*.ztree li span.button.level0 { + display:none; +} +.ztree li ul.level0 { + padding:0; + background:none; +}*/ \ No newline at end of file diff --git a/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_06.png b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_06.png new file mode 100644 index 0000000000000000000000000000000000000000..128b3be849d8633026c4d3a6df60c9e40362d895 Binary files /dev/null and b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_06.png differ diff --git a/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_11.png b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_11.png new file mode 100644 index 0000000000000000000000000000000000000000..2bf746a48ce9963a1ef00b930e824d4a4afcc094 Binary files /dev/null and b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_11.png differ diff --git a/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_15.png b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_15.png new file mode 100644 index 0000000000000000000000000000000000000000..6334c109a04e02f4e1d777c7340214b69334d8c8 Binary files /dev/null and b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_15.png differ diff --git a/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_17.png b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_17.png new file mode 100644 index 0000000000000000000000000000000000000000..07a6ac7c06bdbc18fbde90135b9184c660a5db8a Binary files /dev/null and b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_17.png differ diff --git a/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_19.png b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_19.png new file mode 100644 index 0000000000000000000000000000000000000000..59e6c9b9b061189beff62749cebafa9069c5b3c5 Binary files /dev/null and b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_19.png differ diff --git a/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_25.png b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_25.png new file mode 100644 index 0000000000000000000000000000000000000000..fee8da67646e3f56578a332812e8f8697a5d9ad7 Binary files /dev/null and b/src/main/resources/static/img/4de5019d2404d347897dee637895d02b_25.png differ diff --git a/src/main/resources/static/img/5731485aN1134b4f0.jpg b/src/main/resources/static/img/5731485aN1134b4f0.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5f6dd026faf380fe5765bd66b31e660b9ffd0e32 Binary files /dev/null and b/src/main/resources/static/img/5731485aN1134b4f0.jpg differ diff --git a/src/main/resources/static/img/a65a18e877a16246a92e1b755bd88a03_03.png b/src/main/resources/static/img/a65a18e877a16246a92e1b755bd88a03_03.png new file mode 100644 index 0000000000000000000000000000000000000000..7fb911d54a6c6f7c00ba967598670a7efcb050b0 Binary files /dev/null and b/src/main/resources/static/img/a65a18e877a16246a92e1b755bd88a03_03.png differ diff --git a/src/main/resources/static/img/a65a18e877a16246a92e1b755bd88a03_06.png b/src/main/resources/static/img/a65a18e877a16246a92e1b755bd88a03_06.png new file mode 100644 index 0000000000000000000000000000000000000000..b3a5c2b44c8a864d3221f5447904a1fe44ed05b5 Binary files /dev/null and b/src/main/resources/static/img/a65a18e877a16246a92e1b755bd88a03_06.png differ diff --git a/src/main/resources/static/img/bj_zhuce.jpg b/src/main/resources/static/img/bj_zhuce.jpg new file mode 100644 index 0000000000000000000000000000000000000000..013d98ef963fa1adfc0c905ccab6d4a742ebc987 Binary files /dev/null and b/src/main/resources/static/img/bj_zhuce.jpg differ diff --git a/src/main/resources/static/img/f760f80838eafa4ba85463ce6ce1298d_03.png b/src/main/resources/static/img/f760f80838eafa4ba85463ce6ce1298d_03.png new file mode 100644 index 0000000000000000000000000000000000000000..cd731e21207184d840771b7f96ba51404bf1eb3a Binary files /dev/null and b/src/main/resources/static/img/f760f80838eafa4ba85463ce6ce1298d_03.png differ diff --git a/src/main/resources/static/img/grow1.png b/src/main/resources/static/img/grow1.png new file mode 100644 index 0000000000000000000000000000000000000000..17ca284b8ea3bf54c790a26d3b759bf7790c118f Binary files /dev/null and b/src/main/resources/static/img/grow1.png differ diff --git a/src/main/resources/static/img/grow2.png b/src/main/resources/static/img/grow2.png new file mode 100644 index 0000000000000000000000000000000000000000..0b23762536375c412b10c6b419a9437a58be9936 Binary files /dev/null and b/src/main/resources/static/img/grow2.png differ diff --git a/src/main/resources/static/img/img11.png b/src/main/resources/static/img/img11.png new file mode 100644 index 0000000000000000000000000000000000000000..c441dacca6967bf924d06d2acece25ae8432390d Binary files /dev/null and b/src/main/resources/static/img/img11.png differ diff --git a/src/main/resources/static/img/img22.png b/src/main/resources/static/img/img22.png new file mode 100644 index 0000000000000000000000000000000000000000..d3f134c9baa981213973210e61c987fcd6bf6735 Binary files /dev/null and b/src/main/resources/static/img/img22.png differ diff --git a/src/main/resources/static/img/logo.jpg b/src/main/resources/static/img/logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f9e0b989e2c81034a03b06e58a21cfdad338ae64 Binary files /dev/null and b/src/main/resources/static/img/logo.jpg differ diff --git a/src/main/resources/static/img/logo.png b/src/main/resources/static/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..16bbd3f4c498eb96d3cb9fb2b22766c37e5659f8 Binary files /dev/null and b/src/main/resources/static/img/logo.png differ diff --git a/src/main/resources/static/img/logo1.jpg b/src/main/resources/static/img/logo1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e0c2eec9c73e602abc84076feb314868d7e63c3e Binary files /dev/null and b/src/main/resources/static/img/logo1.jpg differ diff --git a/src/main/resources/static/img/phone-orange.png b/src/main/resources/static/img/phone-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..f755456f149143c37e42c1dfd1516f650f6cf919 Binary files /dev/null and b/src/main/resources/static/img/phone-orange.png differ diff --git a/src/main/resources/static/img/pwd-icons-new.png b/src/main/resources/static/img/pwd-icons-new.png new file mode 100644 index 0000000000000000000000000000000000000000..8a45f08749f1abbdd37687d6116385594690b5de Binary files /dev/null and b/src/main/resources/static/img/pwd-icons-new.png differ diff --git a/src/main/resources/static/img/qq.png b/src/main/resources/static/img/qq.png new file mode 100644 index 0000000000000000000000000000000000000000..48b75933fab8205d232272187163995ada51be57 Binary files /dev/null and b/src/main/resources/static/img/qq.png differ diff --git a/src/main/resources/static/img/show.png b/src/main/resources/static/img/show.png new file mode 100644 index 0000000000000000000000000000000000000000..a8bd8cca145fec4aa5119799ff5c3a20eacd8535 Binary files /dev/null and b/src/main/resources/static/img/show.png differ diff --git a/src/main/resources/static/img/user_03.png b/src/main/resources/static/img/user_03.png new file mode 100644 index 0000000000000000000000000000000000000000..e6aedc8c5f9b96dc1fdbcb4814e370300707e545 Binary files /dev/null and b/src/main/resources/static/img/user_03.png differ diff --git a/src/main/resources/static/img/user_06.png b/src/main/resources/static/img/user_06.png new file mode 100644 index 0000000000000000000000000000000000000000..7e5fe9aa9204f3246e78bff609643958f2e1d428 Binary files /dev/null and b/src/main/resources/static/img/user_06.png differ diff --git a/src/main/resources/static/img/weixin.png b/src/main/resources/static/img/weixin.png new file mode 100644 index 0000000000000000000000000000000000000000..84952aac4ad6e92ae902e30d4f7a295d997c26a8 Binary files /dev/null and b/src/main/resources/static/img/weixin.png differ diff --git a/src/main/resources/static/img/zc_03.jpg b/src/main/resources/static/img/zc_03.jpg new file mode 100644 index 0000000000000000000000000000000000000000..83422d9257a8cedf3bacb847040ced91fd68384d Binary files /dev/null and b/src/main/resources/static/img/zc_03.jpg differ diff --git a/src/main/resources/static/img/zc_06.jpg b/src/main/resources/static/img/zc_06.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7f3f86b079d5308e24161d63a2f2db7b462b8436 Binary files /dev/null and b/src/main/resources/static/img/zc_06.jpg differ diff --git a/src/main/resources/static/img/zc_10.jpg b/src/main/resources/static/img/zc_10.jpg new file mode 100644 index 0000000000000000000000000000000000000000..81d33df8e26b2bc9e8680f4bafe5be2e51b54393 Binary files /dev/null and b/src/main/resources/static/img/zc_10.jpg differ diff --git a/src/main/resources/static/img/zc_12.jpg b/src/main/resources/static/img/zc_12.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4d91ca62c672557a0f1a28ee202bfe4679188d7f Binary files /dev/null and b/src/main/resources/static/img/zc_12.jpg differ diff --git a/src/main/resources/static/img/zc_15.jpg b/src/main/resources/static/img/zc_15.jpg new file mode 100644 index 0000000000000000000000000000000000000000..70d81d411f3d1bb434973be35236b6c244899f26 Binary files /dev/null and b/src/main/resources/static/img/zc_15.jpg differ diff --git a/src/main/resources/static/img/zc_16.jpg b/src/main/resources/static/img/zc_16.jpg new file mode 100644 index 0000000000000000000000000000000000000000..984399cf893abbc3f271d8219ce434bb1095d26b Binary files /dev/null and b/src/main/resources/static/img/zc_16.jpg differ diff --git a/src/main/resources/static/img/zc_19.jpg b/src/main/resources/static/img/zc_19.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f369d9071b21538223c15feca9f251e2ea3b0cd0 Binary files /dev/null and b/src/main/resources/static/img/zc_19.jpg differ diff --git a/src/main/resources/static/img/zc_22.jpg b/src/main/resources/static/img/zc_22.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b680497d22b5393777cf091d96f7eed5616333f5 Binary files /dev/null and b/src/main/resources/static/img/zc_22.jpg differ diff --git a/src/main/resources/static/img/zc_25.jpg b/src/main/resources/static/img/zc_25.jpg new file mode 100644 index 0000000000000000000000000000000000000000..99e855a3d95db7df47259064d038433b46cdeb81 Binary files /dev/null and b/src/main/resources/static/img/zc_25.jpg differ diff --git a/src/main/resources/static/img/zc_lock.jpg b/src/main/resources/static/img/zc_lock.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6c5c58792308f4ccf4ca0f11e0b969851f70923f Binary files /dev/null and b/src/main/resources/static/img/zc_lock.jpg differ diff --git a/src/main/resources/static/js/bootstrap-3.3.5.min.js b/src/main/resources/static/js/bootstrap-3.3.5.min.js new file mode 100644 index 0000000000000000000000000000000000000000..133aeecb98aa2b05d2dc1fcd623afcb37204828a --- /dev/null +++ b/src/main/resources/static/js/bootstrap-3.3.5.min.js @@ -0,0 +1,7 @@ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under the MIT license + */ +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.5",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.5",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.5",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.5",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&jdocument.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-mo.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.5",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.5",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(void 0===e[a+1]||b .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.5",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file diff --git a/src/main/resources/static/js/jquery-3.1.1.min.js b/src/main/resources/static/js/jquery-3.1.1.min.js new file mode 100644 index 0000000000000000000000000000000000000000..4c5be4c0fbe230e81d95718a18829e965a2d14b2 --- /dev/null +++ b/src/main/resources/static/js/jquery-3.1.1.min.js @@ -0,0 +1,4 @@ +/*! jQuery v3.1.1 | (c) jQuery Foundation | jquery.org/license */ +!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):C.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/[^\x20\t\r\n\f]+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R), +a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length\x20\t\r\n\f]+)/i,ka=/^$|\/(?:java|ecma)script/i,la={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};la.optgroup=la.option,la.tbody=la.tfoot=la.colgroup=la.caption=la.thead,la.th=la.td;function ma(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function na(a,b){for(var c=0,d=a.length;c-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=ma(l.appendChild(f),"script"),j&&na(g),c){k=0;while(f=g[k++])ka.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var qa=d.documentElement,ra=/^key/,sa=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ta=/^([^.]*)(?:\.(.+)|)/;function ua(){return!0}function va(){return!1}function wa(){try{return d.activeElement}catch(a){}}function xa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)xa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=va;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(qa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=ta.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i\x20\t\r\n\f]*)[^>]*)\/>/gi,za=/\s*$/g;function Da(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Ea(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Fa(a){var b=Ba.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ga(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c1&&"string"==typeof q&&!o.checkClone&&Aa.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ia(f,b,c,d)});if(m&&(e=pa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(ma(e,"script"),Ea),i=h.length;l")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=ma(h),f=ma(a),d=0,e=f.length;d0&&na(g,!i&&ma(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ja(this,a,!0)},remove:function(a){return Ja(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.appendChild(a)}})},prepend:function(){return Ia(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Da(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ia(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(ma(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!za.test(a)&&!la[(ja.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c1)}});function Ya(a,b,c,d,e){return new Ya.prototype.init(a,b,c,d,e)}r.Tween=Ya,Ya.prototype={constructor:Ya,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Ya.propHooks[this.prop];return a&&a.get?a.get(this):Ya.propHooks._default.get(this)},run:function(a){var b,c=Ya.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ya.propHooks._default.set(this),this}},Ya.prototype.init.prototype=Ya.prototype,Ya.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Ya.propHooks.scrollTop=Ya.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Ya.prototype.init,r.fx.step={};var Za,$a,_a=/^(?:toggle|show|hide)$/,ab=/queueHooks$/;function bb(){$a&&(a.requestAnimationFrame(bb),r.fx.tick())}function cb(){return a.setTimeout(function(){Za=void 0}),Za=r.now()}function db(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ba[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function eb(a,b,c){for(var d,e=(hb.tweeners[b]||[]).concat(hb.tweeners["*"]),f=0,g=e.length;f1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?ib:void 0)), +void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),ib={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=jb[b]||r.find.attr;jb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=jb[g],jb[g]=e,e=null!=c(a,b,d)?g:null,jb[g]=f),e}});var kb=/^(?:input|select|textarea|button)$/i,lb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):kb.test(a.nodeName)||lb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function mb(a){var b=a.match(K)||[];return b.join(" ")}function nb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,nb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,nb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=nb(c),d=1===c.nodeType&&" "+mb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=mb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,nb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=nb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(nb(c))+" ").indexOf(b)>-1)return!0;return!1}});var ob=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(ob,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:mb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ia.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,"$1"),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r(" + + + + + + +
+ +
+
+
+

密码修改

+
+ + + + + +
+ +
+ + +
+
+ +
+
+ +
+ + +
+
+ + + + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000000000000000000000000000000000000..8ef17b4e66eae04ff011033dc72c7cc54aa8a507 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,149 @@ + + + + + + + 登录 + + + + +
+

+ +
+ + + + +
+ + + +
+ +
+

用户登录

+ +
+ +
+
+ 请输入账户名和密码 +
+ +
+ + +
+
+
+ +
+ + 立即注册 +
+
+
+
+ + + + + + + + diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html new file mode 100644 index 0000000000000000000000000000000000000000..b546a10e4fc6339907644e8d60d18172d46e752e --- /dev/null +++ b/src/main/resources/templates/register.html @@ -0,0 +1,78 @@ + + + + + Web用户注册页面 - + + + + + + + + + + + +
+ +
+
+
+

欢迎注册

+
+ + + +
+ + + + +
+ + + + +
+   +
+ + +
+
+ +
+
+ +
+ + +
+
+ + + + diff --git a/src/main/resources/web-util-1.0.jar b/src/main/resources/web-util-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..cb4291c31254779b34976fc21269bf14bc5249cc Binary files /dev/null and b/src/main/resources/web-util-1.0.jar differ