diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..3e0d9aa6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + + +target +*.iml +*.ipr +*.iws +.idea +.classpath +.project +.settings +.DS_Store +*.bpmn/ +*logs/ +.metadata diff --git a/adc-da-base/HELP.md b/adc-da-base/HELP.md new file mode 100644 index 00000000..93b2bf9a --- /dev/null +++ b/adc-da-base/HELP.md @@ -0,0 +1,17 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/maven-plugin/reference/html/#build-image) +* [Java Mail Sender](https://docs.spring.io/spring-boot/docs/2.3.2.RELEASE/reference/htmlsingle/#boot-features-email) +* [MyBatis Framework](https://mybatis.org/spring-boot-starter/mybatis-spring-boot-autoconfigure/) + +### Guides +The following guides illustrate how to use some features concretely: + +* [MyBatis Quick Start](https://github.com/mybatis/spring-boot-starter/wiki/Quick-Start) +* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) + diff --git a/adc-da-base/pom.xml b/adc-da-base/pom.xml new file mode 100644 index 00000000..df6ad64a --- /dev/null +++ b/adc-da-base/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + + com.adc + foton-slrs-system-rest + 3.0.0 + + + com.adc + adc-da-base + 3.0.0 + adc-da-base + laws system rest base + + jar + + + 1.8 + + + + + org.springframework + spring-test + 5.2.8.RELEASE + compile + + + org.assertj + assertj-core + + + eu.bitwalker + UserAgentUtils + 1.21 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${java.version} + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + + + diff --git a/adc-da-base/src/main/java/com/adc/da/base/entity/BaseEntity.java b/adc-da-base/src/main/java/com/adc/da/base/entity/BaseEntity.java new file mode 100644 index 00000000..13f772ac --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/base/entity/BaseEntity.java @@ -0,0 +1,6 @@ +package com.adc.da.base.entity; + +public class BaseEntity { + public BaseEntity() { + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/base/entity/TreeEntity.java b/adc-da-base/src/main/java/com/adc/da/base/entity/TreeEntity.java new file mode 100644 index 00000000..29cd23db --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/base/entity/TreeEntity.java @@ -0,0 +1,72 @@ +package com.adc.da.base.entity; + +import java.util.List; + +public abstract class TreeEntity extends BaseEntity { + protected String id; + protected String name; + protected String parentId; + protected String parentIds; + protected T parent; + protected List childList; + protected Integer delFlag; + + public TreeEntity() { + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParentId() { + return this.parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getParentIds() { + return this.parentIds; + } + + public void setParentIds(String parentIds) { + this.parentIds = parentIds; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public List getChildList() { + return this.childList; + } + + public void setChildList(List childList) { + this.childList = childList; + } + + public T getParent() { + return this.parent; + } + + public void setParent(T parent) { + this.parent = parent; + } + + public Integer getDelFlag() { + return this.delFlag; + } + + public void setDelFlag(Integer delFlag) { + this.delFlag = delFlag; + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/base/page/BasePage.java b/adc-da-base/src/main/java/com/adc/da/base/page/BasePage.java new file mode 100644 index 00000000..8ad9eb73 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/base/page/BasePage.java @@ -0,0 +1,91 @@ +package com.adc.da.base.page; + +public class BasePage { + private Integer page = 1; + private Integer pageSize = 20; + private Integer startIndex; + private Integer endIndex; + private String orderBy; + private String order; + private String q; + private Pager pager = new Pager(); + + public BasePage() { + } + + public Pager getPager() { + this.pager.setPageId(this.getPage()); + this.pager.setPageSize(this.getPageSize()); + String orderField = ""; + if (this.orderBy != null && this.orderBy.trim().length() > 0) { + orderField = this.orderBy; + } + + if (orderField.trim().length() > 0 && this.order != null && this.order.trim().length() > 0) { + orderField = orderField + " " + this.order; + } + + this.pager.setOrderField(orderField); + return this.pager; + } + + public void setPager(Pager pager) { + this.pager = pager; + } + + public Integer getPage() { + return this.page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getPageSize() { + return this.pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public String getOrderBy() { + return this.orderBy; + } + + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + public String getOrder() { + return this.order; + } + + public void setOrder(String order) { + this.order = order; + } + + public String getQ() { + return this.q; + } + + public void setQ(String q) { + this.q = q; + } + + public Integer getStartIndex() { + return this.startIndex; + } + + public void setStartIndex(Integer startIndex) { + this.startIndex = (this.page - 1) * this.pageSize + 1; + } + + public Integer getEndIndex() { + return this.endIndex; + } + + public void setEndIndex(Integer endIndex) { + this.endIndex = this.page * this.pageSize; + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/base/page/Pager.java b/adc-da-base/src/main/java/com/adc/da/base/page/Pager.java new file mode 100644 index 00000000..92ac6ecf --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/base/page/Pager.java @@ -0,0 +1,169 @@ +package com.adc.da.base.page; + +public class Pager { + + private int pageId = 1; + private int rowCount = 0; + private int pageSize = 10; + private int pageCount = 0; + private int pageOffset = 0; + private int pageTail = 0; + private String orderField; + private boolean orderDirection = true; + private boolean pageEnabled = true; + private int length = 6; + private int startIndex = 0; + private int endIndex = 0; + private int[] indexs; + + public Pager() { + } + + public int getLength() { + return this.length; + } + + public void setLength(int length) { + this.length = length; + } + + public int[] getIndexs() { + int len = this.getEndIndex() - this.getStartIndex() + 1; + this.indexs = new int[len]; + + for(int i = 0; i < len; ++i) { + this.indexs[i] = this.getStartIndex() + i; + } + + return this.indexs; + } + + public void setIndexs(int[] indexs) { + this.indexs = indexs; + } + + public int getStartIndex() { + this.startIndex = (this.pageId - 1) * this.pageSize + 1; + return this.startIndex; + } + + public void setStartIndex(int startIndex) { + System.out.println("startIndx:" + this.pageId + ":" + this.pageSize); + this.startIndex = (this.pageId - 1) * this.pageSize + 1; + } + + public int getEndIndex() { + this.endIndex = this.pageId * this.pageSize; + return this.endIndex; + } + + public void setEndIndex(int endIndex) { + this.endIndex = this.pageId * this.pageSize; + } + + protected void doPage() { + this.pageCount = this.rowCount / this.pageSize + 1; + if (this.rowCount % this.pageSize == 0 && this.pageCount > 1) { + --this.pageCount; + } + + this.pageOffset = (this.pageId - 1) * this.pageSize; + this.pageTail = this.pageOffset + this.pageSize; + if (this.pageOffset + this.pageSize > this.rowCount) { + this.pageTail = this.rowCount; + } + + } + + public String getOrderCondition() { + String condition = ""; + if (this.orderField != null && this.orderField.length() != 0) { + condition = " order by " + this.orderField + (this.orderDirection ? " " : " desc "); + } + + return condition; + } + + public String getMysqlQueryCondition() { + String condition = ""; + if (this.pageEnabled) { + } + + return condition; + } + + public void setOrderDirection(boolean orderDirection) { + this.orderDirection = orderDirection; + } + + public boolean isOrderDirection() { + return this.orderDirection; + } + + public void setOrderField(String orderField) { + this.orderField = orderField; + } + + public String getOrderField() { + return this.orderField; + } + + public void setPageCount(int pageCount) { + this.pageCount = pageCount; + } + + public int getPageCount() { + return this.pageCount; + } + + public void setPageId(int pageId) { + this.pageId = pageId; + } + + public int getPageId() { + return this.pageId; + } + + public void setPageOffset(int pageOffset) { + this.pageOffset = pageOffset; + } + + public int getPageOffset() { + return this.pageOffset; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPageSize() { + return this.pageSize; + } + + public void setPageTail(int pageTail) { + this.pageTail = pageTail; + } + + public int getPageTail() { + return this.pageTail; + } + + public void setRowCount(int rowCount) { + this.rowCount = rowCount; + this.doPage(); + } + + public int getRowCount() { + return this.rowCount; + } + + public boolean isPageEnabled() { + return this.pageEnabled; + } + + public void setPageEnabled(boolean pageEnabled) { + this.pageEnabled = pageEnabled; + } + + +} diff --git a/adc-da-base/src/main/java/com/adc/da/base/web/BaseController.java b/adc-da-base/src/main/java/com/adc/da/base/web/BaseController.java new file mode 100644 index 00000000..b940e0d5 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/base/web/BaseController.java @@ -0,0 +1,81 @@ +package com.adc.da.base.web; + +import com.adc.da.base.page.Pager; +import com.adc.da.http.PageInfo; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class BaseController { + private static final String DATA = "data"; + private static final String TOTAL = "total"; + + protected BaseController() { + } + + public PageInfo getPageInfo(Pager pager, List rows) { + PageInfo pageInfo = new PageInfo(); + pageInfo.setList(rows); + pageInfo.setCount((long)pager.getRowCount()); + pageInfo.setPageSize(pager.getPageSize()); + pageInfo.setPageCount((long)pager.getPageCount()); + pageInfo.setPageNo(pager.getPageId()); + return pageInfo; + } + + public static Map getGridData(int total, List rows) { + Map response = new HashMap(); + response.put("total", total); + response.put("data", rows); + return response; + } + + public static Map getData(Object data) { + Map response = new HashMap(); + response.put("data", data); + return response; + } + + public static void download(HttpServletResponse response, File file) throws IOException { + download(response, file, file.getName()); + } + + public static void download(HttpServletResponse response, File file, String fileName) throws IOException { + FileInputStream in = new FileInputStream(file); + Throwable var4 = null; + + try { + download(response, (InputStream)in, fileName); + } catch (Throwable var13) { + var4 = var13; + throw var13; + } finally { + if (in != null) { + if (var4 != null) { + try { + in.close(); + } catch (Throwable var12) { + var4.addSuppressed(var12); + } + } else { + in.close(); + } + } + + } + + } + + public static void download(HttpServletResponse response, InputStream in, String fileName) throws IOException { + response.setContentType("application/x-msdownload;"); + response.addHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8")); + response.setCharacterEncoding("UTF-8"); + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/exception/AdcDaBaseException.java b/adc-da-base/src/main/java/com/adc/da/exception/AdcDaBaseException.java new file mode 100644 index 00000000..cf76c8eb --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/exception/AdcDaBaseException.java @@ -0,0 +1,25 @@ +package com.adc.da.exception; + +public class AdcDaBaseException extends RuntimeException { + private String errorCode; + + public AdcDaBaseException() { + } + + public AdcDaBaseException(String message) { + this("-1", message); + } + + public AdcDaBaseException(String errorCode, String message) { + super(message); + this.errorCode = errorCode; + } + + public String getErrorCode() { + return this.errorCode; + } + + public void setErrorCode(String errorCode) { + this.errorCode = errorCode; + } +} \ No newline at end of file diff --git a/adc-da-base/src/main/java/com/adc/da/file/store/IFileStore.java b/adc-da-base/src/main/java/com/adc/da/file/store/IFileStore.java new file mode 100644 index 00000000..8d1644d5 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/file/store/IFileStore.java @@ -0,0 +1,14 @@ +package com.adc.da.file.store; + +import java.io.IOException; +import java.io.InputStream; + + +public interface IFileStore { + + String storeFile(InputStream var1, String var2, String var3) throws IOException; + + InputStream loadFile(String var1); + + byte[] loadFileBytes(String var1); +} diff --git a/adc-da-base/src/main/java/com/adc/da/filter/AddExpiresHeaderResponse.java b/adc-da-base/src/main/java/com/adc/da/filter/AddExpiresHeaderResponse.java new file mode 100644 index 00000000..a0c7e0d1 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/filter/AddExpiresHeaderResponse.java @@ -0,0 +1,34 @@ +package com.adc.da.filter; + +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; +import java.util.Arrays; +import java.util.Calendar; + +public class AddExpiresHeaderResponse extends HttpServletResponseWrapper { + private static final String[] CACHEABLE_CONTENT_TYPES = new String[]{"text/css", "text/javascript", "application/javascript", "image/png", "image/jpeg", "image/gif", "image/jpg"}; + private long maxAge = 0L; + + public AddExpiresHeaderResponse(HttpServletResponse response, long maxAge) { + super(response); + this.maxAge = maxAge; + } + + public void setContentType(String contentType) { + if (contentType != null && Arrays.binarySearch(CACHEABLE_CONTENT_TYPES, contentType) > -1) { + Calendar inTwoMonths = Calendar.getInstance(); + inTwoMonths.add(2, 2); + super.setDateHeader("Expires", inTwoMonths.getTimeInMillis()); + super.setHeader("Cache-Control", "max-age=" + this.maxAge); + } else { + super.setHeader("Expires", "-1"); + super.setHeader("Cache-Control", "no-store, no-cache, must-revalidate"); + } + + super.setContentType(contentType); + } + + static { + Arrays.sort(CACHEABLE_CONTENT_TYPES); + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/filter/CsrfFilter.java b/adc-da-base/src/main/java/com/adc/da/filter/CsrfFilter.java new file mode 100644 index 00000000..e17a9ab8 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/filter/CsrfFilter.java @@ -0,0 +1,78 @@ +package com.adc.da.filter; + +import com.adc.da.util.FileUtil; +import com.adc.da.util.RequestUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Iterator; +import java.util.List; + +public class CsrfFilter implements Filter { + private static final Log logger = LogFactory.getLog(CsrfFilter.class); + private List whiteUrls; + private int whitelistSize = 0; + + public CsrfFilter() { + } + + public void init(FilterConfig filterConfig) { + String path = CsrfFilter.class.getResource("/").getFile(); + this.whiteUrls = FileUtil.readAsStringList(path + "white/csrfWhite.txt"); + this.whitelistSize = null == this.whiteUrls ? 0 : this.whiteUrls.size(); + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + try { + HttpServletRequest req = (HttpServletRequest)request; + HttpServletResponse res = (HttpServletResponse)response; + String url = req.getRequestURL().toString(); + String referurl = req.getHeader("Referer"); + if (this.isWhiteReq(referurl)) { + chain.doFilter(request, response); + } else { + req.getRequestDispatcher("/").forward(req, res); + String log = ""; + String date = (new SimpleDateFormat("yyyyMMddHHmmss")).format(new Date()); + String clientIp = RequestUtils.getClientIp(req); + log = "跨站请求---->>>" + clientIp + "||" + date + "||" + referurl + "||" + url; + logger.warn(log); + } + } catch (Exception var11) { + logger.error("doFilter Exception:", var11); + } + + } + + private boolean isWhiteReq(String referUrl) { + if (referUrl != null && !"".equals(referUrl) && this.whitelistSize != 0) { + String refHost = ""; + referUrl = referUrl.toLowerCase(); + if (referUrl.startsWith("http://")) { + refHost = referUrl.substring(7); + } else if (referUrl.startsWith("https://")) { + refHost = referUrl.substring(8); + } + Iterator iterator = this.whiteUrls.iterator(); + String urlTemp; + do { + if (!iterator.hasNext()) { + return false; + } + urlTemp = (String)iterator.next(); + } while(refHost.indexOf(urlTemp.toLowerCase()) <= -1); + return true; + } else { + return true; + } + } + + public void destroy() { + } +} \ No newline at end of file diff --git a/adc-da-base/src/main/java/com/adc/da/filter/FakeJSessionIdFilter.java b/adc-da-base/src/main/java/com/adc/da/filter/FakeJSessionIdFilter.java new file mode 100644 index 00000000..61608097 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/filter/FakeJSessionIdFilter.java @@ -0,0 +1,40 @@ +package com.adc.da.filter; + + +import com.adc.da.util.IpUtil; +import eu.bitwalker.useragentutils.UserAgent; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; + +public class FakeJSessionIdFilter implements Filter { + public FakeJSessionIdFilter() { + } + + public void destroy() { + } + + public void doFilter(ServletRequest req, ServletResponse resp, FilterChain filterChain) throws IOException, ServletException { + HttpServletRequest request = (HttpServletRequest)req; + String ip = (String)request.getSession().getAttribute("ip"); + String browser = (String)request.getSession().getAttribute("browser"); + UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent")); + String newBrowser = userAgent.getBrowser().toString(); + String newIp = IpUtil.getIpAddr(request); + if ("0:0:0:0:0:0:0:1".equals(newIp)) { + newIp = "127.0.0.1"; + } + + request.getSession().setAttribute("ip", newIp); + request.getSession().setAttribute("browser", newBrowser); + if (ip == null || browser == null || newBrowser.equals(browser) && newIp.equals(ip)) { + filterChain.doFilter(req, resp); + } else { + request.getSession().invalidate(); + } + } + + public void init(FilterConfig arg0) throws ServletException { + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/filter/HttpCacheFilter.java b/adc-da-base/src/main/java/com/adc/da/filter/HttpCacheFilter.java new file mode 100644 index 00000000..e6e5ae27 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/filter/HttpCacheFilter.java @@ -0,0 +1,33 @@ +package com.adc.da.filter; + +import org.apache.commons.lang3.StringUtils; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class HttpCacheFilter implements Filter { + private long maxAge = 86400L; + + public HttpCacheFilter() { + } + + public void destroy() { + } + + public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException { + HttpServletRequest request = (HttpServletRequest)req; + HttpServletResponse response = (HttpServletResponse)resp; + chain.doFilter(request, new AddExpiresHeaderResponse(response, this.maxAge)); + } + + public void init(FilterConfig config) throws ServletException { + String maxAgeStr = config.getInitParameter("maxAge"); + if (StringUtils.isNotEmpty(maxAgeStr)) { + this.maxAge = Long.valueOf(maxAgeStr); + } + + } +} + diff --git a/adc-da-base/src/main/java/com/adc/da/filter/RequestInfoFilter.java b/adc-da-base/src/main/java/com/adc/da/filter/RequestInfoFilter.java new file mode 100644 index 00000000..0665ec8f --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/filter/RequestInfoFilter.java @@ -0,0 +1,102 @@ +package com.adc.da.filter; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; + +public class RequestInfoFilter implements Filter { + private static final Log logger = LogFactory.getLog(RequestInfoFilter.class); + private static final List ignoreList = new ArrayList(); + + public RequestInfoFilter() { + } + + public void destroy() { + } + + public void init(FilterConfig filterConfig) throws ServletException { + ignoreList.add("js"); + ignoreList.add("css"); + ignoreList.add("png"); + ignoreList.add("ico"); + ignoreList.add("gif"); + ignoreList.add("jpg"); + } + + public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException { + HttpServletRequest request = (HttpServletRequest)req; + HttpServletResponse response = (HttpServletResponse)resp; + + try { + long startTime = System.currentTimeMillis(); + String uri = request.getServletPath() + (request.getPathInfo() == null ? "" : request.getPathInfo()); + if (!isIgnore(uri)) { + logger.info("==================== RequestInfoFilter Start ===================="); + logger.info(request.getMethod() + " : " + uri); + logger.info("session存活时间：" + request.getSession().getMaxInactiveInterval()); + this.logHeaders(request); + this.logParams(request); + logger.info(request.getHeader("Authorization")); + chain.doFilter(request, response); + long endTime = System.currentTimeMillis(); + logger.info(request.getMethod() + " 耗时：" + (endTime - startTime) + " ms"); + logger.info("==================== RequestInfoFilter End ===================="); + } else { + chain.doFilter(request, response); + } + } catch (Exception var11) { + logger.error("doFilter error", var11); + } + + } + + private void logHeaders(HttpServletRequest request) { + Map headerMap = new HashMap(); + Enumeration headers = request.getHeaderNames(); + + while(headers.hasMoreElements()) { + String headName = (String)headers.nextElement(); + if (headName != null && !"".equals(headName)) { + headerMap.put(headName, request.getHeader(headName)); + } + } + + headerMap.put("RemoteHost", request.getRemoteHost() + ":" + request.getRemotePort()); + logger.info(headerMap); + } + + private void logParams(HttpServletRequest request) { + Map maps = new HashMap(); + Enumeration keys = request.getParameterNames(); + + while(keys.hasMoreElements()) { + String key = (String)keys.nextElement(); + if (StringUtils.isNotEmpty(key)) { + String values = request.getParameter(key); + maps.put(key, values); + } + } + + logger.info(maps.toString()); + } + + private static final boolean isIgnore(String url) { + boolean ignore = false; + int index = url.lastIndexOf(46); + if (index > 0) { + String subFix = url.substring(index + 1, url.length()); + if (ignoreList.contains(subFix)) { + ignore = true; + } + } + + return ignore; + } +} + diff --git a/adc-da-base/src/main/java/com/adc/da/filter/WebFilter.java b/adc-da-base/src/main/java/com/adc/da/filter/WebFilter.java new file mode 100644 index 00000000..6feefd68 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/filter/WebFilter.java @@ -0,0 +1,29 @@ +package com.adc.da.filter; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; + +public class WebFilter implements Filter { + private static final Logger logger = LoggerFactory.getLogger(WebFilter.class); + public WebFilter() { + // 不做操作 + } + + public void init(FilterConfig config) throws ServletException { + // 不做操作 + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper((HttpServletRequest)request); + chain.doFilter(xssRequest, response); + } + + public void destroy() { + // 不做操作 + } + +} \ No newline at end of file diff --git a/adc-da-base/src/main/java/com/adc/da/filter/XssHttpServletRequestWrapper.java b/adc-da-base/src/main/java/com/adc/da/filter/XssHttpServletRequestWrapper.java new file mode 100644 index 00000000..3065b769 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/filter/XssHttpServletRequestWrapper.java @@ -0,0 +1,124 @@ +package com.adc.da.filter; + +import com.adc.da.xss.SQLFilter; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; + +public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { + private static final Logger logger = LoggerFactory.getLogger(XssHttpServletRequestWrapper.class); + HttpServletRequest orgRequest; + private static final SQLFilter sqlFilter = new SQLFilter(); + + public XssHttpServletRequestWrapper(HttpServletRequest request) { + super(request); + this.orgRequest = request; + } + + public ServletInputStream getInputStream() throws IOException { + String type = super.getHeader("Content-Type"); + if (StringUtils.indexOfIgnoreCase(type, "application/json") < 0) { + return super.getInputStream(); + } else { + String json = IOUtils.toString(super.getInputStream(), "utf-8"); + if (StringUtils.isBlank(json)) { + return super.getInputStream(); + } else { + json = this.xssSqlEncode(json); + final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8")); + return new ServletInputStream() { + public boolean isFinished() { + return true; + } + + public boolean isReady() { + return true; + } + + public void setReadListener(ReadListener readListener) { + // 不做操作 + } + + public int read() throws IOException { + return bis.read(); + } + }; + } + } + } + + public String getParameter(String name) { + String value = super.getParameter(this.xssSqlEncode(name)); + if (StringUtils.isNotBlank(value)) { + value = this.xssSqlEncode(value); + } + + return value; + } + + public String[] getParameterValues(String name) { + String[] parameters = super.getParameterValues(name); + if (parameters != null && parameters.length != 0) { + for(int i = 0; i < parameters.length; ++i) { + parameters[i] = this.xssSqlEncode(parameters[i]); + } + + return parameters; + } else { + return null; + } + } + + public Map getParameterMap() { + Map map = new LinkedHashMap(); + Map parameters = super.getParameterMap(); + Iterator i$ = parameters.keySet().iterator(); + + while(i$.hasNext()) { + String key = (String)i$.next(); + String[] values = (String[])parameters.get(key); + + for(int i = 0; i < values.length; ++i) { + values[i] = this.xssSqlEncode(values[i]); + } + + map.put(key, values); + } + + return map; + } + + public String getHeader(String name) { + String value = super.getHeader(this.xssSqlEncode(name)); + if (StringUtils.isNotBlank(value)) { + value = this.xssSqlEncode(value); + } + + return value; + } + + private String xssSqlEncode(String input) { + String htmlOutput = XssShieldUtil.stripXss(input); + // SQLFilter var10000 = sqlFilter; + return SQLFilter.sqlInject(htmlOutput); + } + + public HttpServletRequest getOrgRequest() { + return this.orgRequest; + } + + public static HttpServletRequest getOrgRequest(HttpServletRequest request) { + return request instanceof XssHttpServletRequestWrapper ? ((XssHttpServletRequestWrapper)request).getOrgRequest() : request; + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/filter/XssShieldUtil.java b/adc-da-base/src/main/java/com/adc/da/filter/XssShieldUtil.java new file mode 100644 index 00000000..55fde63e --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/filter/XssShieldUtil.java @@ -0,0 +1,96 @@ +package com.adc.da.filter; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class XssShieldUtil { + + private static final Logger logger = LoggerFactory.getLogger(XssShieldUtil.class); + private static List patterns = null; + + private XssShieldUtil(){ + super(); + } + + + private static List getXssPatternList() + { + List ret = new ArrayList(); + + ret.add(new Object[] { "<(no)?script[^>]*>.*?", Integer.valueOf(2) }); + ret.add(new Object[] { "eval\\((.*?)\\)", Integer.valueOf(42) }); + ret.add(new Object[] { "expression\\((.*?)\\)", Integer.valueOf(42) }); + ret.add(new Object[] { "(javascript:|vbscript:|view-source:)*", Integer.valueOf(2) }); +// ret.add(new Object[] { "<(\"[^\"]*\"|'[^']*'|[^'\">])*>", Integer.valueOf(42) }); + ret.add(new Object[] { "(window\\.location|window\\.|\\.location|document\\.cookie|document\\.|alert\\(.*?\\)|window\\.open\\()*", Integer.valueOf(42) }); + ret.add(new Object[] { "<+\\s*\\w*\\s*(oncontrolselect|oncopy|oncut|ondataavailable|ondatasetchanged|ondatasetcomplete|ondblclick|ondeactivate|ondrag|ondragend|ondragenter|ondragleave|ondragover|ondragstart|ondrop|onerror=|onerroupdate|onfilterchange|onfinish|onfocus|onfocusin|onfocusout|onhelp|onkeydown|onkeypress|onkeyup|onlayoutcomplete|onload|onlosecapture|onmousedown|onmouseenter|onmouseleave|onmousemove|onmousout|onmouseover|onmouseup|onmousewheel|onmove|onmoveend|onmovestart|onabort|onactivate|onafterprint|onafterupdate|onbefore|onbeforeactivate|onbeforecopy|onbeforecut|onbeforedeactivate|onbeforeeditocus|onbeforepaste|onbeforeprint|onbeforeunload|onbeforeupdate|onblur|onbounce|oncellchange|onchange|onclick|oncontextmenu|onpaste|onpropertychange|onreadystatechange|onreset|onresize|onresizend|onresizestart|onrowenter|onrowexit|onrowsdelete|onrowsinserted|onscroll|onselect|onselectionchange|onselectstart|onstart|onstop|onsubmit|onunload)+\\s*=+", Integer.valueOf(42) }); + return ret; + } + + private static List getPatterns() + { + if (patterns == null) + { + List list = new ArrayList(); + + String regex = null; + Integer flag = null; + int arrLength = 0; + int i; + Iterator localIterator = getXssPatternList().iterator(); + while (localIterator.hasNext()){ + Object[] arr = (Object[])localIterator.next(); + if(arr.length==0){ + continue; + } + regex = (String)arr[0]; + flag = (Integer)arr[1]; + list.add(Pattern.compile(regex, flag.intValue())); + } +/* for (Iterator localIterator = getXssPatternList().iterator(); localIterator.hasNext();i < arrLength) { + Object[] arr = (Object[])localIterator.next(); + arrLength = arr.length; + i = 0; + continue; + regex = (String)arr[0]; + flag = (Integer)arr[1]; + list.add(Pattern.compile(regex, flag.intValue())); + i++; + }*/ + patterns = list; + } + return patterns; + } + + public static String stripXss(String value) + { + if (StringUtils.isNotBlank(value)) + { + Matcher matcher = null; + for (Pattern pattern : getPatterns()) + { + matcher = pattern.matcher(value); + if (matcher.find()) { + value = matcher.replaceAll(""); + } + } +// value = value.replaceAll("<", "<").replaceAll(">", ">"); + + String[] pattern = { "%", " select ", " insert ", " delete ", " from ", + "count\\(", "drop table", " update ", " truncate ", "asc\\(", + "mid\\(", "char\\(", "xp_cmdshell", " exec ", " master ", + "netlocalgroup administrators", "net user", " or ", " and " }; + for (int i = 0; i < pattern.length; i++) { + value = value.replaceAll(pattern[i],""); + } + } + return value; + } +} diff --git a/adc-da-base/src/main/java/com/adc/da/xss/SQLFilter.java b/adc-da-base/src/main/java/com/adc/da/xss/SQLFilter.java new file mode 100644 index 00000000..60584f33 --- /dev/null +++ b/adc-da-base/src/main/java/com/adc/da/xss/SQLFilter.java @@ -0,0 +1,31 @@ +package com.adc.da.xss; + +import com.adc.da.exception.AdcDaBaseException; +import org.apache.commons.lang3.StringUtils; + +public class SQLFilter { + + + public static String sqlInject(String str) { + if (StringUtils.isBlank(str)) { + return null; + } else { + String checkStr= str; + checkStr = StringUtils.replace(checkStr, "\\", ""); + checkStr = checkStr.toLowerCase(); + String[] keywords = new String[]{"master", "truncate", "insert", "select", "delete", "update", "declare", "alter", "drop"}; + String[] arr$ = keywords; + int len$ = keywords.length; + + for(int i$ = 0; i$ < len$; ++i$) { + String keyword = arr$[i$]; + if (checkStr.indexOf(keyword) != -1) { + throw new AdcDaBaseException("包含非法字符"); + } + } + + return str; + } + } + +} diff --git a/adc-da-jwtLogin/.gitignore b/adc-da-jwtLogin/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/adc-da-jwtLogin/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/adc-da-jwtLogin/.mvn/wrapper/MavenWrapperDownloader.java b/adc-da-jwtLogin/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..a45eb6ba --- /dev/null +++ b/adc-da-jwtLogin/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/adc-da-jwtLogin/.mvn/wrapper/maven-wrapper.jar b/adc-da-jwtLogin/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 Binary files /dev/null and b/adc-da-jwtLogin/.mvn/wrapper/maven-wrapper.jar differ diff --git a/adc-da-jwtLogin/.mvn/wrapper/maven-wrapper.properties b/adc-da-jwtLogin/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..642d572c --- /dev/null +++ b/adc-da-jwtLogin/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/adc-da-jwtLogin/mvnw b/adc-da-jwtLogin/mvnw new file mode 100644 index 00000000..a16b5431 --- /dev/null +++ b/adc-da-jwtLogin/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/adc-da-jwtLogin/mvnw.cmd b/adc-da-jwtLogin/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/adc-da-jwtLogin/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/adc-da-jwtLogin/pom.xml b/adc-da-jwtLogin/pom.xml new file mode 100644 index 00000000..930ab3c1 --- /dev/null +++ b/adc-da-jwtLogin/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + + com.adc + foton-slrs-system-rest + 3.0.0 + + + com.adc + adc-da-jwtLogin + 3.1.0 + adc-da-jwtLogin + laws system rest JwtLogin + + jar + + + 1.8 + UTF-8 + UTF-8 + + + + + com.adc + adc-da-sys + 3.0.0 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${java.version} + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + + + diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java new file mode 100644 index 00000000..9ab1480c --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -0,0 +1,213 @@ +package com.adc.da.login.rest; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.login.util.JWTUtil; +import com.adc.da.login.util.UserUtils; +import com.adc.da.login.vo.LoginVO; +import com.adc.da.sys.entity.MenuEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.service.IUserEOService; +import com.adc.da.util.Encodes; +import com.adc.da.util.PasswordUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; + + +@Validated +@Controller +@RequestMapping(value = "/auth") +@Api(description = "登录接口") +@Slf4j +public class LoginRestController { + + @Autowired + private IUserEOService userService; + + + /** + * 读取配置文件判断是否需要开启Base64加密，默认值为false + */ + @Value("${isPassEncrypted:false}") + private boolean isPassEncrypted; + + /** + * 无缓存，用于校验 + */ + private static final String NO_CACHE = "no-cache"; + + /** + * 登录失败Map字段 + */ + private static final String LOGIN_FAIL_MAP = "loginFailMap"; + + /** + * 验证码 + */ + private static final Object VERIFY_CODE = "VerifyCode"; + + /** + * 10分钟内最大错误次数 + */ + @Value("${maxLoginErrorCount:3}") + private int maxLoginErrorCount; + + + /** + * 读取验证码模式配置， + * 1为不开启，2为开启，3为三次输错用户名或密码才开启， + * 默认为1 + *

+ * 若配置文件缺少该参数，将设置为1 + */ + @Value("${verifyCodeMode:1}") + private int verifyCodeMode; + + + @ApiOperation(value = "登录") + @PostMapping(value = "/login") + @ResponseBody + public ResponseMessage loginWithVerifyCode(HttpServletResponse response, @RequestBody LoginVO loginVO) { + String username = loginVO.getUsername(); + String password = loginVO.getPassword(); + String key = loginVO.getKey(); + + if (StringUtils.isBlank(username)) { + return Result.error("r0014", "登录名不能为空"); + } + if (StringUtils.isBlank(password)) { + return Result.error("r0016", "密码不能为空"); + } + if (StringUtils.isBlank(key)) { + return Result.error("key不能为空"); + } + + + + UserEO userEO = userService.getUserByLoginNameNotDeleted(username); + if (null == userEO) { + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号或密码有误"); + } + if (PasswordUtils.validatePassword(password, userEO.getPassword())) { + String token = JWTUtil.sign(username, userEO.getPassword(), userEO.getUsid()); + response.setHeader("Authorization", token); + response.addHeader("Access-Control-Allow-Headers", "Authorization"); + return Result.success(token); + } else { + log.info("用户[{}]密码验证失败", username); + return Result.error("r0011", "您输入的帐号或密码有误"); + } + } + + + + @ApiOperation(value = "登录") + @GetMapping(value = "/login") + @ResponseBody + public ResponseMessage loginRest(HttpServletRequest request, HttpServletResponse response, + @RequestParam @NotNull(message = "请输入用户名") String username, + @RequestParam @NotNull(message = "请输入密码") String password, + @RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) { + UserEO userEO = userService.getUserByLoginNameNotDeleted(username); + if (null == userEO) { + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号或密码有误"); + } + if(userEO.getDisableFlag()==1){ + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号已禁用"); + } + if (PasswordUtils.validatePassword(password, userEO.getPassword())) { + String token = JWTUtil.sign(username, userEO.getUsid(),userEO.getPassword()); + response.setHeader("Authorization", token); + response.addHeader("Access-Control-Allow-Headers", "Authorization"); + return Result.success(token); + } else { + log.info("用户[{}]密码验证失败", username); + return Result.error("r0011", "您输入的帐号或密码有误"); + } + } + + + + + /** + * 退出登录，客户端把Token丢弃就可以 + */ + @ApiOperation(value = "退出登录") + @GetMapping("/logout") + @ResponseBody + public ResponseMessage logout(HttpServletResponse response,String ticket) { + UserUtils.logout(); + return Result.success(); + } + + @ApiOperation(value = "未授权访问") + @RequestMapping(path = "/401") + @ResponseBody + public ResponseMessage unauthorized() { + return Result.error("401", "Unauthorized"); + } + + /** + * 登录成功之后获取当前登录用户信息的接口 + */ + @ApiOperation(value = "获取登录用户信息") + @GetMapping("/userInfo") + @ResponseBody + public ResponseMessage userInfo(HttpServletResponse response) throws NumberFormatException { + UserEO user = UserUtils.getUser(); + if (user != null) { + return Result.success(user); + } + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + return Result.error(); + } + + /** + * 获取用户菜单,已用菜单管理实现 + */ + @ApiOperation(value = "获取登录用户菜单权限") + @GetMapping("/userMenu") + @ResponseBody + public ResponseMessage> userMenu(){ + return Result.success(UserUtils.getMenuList()); + } + + /** + * 修改当前登录用户密码 + */ + @ApiOperation(value = "修改密码") + @PutMapping("/updatePassword") + @ResponseBody + public ResponseMessage updatePassword(@NotNull(message = "请输入旧密码") @RequestParam String oldPassword, + @NotNull(message = "请输入新密码") @RequestParam String newPassword) { + // 前台如果base64传输密文，则需要解码 + if (isPassEncrypted) { + oldPassword = new String(Encodes.decodeBase64(oldPassword), StandardCharsets.UTF_8); + newPassword = new String(Encodes.decodeBase64(newPassword), StandardCharsets.UTF_8); + } + if (!newPassword.matches("^(?![0-9]*$)[a-zA-Z0-9]{6,10}$")) { + return Result.error("r0018", "新密码必须6-10位且不能纯数字"); + } + userService.updatePassword(UserUtils.getUserId(), oldPassword, newPassword); + return Result.success(); + } + +} diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTFilter.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTFilter.java new file mode 100644 index 00000000..03366e66 --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTFilter.java @@ -0,0 +1,158 @@ +package com.adc.da.login.security; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authc.AuthenticationToken; +import org.apache.shiro.subject.Subject; +import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.RequestMethod; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; + +/** + * JWT过滤器，针对请求进行拦截过滤 + */ +@Slf4j +public class JWTFilter extends BasicHttpAuthenticationFilter { + //10分钟后刷新token + private static final int tokenRefreshInterval = 60 * 10; + + /** + * 这里我们详细说明下为什么最终返回的都是true，即允许访问 + *例如我们提供一个地址 GET /article + *登入用户和游客看到的内容是不同的 + *如果在这里返回了false，请求会被直接拦截，用户看不到任何东西 + *所以我们在这里返回true，Controller中可以通过 subject.isAuthenticated() 来判断用户是否登入 + *如果有些资源只有登入用户才能访问，我们只需要在方法上面加上 @RequiresAuthentication 注解即可 + *但是这样做有一个缺点，就是不能够对GET,POST等请求进行分别过滤鉴权(因为我们重写了官方的方法)，但实际上对应用影响不大 + */ + @Override + protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) { + if (isLoginAttempt(request, response)) { + try { + return executeLogin(request, response); + } catch (Exception e) { + responseError(request, response); + return false; + } + }else{ + return false; + } + + } + + + /** + * 检测header里面是否包含Authorization字段 + * @param request + * @param response + * @return + */ + @Override + protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) { + HttpServletRequest req = (HttpServletRequest) request; + String authorization = req.getHeader("Authorization"); + log.debug("判断用户是否想要登录：{}",authorization); + return authorization != null; + } + + + /** + * 认证失败后调用的方法 + * @param request + * @param response + * @return + * @throws Exception + */ + @Override + protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception { + this.responseError(request,response); + return false; + } + + @Override + protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception{ + HttpServletRequest httpServletRequest = (HttpServletRequest) request; + String authorization = httpServletRequest.getHeader("Authorization"); + log.debug("用户开始认证x：{}",authorization); + JWTToken token = new JWTToken(authorization); + // 提交给realm进行登入，如果错误他会抛出异常并被捕获 + getSubject(request, response).login(token); + // 如果没有抛出异常则代表登入成功，返回true + return true; + } + + @Override + protected boolean onLoginSuccess(AuthenticationToken token, Subject subject, ServletRequest request, ServletResponse response) throws Exception { + if(token instanceof JWTToken){ + JWTToken jwtToken= (JWTToken) token; + //TODO 此处需要设置token自动续期功能 + } + + return true; + } + + @Override + protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception { + HttpServletRequest httpServletRequest = (HttpServletRequest) request; + HttpServletResponse httpServletResponse = (HttpServletResponse) response; + httpServletResponse.setHeader("Access-control-Allow-Origin", httpServletRequest.getHeader("Origin")); + httpServletResponse.setHeader("Access-Control-Allow-Methods", "GET,POST,OPTIONS,PUT,DELETE"); + httpServletResponse.setHeader("Access-Control-Allow-Headers", httpServletRequest.getHeader("Access-Control-Request-Headers")); + httpServletResponse.addHeader("Access-Control-Allow-Headers", "Authorization"); + // 跨域时会首先发送一个option请求，这里我们给option请求直接返回正常状态 + if (httpServletRequest.getMethod().equals(RequestMethod.OPTIONS.name())) { + httpServletResponse.setStatus(HttpStatus.OK.value()); + return false; + } + return super.preHandle(request, response); + } + + /** + * 将非法请求跳转到 /401 + */ + private void responseError(ServletRequest req, ServletResponse resp) { + try { + HttpServletResponse httpServletResponse = (HttpServletResponse) resp; + if(httpServletResponse.isCommitted()){ + return; + } + //此处需要返回统一的错误对象 以便应对统一的异常处理 + JSONObject result=new JSONObject(); + result.put("respCode","A404"); + result.put("ok",false); + result.put("message","认证失败"); + result.put("data",null); + httpServletResponse.setHeader("Content-Type", "application/json"); + httpServletResponse.setHeader("Access-Control-Allow-Credentials", "true"); + httpServletResponse.setHeader("Access-Control-Allow-Methods", "GET, POST"); + httpServletResponse.setHeader("Access-Control-Allow-Origin", "*"); + httpServletResponse.setHeader("Access-Control-Max-Age", "3600"); + // response.setHeader("Content-type", "application/json;charset=UTF-8"); + httpServletResponse.setStatus(HttpServletResponse.SC_OK); + httpServletResponse.setContentType("application/json;charset=UTF-8"); + httpServletResponse.setCharacterEncoding("UTF-8"); + PrintWriter printWriter = httpServletResponse.getWriter(); + printWriter.append(result.toString(SerializerFeature.WriteMapNullValue)); + printWriter.flush(); +// httpServletResponse.sendRedirect("/401"); + } catch (IOException e) { + log.error(e.getMessage()); + } + } + + + private boolean shouldTokenRefresh(JWTToken jwtToken) { +// LocalDateTime issueTime = LocalDateTime.ofInstant(issueAt.toInstant(), ZoneId.systemDefault()); +// return LocalDateTime.now().minusSeconds(tokenRefreshInterval).isAfter(issueTime); + return true; + } + +} diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTRealm.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTRealm.java new file mode 100644 index 00000000..e70c347e --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTRealm.java @@ -0,0 +1,145 @@ +package com.adc.da.login.security; + +import com.adc.da.login.util.JWTUtil; +import com.adc.da.login.util.UserUtils; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.service.IUserEOService; +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.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.util.*; + +//@Service +public class JWTRealm extends AuthorizingRealm { + + private static final Logger logger = LoggerFactory.getLogger(JWTRealm.class); + + private IUserEOService userEOService; + + /** + * JWT签名密钥 + */ + public static final String SECRET = "AyX3TWpHIkPfE9rqaDiYV416d0nguURLQ8vhNzBlK7MGcOJjmoZ2w5stSeCFxb16"; + + @Autowired + public void setUserEOService(IUserEOService userEOService) { + this.userEOService = userEOService; + } + + /** + * 必须重写此方法，不然Shiro会报错 + */ + @Override + public boolean supports(AuthenticationToken token) { + return token instanceof JWTToken; + } + + + + /** + * 此方法调用hasRole,hasPermission的时候才会进行回调. + *

+ * 权限信息.(授权): + * 1、如果用户正常退出，缓存自动清空； + * 2、如果用户非正常退出，缓存自动清空； + * 3、如果我们修改了用户的权限，而用户不退出系统，修改的权限无法立即生效。 + * （需要手动编程进行实现；放在service进行调用） + * 在权限修改后调用realm中的方法，realm已经由spring管理，所以从spring中获取realm实例，调用clearCached方法； + * :Authorization 是授权访问控制，用于对用户进行的操作授权，证明该用户是否允许进行当前操作，如访问某个链接，某个资源文件等。 + * + * @param principalCollection + * @return + */ + @Override + protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) { + String username = JWTUtil.getUsername(principalCollection.toString()); + if (username == null) { + return null; + } + UserEO user = userEOService.getUserByLoginNameNotDeleted(username); + if (user != null) { + try { + return UserUtils.getAuthInfo(); + } catch (NumberFormatException e) { + logger.error("AuthorizationInfo NumberFormatException", e); + } catch (Exception e) { + logger.error("AuthorizationInfo Exception", e); + } + } + return null; + } + + /** + * 认证信息(身份验证) + * Authentication 是用来验证用户身份 + * + * @param authenticationToken + * @return + * @throws AuthenticationException + */ + @Override + protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException { + String token = (String) authenticationToken.getCredentials(); + // 解密获得username，用于和数据库进行对比 + String username = JWTUtil.getUsername(token); + if (username == null) { + throw new AuthenticationException("token 无效！"); + } + + UserEO user = userEOService.getUserByLoginNameNotDeleted(username); + if (user == null) { + throw new AuthenticationException("用户"+username+"不存在") ; + } + + if (!JWTUtil.verify(token, username,user.getUsid(),user.getPassword())) { + throw new AuthenticationException("账户密码错误!"); + } + return new SimpleAuthenticationInfo(token, token, "jwtRealm"); + } + + /** + * 授权用户信息 + */ + public static class Principal implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + + private String loginName; + + private transient Map cacheMap; + + public Principal(UserEO user) { + this.id = user.getUsid() == null ? "" : String.valueOf(user.getUsid()); + this.loginName = user.getAccount(); + } + + public String getId() { + return id; + } + + public String getLoginName() { + return loginName; + } + + public Map getCacheMap() { + if (cacheMap == null) { + cacheMap = new HashMap<>(); + } + return cacheMap; + } + } + +} diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTToken.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTToken.java new file mode 100644 index 00000000..6d857613 --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/JWTToken.java @@ -0,0 +1,32 @@ +package com.adc.da.login.security; + +import org.apache.shiro.authc.AuthenticationToken; + +/** + * JWT认证token实体对象 + */ +public class JWTToken implements AuthenticationToken { + + + private static final long serialVersionUID = 613047528940906064L; + // 秘钥 + private String token; + + public JWTToken(String token) { + this.token = token; + } + + @Override + public Object getPrincipal() { + return getToken(); + } + + @Override + public Object getCredentials() { + return getToken(); + } + + public String getToken() { + return token; + } +} diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/test.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/test.java new file mode 100644 index 00000000..77a9eab0 --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/test.java @@ -0,0 +1,4 @@ +package com.adc.da.login; + +public class test { +} diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/CacheUtils.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/CacheUtils.java new file mode 100644 index 00000000..079403f4 --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/CacheUtils.java @@ -0,0 +1,84 @@ +package com.adc.da.login.util; + +import com.adc.da.util.SpringContextHolder; +import net.sf.ehcache.Cache; +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.Element; + +/** + * Cache工具类 + */ +public class CacheUtils { + + private CacheUtils() { + super(); + } + + private static CacheManager cacheManager = (CacheManager) SpringContextHolder.getBean("ehCacheManagerFactoryBean"); + + private static final String SYS_CACHE = "sysCache"; + + private static final String ERROR_CACHE = "errorCache"; + + public static Object get(String key) { + return get(SYS_CACHE, key); + } + + public static void put(String key, Object value) { + put(SYS_CACHE, key, value); + } + + public static void remove(String key) { + remove(SYS_CACHE, key); + } + + //配合main模块下resource/cache/ehcache-local.xml + // + public static Object getErrorCache(String key) { + return get(ERROR_CACHE, key); + } + + public static void putErrorCache(String key, Object value) { + put(ERROR_CACHE, key, value); + } + + public static void removeErrorCache(String key) { + remove(ERROR_CACHE, key); + } + + + + public static Object get(String cacheName, String key) { + Element element = getCache(cacheName).get(key); + return element == null ? null : element.getObjectValue(); + } + + public static void put(String cacheName, String key, Object value) { + Element element = new Element(key, value); + getCache(cacheName).put(element); + } + + public static void remove(String cacheName, String key) { + getCache(cacheName).remove(key); + } + + /** + * 获得一个Cache，没有则创建一个。 + * @param cacheName + * @return + */ + private static Cache getCache(String cacheName) { + Cache cache = cacheManager.getCache(cacheName); + if (cache == null) { + cacheManager.addCache(cacheName); + cache = cacheManager.getCache(cacheName); + cache.getCacheConfiguration().setEternal(true); + } + return cache; + } + + public static CacheManager getCacheManager() { + return cacheManager; + } + +} diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/JWTUtil.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/JWTUtil.java new file mode 100644 index 00000000..1cd681d0 --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/JWTUtil.java @@ -0,0 +1,79 @@ +package com.adc.da.login.util; + +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 org.springframework.beans.factory.annotation.Value; + +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; + +public class JWTUtil { + + // 设置过期时间，默认为2小时 + private static long EXPIRE_TIME = 120; + + @Value("${EXPIRE_TIME}") + public void setEnv(long expireTime) { + setExpireTime(expireTime); + } + + public static synchronized void setExpireTime(long expireTime) { + EXPIRE_TIME = expireTime; + } + + public static boolean verify(String token, String username,String userId, String secret) { + try { + Algorithm algorithm = Algorithm.HMAC512(secret); + JWTVerifier verifier = JWT.require(algorithm) + .withClaim("username", username).withClaim("userid", userId) + .build(); + verifier.verify(token); + return true; + } catch (Exception e) { + return false; + } + } + /** + * @Title: getUsername + * @Description: 获取token中的信息无需secret解密也能获得 + * @Author 刘仁 + * @DateTime 2019年4月1日 下午4:42:39 + * @param token + * @return + */ + public static String getUsername(String token) { + try { + DecodedJWT jwt = JWT.decode(token); + return jwt.getClaim("username").asString(); + } catch (JWTDecodeException e) { + return null; + } + } + + public static String getUserId(String token){ + try { + DecodedJWT jwt = JWT.decode(token); + return jwt.getClaim("userid").asString(); + } catch (JWTDecodeException e) { + return null; + } + } + + public static String sign(String username,String userId, String secret) { + Date date = Date + .from(LocalDateTime.now().plusMinutes(EXPIRE_TIME).atZone(ZoneId.systemDefault()).toInstant()); + Algorithm algorithm = Algorithm.HMAC512(secret); + String sign = JWT.create() + .withClaim("username", username).withClaim("userid", userId) + .withExpiresAt(date) + .sign(algorithm); + + // 附带username信息 + return sign; + } + +} diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java new file mode 100644 index 00000000..ad20df07 --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java @@ -0,0 +1,188 @@ +package com.adc.da.login.util; + +import com.adc.da.login.security.JWTRealm; +import com.adc.da.login.security.JWTRealm.Principal; +import com.adc.da.sys.entity.MenuEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.service.IMenuEOService; +import com.adc.da.sys.service.IUserEOService; +import com.adc.da.util.SpringContextHolder; +import com.google.common.collect.Maps; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.UnavailableSecurityManagerException; +import org.apache.shiro.authz.SimpleAuthorizationInfo; +import org.apache.shiro.session.InvalidSessionException; +import org.apache.shiro.subject.Subject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.Map; + +public class UserUtils { + + private UserUtils() { + super(); + } + + private static Logger logger = LoggerFactory.getLogger(UserUtils.class); + /** + * 当前登陆用户 + */ + public static final String CURRENT_USER = "currentUser"; + + /** + * 菜单信息 + */ + public static final String CACHE_MENU_LIST = "menuList"; + + /** + * @see IUserEOService + */ + private static IUserEOService userService = SpringContextHolder.getBean(IUserEOService.class); + + /** + * @see IMenuEOService + */ + private static IMenuEOService menuService = SpringContextHolder.getBean(IMenuEOService.class); + + /** + * 退出 + */ + public static void logout() { + try { + SecurityUtils.getSubject().logout(); + } catch (UnavailableSecurityManagerException e) { + logger.error(e.getMessage(),e); + } catch (InvalidSessionException e) { + logger.error(e.getMessage(),e); + } + } + + /** + * 获取当前登录用户名 + */ + public static String getUserName() { + JWTRealm.Principal principal = (Principal) SecurityUtils.getSubject().getPrincipal(); + if (principal != null) { + return principal.getLoginName(); + } + return null; + } + + /** + * 获取当前登陆用户ID + * @throws Exception + */ + public static String getUserId() { + UserEO userEO = getUser(); + if (userEO != null) { + return userEO.getUsid(); + } + return null; + } + + /** + * 获取当前登录用户信息 + */ + public static UserEO getUser() { + UserEO user = (UserEO) CacheUtils.getCache(CURRENT_USER); + if (user == null) { + String userName = getUserName(); + + if (StringUtils.isNotEmpty(userName)) { + UserEO userInDb = userService.getUserByLoginNameNotDeleted(userName); + user = ObjectUtils.clone(userInDb); + user.setPassword(null); + CacheUtils.putCache(CURRENT_USER, user); + } + } + return user; + } + + /** + * 获取当前登录用户菜单列表 + */ + public static List getMenuList() { + List menuList = (List) CacheUtils.getCache(CACHE_MENU_LIST); + if (menuList == null) { + UserEO user = getUser(); + if (user != null) { + if (isAdmin(user)) { + menuList = menuService.findAll(); + } else { + menuList = menuService.listMenuEOByUserId(String.valueOf(user.getUsid())); + } + CacheUtils.putCache(CACHE_MENU_LIST, menuList); + } + } + return menuList; + } + + /** + * 判断用户是否是超级管理员 + * + * @param userVo 用户信息 + * @return 返回判断 + */ + public static boolean isAdmin(UserEO userVo) { + return userVo != null && userVo.getUsid().equals("1"); + } + + /** + * 获取用户菜单权限信息 + */ + public static SimpleAuthorizationInfo getAuthInfo() { + SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(); + List list = UserUtils.getMenuList(); + for (MenuEO menu : list) { + if (StringUtils.isNotBlank(menu.getPermission())) { + // 添加基于Permission的权限信息 + for (String permission : StringUtils.split(menu.getPermission(), ",")) { + info.addStringPermission(permission); + } + } + } + return info; + } + + public static void flush() { + CacheUtils.removeCache(CURRENT_USER); + } + + private static final class CacheUtils { + + public static Object getCache(String key) { + return getCache(key, null); + } + + public static Object getCache(String key, Object defaultValue) { + Object obj = getCacheMap().get(key); + return obj == null ? defaultValue : obj; + } + + public static void putCache(String key, Object value) { + getCacheMap().put(key, value); + } + + public static void removeCache(String key) { + getCacheMap().remove(key); + } + + public static Map getCacheMap() { + Map map = Maps.newHashMap(); + try { + Subject subject = SecurityUtils.getSubject(); + JWTRealm.Principal principal = (JWTRealm.Principal) subject.getPrincipal(); + return principal != null ? principal.getCacheMap() : map; + } catch (UnavailableSecurityManagerException e) { + logger.error(e.getMessage(),e); + } catch (InvalidSessionException e) { + logger.error(e.getMessage(),e); + } + return map; + } + } +} \ No newline at end of file diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/vo/LoginVO.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/vo/LoginVO.java new file mode 100644 index 00000000..2432ce4b --- /dev/null +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/vo/LoginVO.java @@ -0,0 +1,64 @@ +package com.adc.da.login.vo; + +import com.adc.da.base.entity.BaseEntity; + +/** + * 功能：LoginVO
+ * 作者：Wei Jinjin
+ * 日期： 2019-10-09
+ * 版权所有：版权归天津卡达克数据技术中心所有。
+ */ +public class LoginVO extends BaseEntity { + /** + * 用户名 + */ + private String username; + + /** + * 密码 + */ + + private String password; + + /** + * 验证码 + */ + private String verifyCode; + + /** + * 服务端存储验证码的key + */ + private String key; + + 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 getVerifyCode() { + return verifyCode; + } + + public void setVerifyCode(String verifyCode) { + this.verifyCode = verifyCode; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } +} \ No newline at end of file diff --git a/adc-da-main/.gitignore b/adc-da-main/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/adc-da-main/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/adc-da-main/.mvn/wrapper/MavenWrapperDownloader.java b/adc-da-main/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..a45eb6ba --- /dev/null +++ b/adc-da-main/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/adc-da-main/.mvn/wrapper/maven-wrapper.jar b/adc-da-main/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 Binary files /dev/null and b/adc-da-main/.mvn/wrapper/maven-wrapper.jar differ diff --git a/adc-da-main/.mvn/wrapper/maven-wrapper.properties b/adc-da-main/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..642d572c --- /dev/null +++ b/adc-da-main/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/adc-da-main/mvnw b/adc-da-main/mvnw new file mode 100644 index 00000000..a16b5431 --- /dev/null +++ b/adc-da-main/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/adc-da-main/mvnw.cmd b/adc-da-main/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/adc-da-main/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml new file mode 100644 index 00000000..e5259ca9 --- /dev/null +++ b/adc-da-main/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + + com.adc + foton-slrs-system-rest + 3.0.0 + + com.adc + adc-da-main + adc-da-main + laws system rest main + + jar + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + com.adc + adc-da-sys + 3.0.0 + + + com.adc + adc-da-base + 3.0.0 + + + com.adc + adc-da-jwtLogin + 3.1.0 + + + + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + diff --git a/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java new file mode 100644 index 00000000..5525d6cc --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java @@ -0,0 +1,16 @@ +package com.adc.da; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.boot.web.servlet.ServletComponentScan; + +@ServletComponentScan +@SpringBootApplication(exclude = SecurityAutoConfiguration.class) +public class AdcDaApplication { + + public static void main(String[] args) { + SpringApplication.run(AdcDaApplication.class, args); + } + +} diff --git a/adc-da-main/src/main/java/com/adc/da/ServletInitializer.java b/adc-da-main/src/main/java/com/adc/da/ServletInitializer.java new file mode 100644 index 00000000..9413d00e --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/ServletInitializer.java @@ -0,0 +1,16 @@ +package com.adc.da; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +/** + * Springboot打war包的启动口 + */ +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + // 注意这里要指向原先用main方法执行的Application启动类 + return builder.sources(AdcDaApplication.class); + } +} \ No newline at end of file diff --git a/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java b/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java new file mode 100644 index 00000000..59b6ce91 --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/advice/AdcDaBaseExceptionAdvice.java @@ -0,0 +1,38 @@ +package com.adc.da.main.advice; + +import com.adc.da.exception.AdcDaBaseException; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.ResponseMessageCodeEnum; +import com.adc.da.http.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +@Slf4j +@ControllerAdvice +@Order(value=4) +public class AdcDaBaseExceptionAdvice { + + + @ResponseStatus(HttpStatus.OK) + @ExceptionHandler(AdcDaBaseException.class) + @ResponseBody + public ResponseMessage handlerAdcDaBaseException(AdcDaBaseException exception) { + log.warn(exception.getMessage(), exception); + return Result.error(exception.getErrorCode(), exception.getMessage()); + } + + @ResponseStatus(HttpStatus.OK) + @ExceptionHandler(Exception.class) + @ResponseBody + public ResponseMessage handlerAdcDaBaseException(Exception exception) { + log.error(exception.getMessage(), exception); + // TODO 在数据库中记录程序异常，这个地方的异常是未处理的异常，需要管理员查看并进行处理以防重复出现 + return Result.error(ResponseMessageCodeEnum.ERROR.getCode(), "程序异常，请重试。如果重复出现请联系管理员处理！"); + } + +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/advice/ShiroExceptionAdvice.java b/adc-da-main/src/main/java/com/adc/da/main/advice/ShiroExceptionAdvice.java new file mode 100644 index 00000000..65bed1de --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/advice/ShiroExceptionAdvice.java @@ -0,0 +1,41 @@ +package com.adc.da.main.advice; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.IncorrectCredentialsException; +import org.apache.shiro.authc.UnknownAccountException; +import org.apache.shiro.authz.UnauthenticatedException; +import org.apache.shiro.authz.UnauthorizedException; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +@Slf4j +@ControllerAdvice +@Order(value=2) +public class ShiroExceptionAdvice { + + + @ResponseStatus(HttpStatus.UNAUTHORIZED) + @ExceptionHandler({AuthenticationException.class, UnknownAccountException.class, + UnauthenticatedException.class, IncorrectCredentialsException.class}) + @ResponseBody + public ResponseMessage unauthorized(Exception exception) { + log.warn(exception.getMessage(), exception); + log.info("catch UnknownAccountException"); + return Result.error("A404", "无权访问"); + } + + @ResponseStatus(HttpStatus.UNAUTHORIZED) + @ExceptionHandler(UnauthorizedException.class) + @ResponseBody + public ResponseMessage unauthorized1(UnauthorizedException exception) { + log.warn(exception.getMessage(), exception); + return Result.error("A404","无权访问"); + } +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/DefinitionUrlConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/DefinitionUrlConfig.java new file mode 100644 index 00000000..ed910f84 --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/DefinitionUrlConfig.java @@ -0,0 +1,44 @@ +package com.adc.da.main.config; + +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * shiro 自定义URL规则设置 + */ +public class DefinitionUrlConfig { + + + + /** + * 匿名用户，无需登录 + */ + private static final String ANON = "anon"; + + + + // 拦截器 + //rest：比如/admins/user/**=rest[user],根据请求的方法，相当于/admins/user/**=perms[user：method] ,其中method为post，get，delete等。 + //port：比如/admins/user/**=port[8081],当请求的url的端口不是8081是跳转到schemal：//serverName：8081?queryString,其中schmal是协议http或https等，serverName是你访问的host,8081是url配置里port的端口，queryString是你访问的url里的？后面的参数。 + //perms：比如/admins/user/**=perms[user：add：*],perms参数可以写多个，多个时必须加上引号，并且参数之间用逗号分割，比如/admins/user/**=perms["user：add：*,user：modify：*"]，当有多个参数时必须每个参数都通过才通过，想当于isPermitedAll()方法。 + //roles：比如/admins/user/**=roles[admin],参数可以写多个，多个时必须加上引号，并且参数之间用逗号分割，当有多个参数时，比如/admins/user/**=roles["admin,guest"],每个参数通过才算通过，相当于hasAllRoles()方法。//要实现or的效果看http://zgzty.blog.163.com/blog/static/83831226201302983358670/ + //anon：比如/admins/**=anon 没有参数，表示可以匿名使用。 + //authc：比如/admins/user/**=authc表示需要认证才能使用，没有参数 + //authcBasic：比如/admins/user/**=authcBasic没有参数表示httpBasic认证 + //ssl：比如/admins/user/**=ssl没有参数，表示安全的url请求，协议为https + //user：比如/admins/user/**=user没有参数表示必须存在用户，当登入操作时不做检查 + public static Map definitionUrlOptions(){ + Map filterRuleMap = new LinkedHashMap<>(); + //TODO 此处设置URL过滤规则 默认是全部请求进行拦截，此处设置为不拦截的URL地址 + filterRuleMap.put("/api/auth/login",ANON);//登录接口 + // swagger接口文档 + filterRuleMap.put("/v2/api-docs", "anon"); + filterRuleMap.put("/webjars/**", "anon"); + filterRuleMap.put("/swagger-resources/**", "anon"); + filterRuleMap.put("/swagger-ui.html", "anon"); + filterRuleMap.put("/doc.html", "anon"); + return filterRuleMap; + } + + +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/MybatisPlusConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/MybatisPlusConfig.java new file mode 100644 index 00000000..0ca71a89 --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/MybatisPlusConfig.java @@ -0,0 +1,22 @@ +package com.adc.da.main.config; + +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * Mybatis Plus 配置 + */ +@EnableTransactionManagement +@Configuration +@MapperScan("com.adc.da.**.dao") +public class MybatisPlusConfig { + + @Bean + public PaginationInterceptor paginationInterceptor() { + return new PaginationInterceptor(); + } + +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java new file mode 100644 index 00000000..870c415d --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java @@ -0,0 +1,50 @@ +package com.adc.da.main.config; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.client.ClientHttpRequestFactory; +import org.springframework.http.client.SimpleClientHttpRequestFactory; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.StringHttpMessageConverter; +import org.springframework.web.client.RestTemplate; + +import java.nio.charset.Charset; +import java.util.Iterator; +import java.util.List; + +/** + * restTemplate设置 + */ +@Configuration +public class RestTemplateConfig { + + private static final Logger logger = LoggerFactory.getLogger(RestTemplateConfig.class); + + @Bean + public RestTemplate restTemplate(ClientHttpRequestFactory factory){ + RestTemplate restTemplate = new RestTemplate(factory); + // 使用 utf-8 编码集的 conver 替换默认的 conver（默认的 string conver 的编码集为"ISO-8859-1"） + List> messageConverters = restTemplate.getMessageConverters(); + Iterator> iterator = messageConverters.iterator(); + while (iterator.hasNext()) { + HttpMessageConverter converter = iterator.next(); + if (converter instanceof StringHttpMessageConverter) { + iterator.remove(); + } + } + messageConverters.add(new StringHttpMessageConverter(Charset.forName("UTF-8"))); + + return restTemplate; + } + + @Bean + public ClientHttpRequestFactory simpleClientHttpRequestFactory(){ + SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); + factory.setReadTimeout(50000);//单位为ms + factory.setConnectTimeout(50000);//单位为ms + return factory; + } + +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java new file mode 100644 index 00000000..3ab198c6 --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java @@ -0,0 +1,151 @@ +package com.adc.da.main.config; + +import com.adc.da.login.security.JWTFilter; +import com.adc.da.login.security.JWTRealm; +import org.apache.shiro.cache.ehcache.EhCacheManager; +import org.apache.shiro.mgt.DefaultSecurityManager; +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.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; +import org.springframework.cache.ehcache.EhCacheManagerFactoryBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; +import org.springframework.core.annotation.Order; +import org.springframework.core.io.ClassPathResource; + +import javax.servlet.Filter; +import java.util.HashMap; +import java.util.Map; + +@Configuration +@Order(value=1) +public class ShiroConfig { + + private static final String JWT_FILTER_NAME = "jwt"; + + private static final String URL_SUFFIX="/api"; + + /** + * 自定义realm，实现登录授权流程 + * @return + */ + @Bean(name="jwtRealm") + public JWTRealm jwtRealm() { + return new JWTRealm(); + } + + /** + * 配置securityManager 管理subject（默认）,并把自定义realm交由manager + */ + @Bean + public DefaultSecurityManager securityManager() { + DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); + // 设置realm. + securityManager.setRealm(jwtRealm()); + //注入缓存管理器 + securityManager.setCacheManager(ehCacheManager()); + /* + * 关闭shiro自带的session，详情见文档 + * http://shiro.apache.org/session-management.html#SessionManagement-StatelessApplications%28Sessionless%29 + */ + DefaultSubjectDAO defaultSubjectDAO = new DefaultSubjectDAO(); + DefaultSessionStorageEvaluator storageEvaluator = new DefaultSessionStorageEvaluator(); + storageEvaluator.setSessionStorageEnabled(false); + defaultSubjectDAO.setSessionStorageEvaluator(storageEvaluator); + securityManager.setSubjectDAO(defaultSubjectDAO); + + return securityManager; + } + + /** + * 拦截链 + */ + @Bean + public ShiroFilterFactoryBean shiroFilterFactoryBean(DefaultSecurityManager securityManager) { + ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean(); + shiroFilterFactoryBean.setSecurityManager(securityManager); + shiroFilterFactoryBean.setFilters(filterMap()); + shiroFilterFactoryBean.setFilterChainDefinitionMap(definitionMap()); + + return shiroFilterFactoryBean; + } + + /** + * 自定义拦截器，处理所有请求 + */ + private Map filterMap() { + Map filterMap = new HashMap<>(); + filterMap.put(JWT_FILTER_NAME, new JWTFilter()); + return filterMap; + } + + /** + * url拦截规则 + */ + private Map definitionMap() { + // 拦截器 + //rest：比如/admins/user/**=rest[user],根据请求的方法，相当于/admins/user/**=perms[user：method] ,其中method为post，get，delete等。 + //port：比如/admins/user/**=port[8081],当请求的url的端口不是8081是跳转到schemal：//serverName：8081?queryString,其中schmal是协议http或https等，serverName是你访问的host,8081是url配置里port的端口，queryString是你访问的url里的？后面的参数。 + //perms：比如/admins/user/**=perms[user：add：*],perms参数可以写多个，多个时必须加上引号，并且参数之间用逗号分割，比如/admins/user/**=perms["user：add：*,user：modify：*"]，当有多个参数时必须每个参数都通过才通过，想当于isPermitedAll()方法。 + //roles：比如/admins/user/**=roles[admin],参数可以写多个，多个时必须加上引号，并且参数之间用逗号分割，当有多个参数时，比如/admins/user/**=roles["admin,guest"],每个参数通过才算通过，相当于hasAllRoles()方法。//要实现or的效果看http://zgzty.blog.163.com/blog/static/83831226201302983358670/ + //anon：比如/admins/**=anon 没有参数，表示可以匿名使用。 + //authc：比如/admins/user/**=authc表示需要认证才能使用，没有参数 + //authcBasic：比如/admins/user/**=authcBasic没有参数表示httpBasic认证 + //ssl：比如/admins/user/**=ssl没有参数，表示安全的url请求，协议为https + //user：比如/admins/user/**=user没有参数表示必须存在用户，当登入操作时不做检查 + Map definitionMap = DefinitionUrlConfig.definitionUrlOptions(); + definitionMap.put(URL_SUFFIX+"/**", JWT_FILTER_NAME); + return definitionMap; + } + +/* *//** + * 开启注解 + *//* + @Bean + @DependsOn("lifecycleBeanPostProcessor") + public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() { + DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator(); + // 强制使用cglib代理，防止和aop冲突 + defaultAdvisorAutoProxyCreator.setProxyTargetClass(true); + return defaultAdvisorAutoProxyCreator; + } + + @Bean + public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() { + return new LifecycleBeanPostProcessor(); + }*/ + + /** + * 开启shiro aop注解支持. 使用代理方式; 所以需要开启代码支持; + * + * @param securityManager 安全管理器 + * @return 授权Advisor + */ + @Bean("authorizationAttributeSourceAdvisor") + public AuthorizationAttributeSourceAdvisor advisor(DefaultSecurityManager securityManager) { + AuthorizationAttributeSourceAdvisor advisor = new AuthorizationAttributeSourceAdvisor(); + advisor.setSecurityManager(securityManager); + return advisor; + } + + /** + * shiro缓存管理器; + * 需要注入对应的其它的实体类中： + * 1、安全管理器：securityManager + * 可见securityManager是整个shiro的核心； + * + * @return + */ + @Bean + public EhCacheManager ehCacheManager() { + EhCacheManager cacheManager = new EhCacheManager(); + cacheManager.setCacheManagerConfigFile("classpath:cache/ehcache.xml"); + return cacheManager; + } + +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfiguration.java b/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfiguration.java new file mode 100644 index 00000000..f40d34ce --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfiguration.java @@ -0,0 +1,92 @@ +package com.adc.da.main.config; + +import com.adc.da.login.security.JWTRealm; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.credential.HashedCredentialsMatcher; +import org.apache.shiro.cache.ehcache.EhCacheManager; +import org.apache.shiro.mgt.DefaultSessionStorageEvaluator; +import org.apache.shiro.mgt.DefaultSubjectDAO; +import org.apache.shiro.mgt.SecurityManager; +import org.apache.shiro.spring.LifecycleBeanPostProcessor; +import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; +import org.apache.shiro.web.mgt.DefaultWebSecurityManager; +import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; +import org.springframework.cache.ehcache.EhCacheManagerFactoryBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; +import org.springframework.core.io.ClassPathResource; + + +//@Configuration +public class ShiroConfiguration { + + @Bean(name = "ehCacheManagerFactoryBean") + public EhCacheManagerFactoryBean ehCacheManagerFactoryBean() { + EhCacheManagerFactoryBean ehCacheManagerFactoryBean = new EhCacheManagerFactoryBean(); + ClassPathResource classPathResource = new ClassPathResource("cache/ehcache-local.xml"); + ehCacheManagerFactoryBean.setConfigLocation(classPathResource); + return ehCacheManagerFactoryBean; + } + + @Bean(name = "shiroCacheManager") + @DependsOn({ "ehCacheManagerFactoryBean" }) + public EhCacheManager shiroCacheManager() { + EhCacheManager ehCacheManager = new EhCacheManager(); + ehCacheManager.setCacheManager(ehCacheManagerFactoryBean().getObject()); + return ehCacheManager; + } + + @Bean + @DependsOn({ "lifecycleBeanPostProcessor" }) + public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() { + DefaultAdvisorAutoProxyCreator proxyCreator = new DefaultAdvisorAutoProxyCreator(); + proxyCreator.setProxyTargetClass(true); + return proxyCreator; + } + + @Bean(name = "lifecycleBeanPostProcessor") + public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() { + return new LifecycleBeanPostProcessor(); + } + + @Bean(name = "securityManager") + public SecurityManager securityManager() { + DefaultWebSecurityManager defaultWebSecurityManager = new DefaultWebSecurityManager(); + defaultWebSecurityManager.setRealm(jwtRealm()); + + // 关闭shiro自带的session + DefaultSubjectDAO subjectDAO = new DefaultSubjectDAO(); + DefaultSessionStorageEvaluator defaultSessionStorageEvaluator = new DefaultSessionStorageEvaluator(); + defaultSessionStorageEvaluator.setSessionStorageEnabled(false); + subjectDAO.setSessionStorageEvaluator(defaultSessionStorageEvaluator); + defaultWebSecurityManager.setSubjectDAO(subjectDAO); + + // 自定义缓存管理器 + defaultWebSecurityManager.setCacheManager(shiroCacheManager()); + SecurityUtils.setSecurityManager(defaultWebSecurityManager); + return defaultWebSecurityManager; + } + + @Bean + public HashedCredentialsMatcher hashedCredentialsMatcher() { + HashedCredentialsMatcher hashedCredentialsMatcher = new HashedCredentialsMatcher(); + hashedCredentialsMatcher.setHashAlgorithmName("md5");// 散列算法:这里使用MD5算法; + hashedCredentialsMatcher.setHashIterations(2);// 散列的次数，比如散列两次，相当于 + // md5(md5("")); + return hashedCredentialsMatcher; + } + + @Bean + public JWTRealm jwtRealm() { + JWTRealm jwtRealm = new JWTRealm(); + return jwtRealm; + } + + @Bean + public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor() { + AuthorizationAttributeSourceAdvisor advisor = new AuthorizationAttributeSourceAdvisor(); + advisor.setSecurityManager(securityManager()); + return advisor; + } +} \ No newline at end of file diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/SwaggerConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/SwaggerConfig.java new file mode 100644 index 00000000..acba54fe --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/SwaggerConfig.java @@ -0,0 +1,67 @@ +package com.adc.da.main.config; + + +import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.ParameterBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.schema.ModelRef; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Parameter; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import java.util.ArrayList; +import java.util.List; + +/** + * swagger UI 配置we年 + */ +@Configuration +@EnableSwagger2 +@EnableKnife4j +@Import(BeanValidatorPluginsConfiguration.class) +public class SwaggerConfig { + + + @Bean + public Docket createRestApiByDefault() { + + ParameterBuilder tokenPar = new ParameterBuilder(); + List pars = new ArrayList<>(); + tokenPar.name("Authorization") + .description("令牌") + .modelRef(new ModelRef("string")) + .parameterType("header") + .required(true) + .build(); + pars.add(tokenPar.build()); + + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.adc.da")) + .paths(PathSelectors.any()) + .build() + .globalOperationParameters(pars).groupName("默认"); + } + + + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("FOTON-SLRS-SYSTEM-REST APIs") + .description("标准法规1.0") + .termsOfServiceUrl("http://localhost:8888/") + .contact("developer@mail.com") + .version("1.0.0") + .build(); + } + +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java new file mode 100644 index 00000000..e1ed920f --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java @@ -0,0 +1,105 @@ +package com.adc.da.main.config; + +import com.adc.da.filter.*; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +/** + * Web配置，用于注入过滤器，拦截器等 + */ +@Configuration +@Order(value =3) +public class WebConfig { + + /** + * xss过滤器（高标准） + */ + @Bean + public FilterRegistrationBean xssFilter() { + FilterRegistrationBean registration = new FilterRegistrationBean(); +// registration.setFilter(new XssFilter()); + registration.setFilter(new WebFilter()); + registration.addUrlPatterns("/*"); + registration.setName("xssFilter"); + registration.setOrder(10); + return registration; + } + + /** + * xss过滤器（低标准） + */ +// @Bean +// public FilterRegistrationBean xssShieldFilter() { +// FilterRegistrationBean registration = new FilterRegistrationBean(); +// registration.setFilter(new XssShieldFilter()); +// registration.addUrlPatterns("/*"); +// registration.setName("xssShieldFilter"); +// registration.setOrder(10); +// return registration; +// } + + @Bean + public FilterRegistrationBean csrfFilter() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new CsrfFilter()); + registration.addUrlPatterns("/*"); + registration.setName("csrfFilter"); + registration.setOrder(9); + return registration; + } + + @Bean + public FilterRegistrationBean requestInfoFilter() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new RequestInfoFilter()); + registration.addUrlPatterns("/*"); + registration.setName("RequestInfoFilter"); + registration.setOrder(8); + return registration; + } + + @Bean + public CorsFilter corsFilter() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", buildConfig()); // 4 + return new CorsFilter(source); + } + + private CorsConfiguration buildConfig() { + CorsConfiguration corsConfiguration = new CorsConfiguration(); + corsConfiguration.addAllowedOrigin("*"); // 1允许任何域名使用 + corsConfiguration.addAllowedHeader("*"); // 2允许任何头 + corsConfiguration.addAllowedMethod("*"); // 3允许任何方法（post、get等） + return corsConfiguration; + } + + + @Bean + public FilterRegistrationBean httpCacheFilter() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new HttpCacheFilter()); + registration.addUrlPatterns("/*"); + registration.setName("httpCacheFilter"); + registration.addInitParameter("maxAge", String.valueOf(60 * 60 * 24 * 7)); + registration.setOrder(6); + return registration; + } + + /** + * 防伪造jsessionid + */ + @Bean + public FilterRegistrationBean fakeJSessionIdFilter() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new FakeJSessionIdFilter()); + registration.addUrlPatterns("/*"); + registration.setName("fakeJSessionIdFilter"); + registration.setOrder(5); + return registration; + } +} \ No newline at end of file diff --git a/adc-da-main/src/main/java/com/adc/da/main/filter/AuthFormAuthenticationFilter.java b/adc-da-main/src/main/java/com/adc/da/main/filter/AuthFormAuthenticationFilter.java new file mode 100644 index 00000000..76efcf6a --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/filter/AuthFormAuthenticationFilter.java @@ -0,0 +1,25 @@ +package com.adc.da.main.filter; + +import cn.hutool.json.JSONUtil; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; +import java.io.PrintWriter; + +public class AuthFormAuthenticationFilter extends FormAuthenticationFilter { + + @Override + protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception { + HttpServletResponse httpServletResponse = (HttpServletResponse) response; + httpServletResponse.setStatus(200); + httpServletResponse.setContentType("application/json;charset=utf-8"); + PrintWriter out = httpServletResponse.getWriter(); + ResponseMessage responseMessage = Result.error("A404", "无权访问"); + out.print(JSONUtil.toJsonStr(responseMessage)); + return false; + } +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java new file mode 100644 index 00000000..ed1cb70c --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java @@ -0,0 +1,147 @@ +package com.adc.da.main.generate; + +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.generator.AutoGenerator; +import com.baomidou.mybatisplus.generator.InjectionConfig; +import com.baomidou.mybatisplus.generator.config.*; +import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +public class CodeGen { + + private static final String PACKAGE_PATH="/adc-da-sys/src/main"; + + private static final String AUTHOR="91isoft"; + + private static final String DB_IP="192.168.10.140:1521:orcl"; + + private static final String DB_USER="GSAR_TEST"; + + private static final String DB_PWD="1q2w3e4r"; + + + /** + *

+ * 读取控制台内容 + *

+ */ + public static String scanner(String tip) { + Scanner scanner = new Scanner(System.in); + StringBuilder help = new StringBuilder(); + help.append("请输入" + tip + "："); + System.out.println(help.toString()); + if (scanner.hasNext()) { + String ipt = scanner.next(); + if (StringUtils.isNotEmpty(ipt)) { + return ipt; + } + } + throw new MybatisPlusException("请输入正确的" + tip + "！"); + } + + public static void main(String[] args) { + // 代码生成器 + AutoGenerator mpg = new AutoGenerator(); + + // 全局配置 + GlobalConfig gc = new GlobalConfig(); + String projectPath = System.getProperty("user.dir"); + gc.setOutputDir(projectPath + PACKAGE_PATH+"/java"); + gc.setAuthor(AUTHOR); + gc.setOpen(false); + gc.setSwagger2(true); //实体属性 Swagger2 注解 + gc.setMapperName("%sDao"); + mpg.setGlobalConfig(gc); + + // 数据源配置 + DataSourceConfig dsc = new DataSourceConfig(); + dsc.setUrl("jdbc:oracle:thin:@"+DB_IP); + // dsc.setSchemaName("public"); + dsc.setDriverName("oracle.jdbc.OracleDriver"); + dsc.setUsername(DB_USER); + dsc.setPassword(DB_PWD); + mpg.setDataSource(dsc); + + // 包配置 + PackageConfig pc = new PackageConfig(); + pc.setModuleName(scanner("模块名")); + pc.setMapper("dao"); + pc.setParent("com.adc.da"); + mpg.setPackageInfo(pc); + + // 自定义配置 + InjectionConfig cfg = new InjectionConfig() { + @Override + public void initMap() { + // to do nothing + } + }; + + // 如果模板引擎是 freemarker + String templatePath = "/templates/mapper.xml.ftl"; + // 如果模板引擎是 velocity + // String templatePath = "/templates/mapper.xml.vm"; + + // 自定义输出配置 + List focList = new ArrayList<>(); + // 自定义配置会被优先输出 + focList.add(new FileOutConfig(templatePath) { + @Override + public String outputFile(TableInfo tableInfo) { + // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！ + return projectPath +PACKAGE_PATH+ "/resources/mybatis/mapper/" + pc.getModuleName() + + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML; + } + }); + /* + cfg.setFileCreate(new IFileCreate() { + @Override + public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) { + // 判断自定义文件夹是否需要创建 + checkDir("调用默认方法创建的目录"); + return false; + } + }); + */ + cfg.setFileOutConfigList(focList); + mpg.setCfg(cfg); + + // 配置模板 + TemplateConfig templateConfig = new TemplateConfig(); + + // 配置自定义输出模板 + //指定自定义模板路径，注意不要带上.ftl/.vm, 会根据使用的模板引擎自动识别 + templateConfig.setController("templates/controller.java"); + templateConfig.setMapper("templates/mapper.java"); + templateConfig.setEntity("templates/entity.java"); + templateConfig.setService("templates/service.java"); + templateConfig.setServiceImpl("templates/serviceImpl.java"); + templateConfig.setXml(null); + mpg.setTemplate(templateConfig); + + // 策略配置 + StrategyConfig strategy = new StrategyConfig(); + strategy.setNaming(NamingStrategy.underline_to_camel); + strategy.setColumnNaming(NamingStrategy.underline_to_camel); + strategy.setSuperEntityClass("com.adc.da.base.entity.BaseEntity"); + strategy.setEntityLombokModel(true); + strategy.setRestControllerStyle(true); + // 公共父类 + strategy.setSuperControllerClass("com.adc.da.base.web.BaseController"); + // 写于父类中的公共字段 + strategy.setSuperEntityColumns("id"); + strategy.setInclude(scanner("表名，多个英文逗号分割").split(",")); + strategy.setControllerMappingHyphenStyle(true); + strategy.setTablePrefix(pc.getModuleName() + "_"); + mpg.setStrategy(strategy); + mpg.setTemplateEngine(new FreemarkerTemplateEngine()); + mpg.execute(); + } +} diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeUtil.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeUtil.java new file mode 100644 index 00000000..cbd1d9cc --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeUtil.java @@ -0,0 +1,15 @@ +package com.adc.da.main.generate; + +//import com.codemagic.DbCodeGenerateFactory; + +public class CodeUtil { + + public CodeUtil() {} + + + public static void main(String[] args) { + String entityPackage="sys"; +// DbCodeGenerateFactory.codeGenerate("ECP_CHANGE_HIS_PLAN", entityPackage); + } + +} diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties new file mode 100644 index 00000000..1b77a4b0 --- /dev/null +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -0,0 +1,44 @@ +# dev config +#============================================= +# 数据库配置 +#============================================= +spring.datasource.driverClassName = oracle.jdbc.OracleDriver +spring.datasource.url = jdbc:oracle:thin:@//192.168.10.140:1521/orcl +spring.datasource.username = LAWSDB +spring.datasource.password = 1q2w3e4r + +#============================================== +# 应用设置 +spring.application.name=gsar +application.code=20200101 +application.center=1 +#============================================== + +#============================================== +# 邮箱配置 +#============================================== +mail.state=false +spring.mail.host=outlook.geely.com +spring.mail.protocol=smtp +spring.mail.username=e-shiwei@geely.com +spring.mail.password=YtfaaJauPjq21 +spring.mail.properties.smtp.auth=true +spring.mail.properties.smtp.starttls.enable=false +spring.mail.properties.smtp.starttls.required=false +spring.mail.properties.mail.smtp.ssl.enable=false +spring.mail.port=587 + +# ============================================== +# rabbitMQ +# ============================================== +spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +spring.rabbitmq.port=5672 +spring.rabbitmq.virtual-host=uat_pcms +spring.rabbitmq.username=uat_pcms +spring.rabbitmq.password=VxsBLL5bJruwzXfS +# spring.rabbitmq.publisher-confirms=true + +# ============================================== +# 文档存储路径指向 +# ============================================== +file.path=/usr/laws/file/ \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application-prod.properties b/adc-da-main/src/main/resources/application-prod.properties new file mode 100644 index 00000000..203e71c7 --- /dev/null +++ b/adc-da-main/src/main/resources/application-prod.properties @@ -0,0 +1,38 @@ +#prod config +#============================================= +# 数据库配置 +#============================================= +spring.datasource.driverClassName = oracle.jdbc.OracleDriver +spring.datasource.url = jdbc:oracle:thin:@//10.190.228.33:1521/geely +spring.datasource.username = scyzx_uat +spring.datasource.password = b#Lf5z0^QrF4J3Km + + +#============================================== +# 邮箱配置 +#============================================== +mail.state=false +spring.mail.host=outlook.geely.com +spring.mail.protocol=smtp +spring.mail.username=e-shiwei@geely.com +spring.mail.password=YtfaaJauPjq21 +spring.mail.properties.smtp.auth=true +spring.mail.properties.smtp.starttls.enable=false +spring.mail.properties.smtp.starttls.required=false +spring.mail.properties.mail.smtp.ssl.enable=false +spring.mail.port=587 + +# ============================================== +# rabbitMQ +# ============================================== +spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +spring.rabbitmq.port=5672 +spring.rabbitmq.virtual-host=uat_pcms +spring.rabbitmq.username=uat_pcms +spring.rabbitmq.password=VxsBLL5bJruwzXfS +# spring.rabbitmq.publisher-confirms=true + +# ============================================== +# 文档存储路径指向 +# ============================================== +file.path=/usr/laws/file/ \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application-test.properties b/adc-da-main/src/main/resources/application-test.properties new file mode 100644 index 00000000..55f14c4b --- /dev/null +++ b/adc-da-main/src/main/resources/application-test.properties @@ -0,0 +1,38 @@ +# test config +#============================================= +# 数据库配置 +#============================================= +spring.datasource.driverClassName = oracle.jdbc.OracleDriver +spring.datasource.url = jdbc:oracle:thin:@//10.190.228.33:1521/geely +spring.datasource.username = scyzx_uat +spring.datasource.password = b#Lf5z0^QrF4J3Km + + +#============================================== +# 邮箱配置 +#============================================== +mail.state=false +spring.mail.host=outlook.geely.com +spring.mail.protocol=smtp +spring.mail.username=e-shiwei@geely.com +spring.mail.password=YtfaaJauPjq21 +spring.mail.properties.smtp.auth=true +spring.mail.properties.smtp.starttls.enable=false +spring.mail.properties.smtp.starttls.required=false +spring.mail.properties.mail.smtp.ssl.enable=false +spring.mail.port=587 + +# ============================================== +# rabbitMQ +# ============================================== +spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +spring.rabbitmq.port=5672 +spring.rabbitmq.virtual-host=uat_pcms +spring.rabbitmq.username=uat_pcms +spring.rabbitmq.password=VxsBLL5bJruwzXfS +# spring.rabbitmq.publisher-confirms=true + +# ============================================== +# 文档存储路径指向 +# ============================================== +file.path=/usr/laws/file/ \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties new file mode 100644 index 00000000..3bd3954c --- /dev/null +++ b/adc-da-main/src/main/resources/application.properties @@ -0,0 +1,101 @@ +############################################## +# 项目启动模式 +############################################## +spring.profiles.active=dev + +############################################## +#公共配置信息 +############################################## +server.compression.enabled=true +server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript +# 端口号设置 +server.port=9999 +#主服务session超时 +server.servlet.session.timeout =600 + +# http-only +server.session.cookie.http-only=true +spring.mvc.async.request-timeout=20000 + +# file模块上传文件大小限制 +spring.http.multipart.max-request-size=100MB +spring.http.multipart.max-file-size=100MB + +#显示sql +logging.level.com.adc=DEBUG +logging.level.org.springframework=info + +# 请求前缀 +restPath=/api +#server.servlet.context-path=/api + +# =============================== +# = DATA SOURCE +# =============================== +spring.datasource.type = com.alibaba.druid.pool.DruidDataSource +# 下面为连接池的补充设置，应用到上面所有数据源中 +# 初始化大小，最小，最大 +spring.datasource.druid.initial-size= 5 +spring.datasource.druid.min-idle= 5 +spring.datasource.druid.max-active= 50 +# 配置获取连接等待超时的时间 +spring.datasource.druid.max-wait= 60000 +# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 +spring.datasource.druid.time-between-eviction-runs-millis= 60000 +# 配置一个连接在池中最小生存的时间，单位是毫秒 +spring.datasource.druid.min-evictable-idle-time-millis= 300000 +spring.datasource.druid.validation-query= SELECT 1 FROM DUAL +# 空闲时间监测连接是否优秀奥 +spring.datasource.druid.test-while-idle= true +# 数据库连接心跳监测 +spring.datasource.druid.keep-alive= true +# 获取链接前检查链接是否有效 +spring.datasource.druid.test-on-borrow= true +# 返回连接池时检查链接是否可用 +spring.datasource.druid.test-on-return= false +# 打开PSCache，并且指定每个连接上PSCache的大小 +spring.datasource.druid.pool-prepared-statements= true +spring.datasource.druid.max-pool-prepared-statement-per-connection-size= 20 +# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 +spring.datasource.druid.filters=stat,wall +#合并多个DruidDataSource的监控数据 +spring.datasource.druid.use-global-data-source-stat=true +# druid web管理页面开启 +spring.datasource.druid.stat-view-servlet.enabled=true +# druid web管理页面白名单 +#spring.datasource.druid.stat-view-servlet.allow=127.0.0.1 +# druid web管理页面账号 +spring.datasource.druid.stat-view-servlet.login-username=druid +# druid web管理页面密码 +spring.datasource.druid.stat-view-servlet.login-password=laws1q2w3e4r +# druid web管理页面URL访问前缀地址 +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +# =============================== + +# ======================================= +# Mybatis Plus config +# ======================================= +mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml +mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml + +# ======================================== +# activiti 配置信息 +# ======================================== +#spring.activiti.database-schema=ACT +spring.activiti.database-schema-update=false +spring.activiti.check-process-definitions=false +spring.activiti.job-executor-activate=false +spring.activiti.process-definition-location-prefix=classpath:/mybatis/mapper/activiti/ + + +# ========================================= +# login value +# ========================================= +maxLoginErrorCount=3 +verifyCodeMode=1 + +# ========================================= +# 上传文件配置 +# ========================================= +#上传文件白名单-以,分隔 +upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg \ No newline at end of file diff --git a/adc-da-main/src/main/resources/banner.txt b/adc-da-main/src/main/resources/banner.txt new file mode 100644 index 00000000..a4f9a525 --- /dev/null +++ b/adc-da-main/src/main/resources/banner.txt @@ -0,0 +1,9 @@ +${AnsiColor.RED} _ _ + __ _ __| | ___ __| | __ _ + / _` |/ _` |/ __|____ / _` |/ _` | + | (_| | (_| | (_|_____| (_| | (_| | + \__,_|\__,_|\___| \__,_|\__,_| + +${AnsiColor.YELLOW}------------------------------------------------ +${AnsiColor.YELLOW} :: ${AnsiColor.YELLOW}@数据资源中心 +${AnsiColor.YELLOW}------------------------------------------------${AnsiColor.WHITE} \ No newline at end of file diff --git a/adc-da-main/src/main/resources/logback-spring.xml b/adc-da-main/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..dec4b3f5 --- /dev/null +++ b/adc-da-main/src/main/resources/logback-spring.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + + + + + + + + INFO + + ACCEPT + + ACCEPT + + + + + ${LOG_HOME}/${LOG_HOME_SYSTEM}/${PROJECT_NAME}.system_all.%d{yyyy-MM-dd}.%i.log + + 7 + + 100MB + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + + + + + + ERROR + ACCEPT + DENY + + + + ${LOG_HOME}/${LOG_HOME_SYSTEM}/${PROJECT_NAME}.system_error.%d{yyyy-MM-dd}.%i.log + + 30 + + 100MB + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + + + + + + INFO + ACCEPT + DENY + + + + ${LOG_HOME}/${LOG_HOME_DRUID}/${PROJECT_NAME}.druid_info.%d{yyyy-MM-dd}.%i.log + + 15 + + 50MB + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + + + + + WARN + + + + + ${LOG_HOME}/${LOG_HOME_DRUID}/${PROJECT_NAME}.druid_warn.%d{yyyy-MM-dd}.%i.log + + 30 + + 50MB + + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n + UTF-8 + + + + + + INFO + ACCEPT + DENY + + + + ${LOG_HOME}/${LOG_HOME_OPERATION}/${PROJECT_NAME}.operation.%d{yyyy-MM-dd}.%i.log + + 120 + + 300MB + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %logger{50} - %msg%n + UTF-8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/adc-da-main/src/main/resources/logo/logo_white.png b/adc-da-main/src/main/resources/logo/logo_white.png new file mode 100644 index 00000000..e744da1b Binary files /dev/null and b/adc-da-main/src/main/resources/logo/logo_white.png differ diff --git a/adc-da-main/src/main/resources/mybatis/mybatis-config.xml b/adc-da-main/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 00000000..e041bc2e --- /dev/null +++ b/adc-da-main/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/adc-da-main/src/main/resources/temp/entity.java.ftl b/adc-da-main/src/main/resources/temp/entity.java.ftl new file mode 100644 index 00000000..c698d363 --- /dev/null +++ b/adc-da-main/src/main/resources/temp/entity.java.ftl @@ -0,0 +1,152 @@ +package ${package.Entity}; + +<#list table.importPackages as pkg> +import ${pkg}; + +<#if swagger2> +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +<#if entityLombokModel> +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + + +/** + *

+ * ${table.comment!} + *

+ * + * @author ${author} + * @since ${date} + */ +<#if entityLombokModel> +@Data + <#if superEntityClass??> +@EqualsAndHashCode(callSuper = true) + <#else> +@EqualsAndHashCode(callSuper = false) + +@Accessors(chain = true) + +<#if table.convert> +@TableName("${table.name}") + +<#if swagger2> +@ApiModel(value="${entity}对象", description="${table.comment!}") + +<#if superEntityClass??> +public class ${entity} extends ${superEntityClass}<#if activeRecord><${entity}> { +<#elseif activeRecord> +public class ${entity} extends Model<${entity}> { +<#else> +public class ${entity} implements Serializable { + + +<#if entitySerialVersionUID> + private static final long serialVersionUID = 1L; + +<#-- ---------- BEGIN 字段循环遍历 ----------> +<#list table.fields as field> + <#if field.keyFlag> + <#assign keyPropertyName="${field.propertyName}"/> + + + <#if field.comment!?length gt 0> + <#if swagger2> + @ApiModelProperty(value = "${field.comment}") + <#else> + /** + * ${field.comment} + */ + + + <#if field.keyFlag> + <#-- 主键 --> + <#if field.keyIdentityFlag> + @TableId(value = "${field.name}", type = IdType.AUTO) + <#elseif idType??> + @TableId(value = "${field.name}", type = IdType.${idType}) + <#elseif field.convert> + @TableId("${field.name}") + + <#-- 普通字段 --> + <#elseif field.fill??> + <#-- ----- 存在字段填充设置 -----> + <#if field.convert> + @TableField(value = "${field.name}", fill = FieldFill.${field.fill}) + <#else> + @TableField(fill = FieldFill.${field.fill}) + + <#elseif field.convert> + @TableField("${field.name}") + + <#-- 乐观锁注解 --> + <#if (versionFieldName!"") == field.name> + @Version + + <#-- 逻辑删除注解 --> + <#if (logicDeleteFieldName!"") == field.name> + @TableLogic + + private ${field.propertyType} ${field.propertyName}; + +<#------------ END 字段循环遍历 ----------> + +<#if !entityLombokModel> + <#list table.fields as field> + <#if field.propertyType == "boolean"> + <#assign getprefix="is"/> + <#else> + <#assign getprefix="get"/> + + public ${field.propertyType} ${getprefix}${field.capitalName}() { + return ${field.propertyName}; + } + + <#if entityBuilderModel> + public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) { + <#else> + public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) { + + this.${field.propertyName} = ${field.propertyName}; + <#if entityBuilderModel> + return this; + + } + + + +<#if entityColumnConstant> + <#list table.fields as field> + public static final String ${field.name?upper_case} = "${field.name}"; + + + +<#if activeRecord> + @Override + protected Serializable pkVal() { + <#if keyPropertyName??> + return this.${keyPropertyName}; + <#else> + return null; + + } + + +<#if !entityLombokModel> + @Override + public String toString() { + return "${entity}{" + + <#list table.fields as field> + <#if field_index==0> + "${field.propertyName}=" + ${field.propertyName} + + <#else> + ", ${field.propertyName}=" + ${field.propertyName} + + + + "}"; + } + +} diff --git a/adc-da-main/src/main/resources/temp/mapper.java.ftl b/adc-da-main/src/main/resources/temp/mapper.java.ftl new file mode 100644 index 00000000..53da4ae3 --- /dev/null +++ b/adc-da-main/src/main/resources/temp/mapper.java.ftl @@ -0,0 +1,20 @@ +package ${package.Mapper}; + +import ${package.Entity}.${entity}; +import ${superMapperClassPackage}; + +/** + *

+ * ${table.comment!} Mapper 接口 + *

+ * + * @author ${author} + * @since ${date} + */ +<#if kotlin> +interface ${table.mapperName} : ${superMapperClass}<${entity}> +<#else> +public interface ${table.mapperName} extends ${superMapperClass}<${entity}> { + +} + diff --git a/adc-da-main/src/main/resources/temp/service.java.ftl b/adc-da-main/src/main/resources/temp/service.java.ftl new file mode 100644 index 00000000..e3232f3a --- /dev/null +++ b/adc-da-main/src/main/resources/temp/service.java.ftl @@ -0,0 +1,20 @@ +package ${package.Service}; + +import ${package.Entity}.${entity}; +import ${superServiceClassPackage}; + +/** + *

+ * ${table.comment!} 服务类 + *

+ * + * @author ${author} + * @since ${date} + */ +<#if kotlin> +interface ${table.serviceName} : ${superServiceClass}<${entity}> +<#else> +public interface ${table.serviceName} extends ${superServiceClass}<${entity}> { + +} + diff --git a/adc-da-main/src/main/resources/templates/controller.java.ftl b/adc-da-main/src/main/resources/templates/controller.java.ftl new file mode 100644 index 00000000..df485cbe --- /dev/null +++ b/adc-da-main/src/main/resources/templates/controller.java.ftl @@ -0,0 +1,41 @@ +package ${package.Controller}; + + +import org.springframework.web.bind.annotation.RequestMapping; +import ${package.Entity}.${entity}; +import io.swagger.annotations.Api; +<#if restControllerStyle> +import org.springframework.web.bind.annotation.RestController; +<#else> +import org.springframework.stereotype.Controller; + +<#if superControllerClassPackage??> +import ${superControllerClassPackage}; + + +/** +*

+ * ${table.comment!} 前端控制器 + *

+* +* @author ${author} +* @since ${date} +*/ +<#if restControllerStyle> +@RestController +<#else> +@Controller + +@Api(description = "|${entity}|") +@RequestMapping("<#if package.ModuleName?? && package.ModuleName != "">/${package.ModuleName}/<#if controllerMappingHyphenStyle??>${controllerMappingHyphen}<#else>${table.entityPath}") +<#if kotlin> +class ${table.controllerName}<#if superControllerClass??> : ${superControllerClass}() +<#else> + <#if superControllerClass??> +public class ${table.controllerName} extends ${superControllerClass}<${entity}> { + <#else> +public class ${table.controllerName} extends ${superControllerClass}<${entity}>{ + + +} + diff --git a/adc-da-main/src/main/resources/templates/entity.java.ftl b/adc-da-main/src/main/resources/templates/entity.java.ftl new file mode 100644 index 00000000..c698d363 --- /dev/null +++ b/adc-da-main/src/main/resources/templates/entity.java.ftl @@ -0,0 +1,152 @@ +package ${package.Entity}; + +<#list table.importPackages as pkg> +import ${pkg}; + +<#if swagger2> +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +<#if entityLombokModel> +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + + +/** + *

+ * ${table.comment!} + *

+ * + * @author ${author} + * @since ${date} + */ +<#if entityLombokModel> +@Data + <#if superEntityClass??> +@EqualsAndHashCode(callSuper = true) + <#else> +@EqualsAndHashCode(callSuper = false) + +@Accessors(chain = true) + +<#if table.convert> +@TableName("${table.name}") + +<#if swagger2> +@ApiModel(value="${entity}对象", description="${table.comment!}") + +<#if superEntityClass??> +public class ${entity} extends ${superEntityClass}<#if activeRecord><${entity}> { +<#elseif activeRecord> +public class ${entity} extends Model<${entity}> { +<#else> +public class ${entity} implements Serializable { + + +<#if entitySerialVersionUID> + private static final long serialVersionUID = 1L; + +<#-- ---------- BEGIN 字段循环遍历 ----------> +<#list table.fields as field> + <#if field.keyFlag> + <#assign keyPropertyName="${field.propertyName}"/> + + + <#if field.comment!?length gt 0> + <#if swagger2> + @ApiModelProperty(value = "${field.comment}") + <#else> + /** + * ${field.comment} + */ + + + <#if field.keyFlag> + <#-- 主键 --> + <#if field.keyIdentityFlag> + @TableId(value = "${field.name}", type = IdType.AUTO) + <#elseif idType??> + @TableId(value = "${field.name}", type = IdType.${idType}) + <#elseif field.convert> + @TableId("${field.name}") + + <#-- 普通字段 --> + <#elseif field.fill??> + <#-- ----- 存在字段填充设置 -----> + <#if field.convert> + @TableField(value = "${field.name}", fill = FieldFill.${field.fill}) + <#else> + @TableField(fill = FieldFill.${field.fill}) + + <#elseif field.convert> + @TableField("${field.name}") + + <#-- 乐观锁注解 --> + <#if (versionFieldName!"") == field.name> + @Version + + <#-- 逻辑删除注解 --> + <#if (logicDeleteFieldName!"") == field.name> + @TableLogic + + private ${field.propertyType} ${field.propertyName}; + +<#------------ END 字段循环遍历 ----------> + +<#if !entityLombokModel> + <#list table.fields as field> + <#if field.propertyType == "boolean"> + <#assign getprefix="is"/> + <#else> + <#assign getprefix="get"/> + + public ${field.propertyType} ${getprefix}${field.capitalName}() { + return ${field.propertyName}; + } + + <#if entityBuilderModel> + public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) { + <#else> + public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) { + + this.${field.propertyName} = ${field.propertyName}; + <#if entityBuilderModel> + return this; + + } + + + +<#if entityColumnConstant> + <#list table.fields as field> + public static final String ${field.name?upper_case} = "${field.name}"; + + + +<#if activeRecord> + @Override + protected Serializable pkVal() { + <#if keyPropertyName??> + return this.${keyPropertyName}; + <#else> + return null; + + } + + +<#if !entityLombokModel> + @Override + public String toString() { + return "${entity}{" + + <#list table.fields as field> + <#if field_index==0> + "${field.propertyName}=" + ${field.propertyName} + + <#else> + ", ${field.propertyName}=" + ${field.propertyName} + + + + "}"; + } + +} diff --git a/adc-da-main/src/main/resources/templates/mapper.java.ftl b/adc-da-main/src/main/resources/templates/mapper.java.ftl new file mode 100644 index 00000000..53da4ae3 --- /dev/null +++ b/adc-da-main/src/main/resources/templates/mapper.java.ftl @@ -0,0 +1,20 @@ +package ${package.Mapper}; + +import ${package.Entity}.${entity}; +import ${superMapperClassPackage}; + +/** + *

+ * ${table.comment!} Mapper 接口 + *

+ * + * @author ${author} + * @since ${date} + */ +<#if kotlin> +interface ${table.mapperName} : ${superMapperClass}<${entity}> +<#else> +public interface ${table.mapperName} extends ${superMapperClass}<${entity}> { + +} + diff --git a/adc-da-main/src/main/resources/templates/mapper.xml.ftl b/adc-da-main/src/main/resources/templates/mapper.xml.ftl new file mode 100644 index 00000000..d9ca71c4 --- /dev/null +++ b/adc-da-main/src/main/resources/templates/mapper.xml.ftl @@ -0,0 +1,39 @@ + + + + +<#if enableCache> + + + + +<#if baseResultMap> + + +<#list table.fields as field> +<#if field.keyFlag><#--生成主键排在第一位--> + + + +<#list table.commonFields as field><#--生成公共字段 --> + + +<#list table.fields as field> +<#if !field.keyFlag><#--生成普通字段 --> + + + + + + +<#if baseColumnList> + + +<#list table.commonFields as field> + ${field.name}, + + ${table.fieldNames} + + + + diff --git a/adc-da-main/src/main/resources/templates/service.java.ftl b/adc-da-main/src/main/resources/templates/service.java.ftl new file mode 100644 index 00000000..e3232f3a --- /dev/null +++ b/adc-da-main/src/main/resources/templates/service.java.ftl @@ -0,0 +1,20 @@ +package ${package.Service}; + +import ${package.Entity}.${entity}; +import ${superServiceClassPackage}; + +/** + *

+ * ${table.comment!} 服务类 + *

+ * + * @author ${author} + * @since ${date} + */ +<#if kotlin> +interface ${table.serviceName} : ${superServiceClass}<${entity}> +<#else> +public interface ${table.serviceName} extends ${superServiceClass}<${entity}> { + +} + diff --git a/adc-da-main/src/main/resources/templates/serviceImpl.java.ftl b/adc-da-main/src/main/resources/templates/serviceImpl.java.ftl new file mode 100644 index 00000000..aeebd14c --- /dev/null +++ b/adc-da-main/src/main/resources/templates/serviceImpl.java.ftl @@ -0,0 +1,26 @@ +package ${package.ServiceImpl}; + +import ${package.Entity}.${entity}; +import ${package.Mapper}.${table.mapperName}; +import ${package.Service}.${table.serviceName}; +import ${superServiceImplClassPackage}; +import org.springframework.stereotype.Service; + +/** + *

+ * ${table.comment!} 服务实现类 + *

+ * + * @author ${author} + * @since ${date} + */ +@Service +<#if kotlin> +open class ${table.serviceImplName} : ${superServiceImplClass}<${table.mapperName}, ${entity}>(), ${table.serviceName} { + +} +<#else> +public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.mapperName}, ${entity}> implements ${table.serviceName} { + +} + diff --git a/adc-da-main/src/main/resources/ueditor/config.json b/adc-da-main/src/main/resources/ueditor/config.json new file mode 100644 index 00000000..77a0a70f --- /dev/null +++ b/adc-da-main/src/main/resources/ueditor/config.json @@ -0,0 +1,97 @@ +/* 前后端通信相关的配置,注释只允许使用多行方式 */ +{ + /* 上传图片配置项 */ + "imageActionName": "/api/ueditor/uploadImageData", /* 执行上传图片的action名称 */ + "imageFieldName": "upfile", /* 提交的图片表单名称 */ + "imageMaxSize": 2048000, /* 上传大小限制，单位B */ + "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */ + "imageCompressEnable": true, /* 是否压缩图片,默认是true */ + "imageCompressBorder": 1600, /* 图片压缩最长边限制 */ + "imageInsertAlign": "none", /* 插入的图片浮动方式 */ + "imageUrlPrefix": "", /* 图片访问路径前缀 */ + "localSavePathPrefix":"upload/images/inform", + "imagePathFormat": "", /* 上传保存路径,可以自定义保存路径和文件名格式 */ + /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */ + /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */ + /* {time} 会替换成时间戳 */ + /* {yyyy} 会替换成四位年份 */ + /* {yy} 会替换成两位年份 */ + /* {mm} 会替换成两位月份 */ + /* {dd} 会替换成两位日期 */ + /* {hh} 会替换成两位小时 */ + /* {ii} 会替换成两位分钟 */ + /* {ss} 会替换成两位秒 */ + /* 非法字符 \ : * ? " < > | */ + /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */ + + /* 涂鸦图片上传配置项 */ + "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */ + "scrawlFieldName": "upfile", /* 提交的图片表单名称 */ + "scrawlPathFormat": "", /* 上传保存路径,可以自定义保存路径和文件名格式 */ + "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */ + "scrawlUrlPrefix": "", /* 图片访问路径前缀 */ + "scrawlInsertAlign": "none", + + /* 截图工具上传 */ + "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */ + "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */ + "snapscreenUrlPrefix": "", /* 图片访问路径前缀 */ + "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */ + + /* 抓取远程图片配置 */ + "catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"], + "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */ + "catcherFieldName": "source", /* 提交的图片列表表单名称 */ + "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */ + "catcherUrlPrefix": "", /* 图片访问路径前缀 */ + "catcherMaxSize": 2048000, /* 上传大小限制，单位B */ + "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */ + /*抓取远程图片是否开启,默认true*/ + "catchRemoteImageEnable": false, + + /* 上传视频配置 */ + "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */ + "videoFieldName": "upfile", /* 提交的视频表单名称 */ + "videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */ + "videoUrlPrefix": "", /* 视频访问路径前缀 */ + "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */ + "videoAllowFiles": [ + ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", + ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */ + + /* 上传文件配置 */ + "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */ + "fileFieldName": "upfile", /* 提交的文件表单名称 */ + "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */ + "fileUrlPrefix": "", /* 文件访问路径前缀 */ + "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */ + "fileAllowFiles": [ + ".png", ".jpg", ".jpeg", ".gif", ".bmp", + ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", + ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", + ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", + ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" + ], /* 上传文件格式显示 */ + + /* 列出指定目录下的图片 */ + "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */ + "imageManagerListPath": "/ueditor/jsp/upload/image/", /* 指定要列出图片的目录 */ + "imageManagerListSize": 20, /* 每次列出文件数量 */ + "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */ + "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */ + "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */ + + /* 列出指定目录下的文件 */ + "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */ + "fileManagerListPath": "/ueditor/jsp/upload/file/", /* 指定要列出文件的目录 */ + "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */ + "fileManagerListSize": 20, /* 每次列出文件数量 */ + "fileManagerAllowFiles": [ + ".png", ".jpg", ".jpeg", ".gif", ".bmp", + ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg", + ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid", + ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso", + ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml" + ] /* 列出的文件类型 */ + +} \ No newline at end of file diff --git a/adc-da-main/src/main/resources/white/uploadWhite.txt b/adc-da-main/src/main/resources/white/uploadWhite.txt new file mode 100644 index 00000000..fd4a3ae3 --- /dev/null +++ b/adc-da-main/src/main/resources/white/uploadWhite.txt @@ -0,0 +1,12 @@ +pdf +doc +docx +xlsx +xls +zip +rar +jpg +jpge +png +gif +ppt \ No newline at end of file diff --git a/adc-da-main/src/main/resources/white/xssWhite.txt b/adc-da-main/src/main/resources/white/xssWhite.txt new file mode 100644 index 00000000..b724e4db --- /dev/null +++ b/adc-da-main/src/main/resources/white/xssWhite.txt @@ -0,0 +1 @@ +/upload/ \ No newline at end of file diff --git a/adc-da-sys/.gitignore b/adc-da-sys/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/adc-da-sys/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/adc-da-sys/.mvn/wrapper/MavenWrapperDownloader.java b/adc-da-sys/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..a45eb6ba --- /dev/null +++ b/adc-da-sys/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/adc-da-sys/.mvn/wrapper/maven-wrapper.jar b/adc-da-sys/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 Binary files /dev/null and b/adc-da-sys/.mvn/wrapper/maven-wrapper.jar differ diff --git a/adc-da-sys/.mvn/wrapper/maven-wrapper.properties b/adc-da-sys/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..642d572c --- /dev/null +++ b/adc-da-sys/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/adc-da-sys/mvnw b/adc-da-sys/mvnw new file mode 100644 index 00000000..a16b5431 --- /dev/null +++ b/adc-da-sys/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/adc-da-sys/mvnw.cmd b/adc-da-sys/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/adc-da-sys/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/adc-da-sys/pom.xml b/adc-da-sys/pom.xml new file mode 100644 index 00000000..66956665 --- /dev/null +++ b/adc-da-sys/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + + com.adc + foton-slrs-system-rest + 3.0.0 + + + com.adc + adc-da-sys + 3.0.0 + adc-da-sys + laws system rest system config + + jar + + + 1.8 + + + + + org.springframework + spring-test + 5.2.8.RELEASE + compile + + + com.adc + adc-da-base + 3.0.0 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${java.version} + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + + + diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java new file mode 100644 index 00000000..e3de920f --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -0,0 +1,578 @@ +package com.adc.da.att.controller; + +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.file.store.IFileStore; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.util.MD5Util; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +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.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Encoder; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; +import java.io.*; +import java.net.URLEncoder; +import java.nio.file.Files; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +@RestController +@RequestMapping("/${restPath}/att/attFile") +@Api(description = "|AttFileEO|文件上传") +public class AttFileEOController { + + private static final Logger logger = LoggerFactory.getLogger(AttFileEOController.class); + + @Autowired + private IAttFileEOService attFileEOService; + + @Autowired + private IFileStore iFileStore; + + @Value("${file.path}") + private String filePath;//文件存储路径 + +// @Autowired +// private RoleEOService roleEOService; +// +// @Autowired +// private UserEOService userEOService; + + @Value("${upload.file.white.lists}") + private String uploadFileWhiteLists; //上传文件白名单 + + + @ApiOperation(value="|File|上传文件") + @PostMapping(value="/upload",consumes="multipart/*",headers="content-type=multipart/form-data" ) + @CrossOrigin(origins = "*", maxAge = 3600) + // @RequiresPermissions("att:attFile:uploadFile") + public ResponseMessage uploadFile(@RequestParam("file") @ApiParam(value="上传文件",required=true) MultipartFile file) throws Exception{ + if(StringUtils.isNotEmpty(uploadFileWhiteLists)){ + String[] fileLists = uploadFileWhiteLists.split(","); + List arrList = Arrays.asList(fileLists); + String getFileName = file.getOriginalFilename(); + Pattern pReg = Pattern.compile("\\/|\\/|\\||:|\\?|\\%|\\*|\"|<|>|\\p{Cntrl}"); +// getFileName = getFileName.replaceAll(, "_"); + Matcher matcher = pReg.matcher(getFileName); + if (matcher.find()) { + return Result.error("文件上传失败,该文件名可能导致文件类型改变,请修改后重试"); + } + //截取文件后缀 + int pos = getFileName.lastIndexOf("."); + String str = getFileName.substring(pos+1).toLowerCase(); + if (arrList.contains(str)) { + AttFileVo fileInfo = attFileEOService.saveFileInfo(file); + if (fileInfo != null && fileInfo.getId() != null) { + String oriFileName = fileInfo.getOldFileName(); + if (StringUtils.isNotEmpty(oriFileName)) { + String standNumber = ""; + oriFileName = oriFileName.replaceAll("."+fileInfo.getFileSuffix(),""); + Pattern ptest = Pattern.compile("[A-Z]{1,}/{0,1}[A-Z]{1,}\\s{0,1}[0-9]\\d*\\.?\\d*"); + Pattern ptest2 = Pattern.compile("[A-Z]{1,}/{0,1}[A-Z]{1,}\\s{0,1}[0-9]\\d*\\.?\\d*-[0-9]{1,4}"); + Matcher matcher1 = ptest.matcher(oriFileName); + Matcher matcher2 = ptest2.matcher(oriFileName); + if (matcher2.find()) { + standNumber = matcher2.group(); + } else if (matcher1.find()) { + standNumber = matcher1.group(); + } + fileInfo.setStandNum(standNumber); + String standName = oriFileName.replace(standNumber,""); + fileInfo.setStandName(standName); + } + return Result.success("true", "上传成功", fileInfo); + } else { + return Result.error("文件上传失败"); + } + } else { + return Result.error("文件上传失败,不允许上传该类型文件"); + } + } else { + return Result.error("文件上传失败,不允许上传该类型文件"); + } + } + + @ApiOperation(value="|File|上传文件") + @PostMapping(value="/uploadFiles",consumes="multipart/*",headers="content-type=multipart/form-data" ) + @CrossOrigin(origins = "*", maxAge = 3600) + public ResponseMessage> uploadFile(@RequestParam("files") @ApiParam(value="上传文件",required=true) MultipartFile[] files) throws Exception{ + List fileInfoList= attFileEOService.saveFilesInfo(files); + return Result.success(fileInfoList); + } + + /** + * @Author yangxuenan + * @Description 下载文件 + * Date 2018/10/10 18:36 + * @Param [response, fileId] + * @return void + **/ + @ApiOperation(value = "|File|下载文件") + @GetMapping("/downloadFile") + // @RequiresPermissions("sys:file:download") + public void downloadFile(String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception { + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); + response.setHeader("Content-Disposition", "attachment; filename=\""+ fileOldName +"\""); + response.setContentType("application/octet-stream"); + is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName()); + os = response.getOutputStream(); + IOUtils.copy(is, os); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + IOUtils.closeQuietly(is); + IOUtils.closeQuietly(os); + } + } + + + @ApiOperation(value = "|File|手机下载文件") + @GetMapping("/downloadFileByPhone") + // @RequiresPermissions("sys:file:download") + public ResponseMessage downloadFileByPhone(@RequestParam("fileId")@NotNull String fileId,@RequestParam("sign")@NotNull String sign, HttpServletResponse response, HttpServletRequest request) throws Exception { + logger.info("手机下载文件调取到了----------------------"+fileId); + String key = "dufy20170329java"; + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd-HH"); + String time = df.format(new Date()); + String signConvert = fileId + time + key; + String signEncrypt = MD5Util.string2MD5(signConvert); + + if(StringUtils.isEmpty(sign)){ + logger.info("非法请求"); + return Result.error("非法请求"); + }else { + if(!signEncrypt.equals(sign)){ + logger.info("非法请求"); + return Result.error("非法请求"); + } + } + + logger.info("手机下载验证已过----------------------"+sign); + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + String filePathResult = ""; + try { + if (attFileEO != null) { + File oldFile = new File(filePath + attFileEO.getFilePath()+attFileEO.getFileName()); + String fileOldName = attFileEO.getOldFileName(); + String timeStr = String.valueOf(System.currentTimeMillis()); + String fileOutputPath = filePath + "/" + "phoneLoadFiles/" + timeStr; + File dir = new File(fileOutputPath); + if (!dir.exists()) { + dir.mkdirs(); + } + String newFilePath = fileOutputPath + "/" + fileOldName; + File newFile = new File(newFilePath); + if (!newFile.exists()) { + Files.copy(oldFile.toPath(), newFile.toPath()); + } + filePathResult = "uploadPath/phoneLoadFiles/" + timeStr + "/" + fileOldName; + return Result.success(filePathResult); + } else { + return Result.error("获取文件信息失败"); + } + } catch (IOException e){ + logger.error(e.getMessage(), e); + } + return Result.error("获取文件信息失败"); + /*InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); + response.setHeader("Content-Disposition", "attachment; filename=\""+ fileOldName +"\""); + response.setContentType("application/octet-stream"); + logger.info("请求头设置完毕"); + is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName()); + logger.info("序列化流完毕"); + os = response.getOutputStream(); + IOUtils.copy(is, os); + logger.info("文件复制完毕"); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + IOUtils.closeQuietly(is); + IOUtils.closeQuietly(os); + }*/ + } + + + @ApiOperation(value = "|File|下载文件") + @GetMapping("/downloadFileForSar") + // @RequiresPermissions("sys:file:downloadFileForSar") + public void downloadFileForSar(String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception { + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); + response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + response.setContentType("application/octet-stream"); + is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName()); + os = response.getOutputStream(); + IOUtils.copy(is, os); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + IOUtils.closeQuietly(is); + IOUtils.closeQuietly(os); + } + } + + @ApiOperation(value = "|File|下载文件加水印") + @GetMapping("/downloadFileForSarWaterMark") + // @RequiresPermissions("sys:file:downloadFileForSar") + public void downloadFileForSarWaterMark(String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception { + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); + //生成一份水印文件 + String oldFilePath = filePath + attFileEO.getFilePath()+attFileEO.getFileName(); + String newFilePath = filePath + attFileEO.getFilePath()+"waterPath/"; + File dir = new File(newFilePath); + if (!dir.exists()) { + dir.mkdirs(); + } + String waterFilePath = newFilePath + attFileEO.getOldFileName(); + // 添加水印 + String waterContent = ""; +// String userId = LoginUserUtil.getUserId(); +// String userMsg = ""; +// UserEO userEO = userEOService.selectByPrimaryKey(userId); +// if (userEO != null) { +// userMsg = userEO.getUname() + ","; +// if (StringUtils.isNotEmpty(userEO.getWorkNum())) { +// userMsg += userEO.getWorkNum() + ","; +// } +// } + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 + String date = df.format(new Date()); +// waterContent = userMsg + date; + //2020年9月5日 去掉水印处理 +// WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); + response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); + response.setContentType("application/octet-stream"); + is = iFileStore.loadFile(attFileEO.getFilePath()+"waterPath/"+attFileEO.getOldFileName()); + os = response.getOutputStream(); + IOUtils.copy(is, os); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + IOUtils.closeQuietly(is); + IOUtils.closeQuietly(os); + } + } + + /** + * @Author yangxuenan + * @Description 根据不同浏览器定义下载文件编码 + * Date 2018/10/11 10:40 + * @Param [fileName, request] + * @return java.lang.String + **/ + public String fileNameEncoding(String fileName, HttpServletRequest request) throws IOException { + String agent = request.getHeader("User-Agent"); + if (agent.contains("Firefox")) { + /*BASE64Encoder base64Encoder = new BASE64Encoder(); + fileName = "=?utf-8?B?" + + base64Encoder.encode(fileName.getBytes("utf-8")) + "?=";*/ + fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); // firefox浏览器 + } else { + fileName = URLEncoder.encode(fileName, "utf-8"); + //谷歌中空格变为+问题 + fileName = fileName.replaceAll("\\+","%20"); + } + return fileName; + } + + + /** + * @Author yangxuenan + * @Description 查询文件信息 + * Date 2018/10/10 18:41 + * @Param [fileId] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|File|查询文件信息") + @GetMapping("/getAttFileInfo") + public ResponseMessage getAttFileInfo(String fileId){ + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + return Result.success(attFileEO); + } + + /** + * @Author yangxuenan + * @Description 查询多个文件信息 + * Date 2018/10/24 9:47 + * @Param [fileIds] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|File|查询多个文件信息") + @GetMapping("/getMultiFileInfos") + // @RequiresPermissions("att:attFile:getMultiFileInfos") + public ResponseMessage> getMultiFileInfos(String fileIds){ + List fileObj = attFileEOService.getMultiFileInfos(fileIds); + return Result.success(fileObj); + } + + + @ApiOperation(value = "|File|下载文件") + @GetMapping("/uploadModalFile") + // @RequiresPermissions("att:attFile:uploadModalFile") + public void uploadModalFile(String fileName, HttpServletResponse response, HttpServletRequest request) throws Exception { + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(fileName,request); + response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName); + response.setContentType("application/octet-stream"); + is = iFileStore.loadFile("/modal/"+fileName); + os = response.getOutputStream(); + IOUtils.copy(is, os); + os.flush(); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } finally { + IOUtils.closeQuietly(is); + IOUtils.closeQuietly(os); + } + } + + + @ApiOperation(value = "|File|获取文件流") + @GetMapping("/getFileInfo") +// @RequiresPermissions("sys:file:getFileInfo") + public void getPdfFileSteam(String fileId,HttpServletRequest request,HttpServletResponse response) { + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(), request); + response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName); + response.setContentType("application/octet-stream"); + String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + File readFile = new File(readFilePath); + if (readFile.exists()) { + byte[] data = null; + try (FileInputStream input = new FileInputStream(readFile)){ + data = new byte[10000]; + int readIndex=0; + while((readIndex=input.read(data)) > 0){ + response.getOutputStream().write(data,0,readIndex); + } + } + } else { + return; + } +/* is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName()); + os = response.getOutputStream(); + IOUtils.copy(is, os); + os.flush();*/ + } catch (IOException e) { + logger.error(e.getMessage(), e); + } + } + + @ApiOperation(value = "|File|获取转换后的pdf文件流") + @GetMapping("/getPdfFileInfo") +// @RequiresPermissions("sys:file:getFileInfo") + public ResponseMessage getPdfFileInfo(String fileId,HttpServletRequest request,HttpServletResponse response) { + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + String encreptFileStr = ""; + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(), request); + response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName); + response.setContentType("application/octet-stream"); + String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + File readFile = new File(readFilePath); + String codeStr = ""; + BASE64Encoder encoder = new BASE64Encoder(); + if (readFile.exists()) { + byte[] data = null; + try (FileInputStream input = new FileInputStream(readFile)){ + data = new byte[(int) readFile.length()]; + input.read(data); + input.close(); + } catch (IOException e) { + logger.info(e.getMessage(),e); + } + //base64编码 + codeStr = encoder.encode(data); + codeStr = codeStr.replaceAll("\r|\n", ""); + //加密处理，前30后50拼上随机生成字符串 + encreptFileStr = UUIDUtils.randomUUID(30) + codeStr + UUIDUtils.randomUUID(50); + } +/* is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName()); + os = response.getOutputStream(); + IOUtils.copy(is, os); + os.flush();*/ + } catch (IOException e) { + logger.error(e.getMessage(), e); + } + if(StringUtils.isNotEmpty(encreptFileStr)){ + return Result.success("0","",encreptFileStr); + } else { + return Result.error("获取文件信息失败"); + } + } + + @ApiOperation(value = "|File|分段获取转换后的pdf文件流") + @GetMapping("/getSyncPdfFileInfo") + public void getSyncPdfFileInfo(String fileId,HttpServletRequest request,HttpServletResponse response) { + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(), request); + response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName); + String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + File readFile = new File(readFilePath); + if (readFile.exists()) { + downloadExistsFile(request,response,readFile); + } else { + return; + } +/* is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName()); + os = response.getOutputStream(); + IOUtils.copy(is, os); + os.flush();*/ + } catch (IOException e) { + logger.error(e.getMessage(), e); + } + } + + private void downloadExistsFile(HttpServletRequest request, HttpServletResponse response, File proposeFile) throws IOException,FileNotFoundException { + logger.debug("下载文件路径：" + proposeFile.getPath()); + long fSize = proposeFile.length(); + // 下载 + response.setContentType("application/x-download"); + response.setHeader("Accept-Ranges", "bytes"); + response.setHeader("Content-Length", String.valueOf(fSize)); + long pos = 0; + if (null != request.getHeader("Range")) { + // 断点续传 + response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT); + try { +// pos = Long.parseLong(request.getHeader("Range").replaceAll( +// "bytes=", "").replaceAll("-", "")); + pos = Long.parseLong((request.getHeader("Range").replaceAll("bytes=", "").split("-")[0])); + } catch (NumberFormatException e) { + logger.error(request.getHeader("Range") + " is not Number!"); + pos = 0; + } + } + ServletOutputStream out = response.getOutputStream(); + BufferedOutputStream bufferOut = new BufferedOutputStream(out); + InputStream inputStream = new FileInputStream(proposeFile); + String contentRange = new StringBuffer("bytes ").append( + new Long(pos).toString()).append("-").append( + new Long(fSize - 1).toString()).append("/").append( + new Long(fSize).toString()).toString(); + response.setHeader("Content-Range", contentRange); + logger.debug("Content-Range", contentRange); + inputStream.skip(pos); + byte[] buffer = new byte[64 * 1024]; + int length = 0; + while ((length = inputStream.read(buffer, 0, buffer.length)) != -1) { + bufferOut.write(buffer, 0, length); + } + bufferOut.flush(); + bufferOut.close(); + out.close(); + inputStream.close(); + } + + + + @ApiOperation(value = "|File|获取转换后图片流") + @GetMapping("/getFileImgInfo") +// @RequiresPermissions("sys:file:getFileInfo") + public ResponseMessage> getFileImgInfo(String fileId,int pageNo,HttpServletRequest request,HttpServletResponse response) { + Map resultMap = new HashMap<>(); + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + InputStream is = null; + OutputStream os = null; + response.reset(); + String encreptFileStr = ""; + try { + String fileOldName = fileNameEncoding(attFileEO.getOldFileName(), request); + response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName); + response.setContentType("application/octet-stream"); + String fileName = attFileEO.getFileName().substring(0, attFileEO.getFileName().indexOf(".")); + String readFilePath = filePath + attFileEO.getFilePath() + fileName + "img/" + pageNo + ".png"; + String fileDic = filePath + attFileEO.getFilePath() + fileName + "img"; + File readFile = new File(readFilePath); + String codeStr = ""; + BASE64Encoder encoder = new BASE64Encoder(); + if (readFile.exists()) { + byte[] data = null; + try (FileInputStream input = new FileInputStream(readFile)){ + data = new byte[(int) readFile.length()]; + input.read(data); + input.close(); + } catch (IOException e) { + logger.info(e.getMessage(),e); + } + //base64编码 + codeStr = encoder.encode(data); + codeStr = codeStr.replaceAll("\r|\n", ""); + //加密处理，前30后50拼上随机生成字符串 + encreptFileStr = UUIDUtils.randomUUID(30) + codeStr + UUIDUtils.randomUUID(50); + resultMap.put("data",encreptFileStr); + //获取文件夹下图片数量 + int imgCount = 0; + File readFileDic = new File(fileDic); + if (readFileDic.isDirectory()) { + File[] files = readFileDic.listFiles(); + if (files != null && files.length>0) { + imgCount = files.length; + } + } + resultMap.put("count",String.valueOf(imgCount)); + } + } catch (IOException e) { + logger.error(e.getMessage(), e); + } + if(StringUtils.isNotEmpty(encreptFileStr)){ + return Result.success("0","获取成功",resultMap); + } else { + return Result.error("获取文件信息失败"); + } + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java new file mode 100644 index 00000000..f566df77 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java @@ -0,0 +1,101 @@ +package com.adc.da.att.controller; + +import com.adc.da.att.entity.UeditorImage; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.Resource; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; + +import javax.servlet.http.HttpServletRequest; +import java.nio.charset.Charset; +import java.util.List; + +/*import com.adc.da.att.common.ueditor.ActionEnter;*/ + + +/** + * 用于处理关于ueditor插件相关的请求 + * @author zhangyanduan + * @date 2018年9月25日 + * + */ +@Slf4j +@RestController +@CrossOrigin +@RequestMapping("/${restPath}/ueditor") +public class UeditorController { + @Value("classpath:ueditor/config.json") + private Resource ueditorConfig; + @Autowired + private IAttFileEOService attFileEOService; + + + @RequestMapping(value = "/getConfig") + @ResponseBody + public String getUeditorConfig(HttpServletRequest request) throws Exception{ + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + log.info(path); + log.info(basePath); + String ueditorData = IOUtils.toString(ueditorConfig.getInputStream(), Charset.forName("UTF-8")); + return ueditorData; + } + + @RequestMapping("/uploadImageData") + @ResponseBody + public String uploadImageData(HttpServletRequest request) { + UeditorImage msg = uploadFile(request); + return JSONObject.toJSONString(msg); + } + + private UeditorImage uploadFile(HttpServletRequest request) { + UeditorImage image = new UeditorImage(); + try{ + List files = ((MultipartHttpServletRequest) request).getFiles("upfile"); + String referer = request.getHeader("referer"); + if(files!=null && !files.isEmpty()){ + MultipartFile uploadFile=files.get(0); + AttFileVo attFileVo= attFileEOService.saveFileInfo(uploadFile); + String picUrlPath =""; + if(StringUtils.isNotEmpty(referer)){ + picUrlPath=referer+"uploadPath"+ attFileVo.getFilePath()+attFileVo.getFileName(); + }else{ + picUrlPath="uploadPath"+attFileVo.getFilePath()+attFileVo.getFileName(); + } + log.info("Ueditor 上传图片返回路径："+picUrlPath); + image.setState("SUCCESS"); + image.setUrl(picUrlPath); + image.setTitle(attFileVo.getOldFileName()); +// image.setState(attFileVo.getOldFileName()); + image.setOriginal(attFileVo.getOldFileName()); + }else{ + image.setState("FAIL"); + } + }catch (Exception e){ + image.setState("FAIL"); + log.error(e.getMessage()); + } + + +/* image.setUrl(serverPath + path); + image.setState("SUCCESS"); + image.setOriginal(fileName); + image.setTitle(fileName);*/ + + + return image; + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java new file mode 100644 index 00000000..1e2b9c43 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/AttFileEODao.java @@ -0,0 +1,25 @@ +package com.adc.da.att.dao; + +import com.adc.da.att.entity.AttFileEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +/** + * + *
+ * 功能：ATT_FILE AttFileEODao
+ * 作者：code generator
+ * 日期： 2018-09-07
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public interface AttFileEODao extends BaseMapper { + + public void creatTableInfo(@Param("tableName") String tableName); + + public int existTable(@Param("tableName") String tableName); + + public AttFileEO selectFileInfoById(AttFileEO attFileEO); + + public int insertData(AttFileEO attFileEO); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/entity/AttFileEO.java b/adc-da-sys/src/main/java/com/adc/da/att/entity/AttFileEO.java new file mode 100644 index 00000000..b99fc909 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/entity/AttFileEO.java @@ -0,0 +1,217 @@ +package com.adc.da.att.entity; + +import com.adc.da.base.entity.BaseEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.Serializable; +import java.util.Date; + +/** + * 功能：ATT_FILE AttFileEOEntity
+ * 作者：code generator
+ * 日期： 2018-09-07
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class AttFileEO extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 1284335706608668758L; + + private static final Logger logger = LoggerFactory.getLogger(AttFileEO.class); + + private String id; + private String fileName; + private String oldFileName; + private String fileSuffix; + private String filePath; + private Integer validFlag; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + private String tableName; + + private String resId; + + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
+ *

字段列表：

+ *
  • id -> id
    • + *
  • fileName -> file_name
    • + *
  • oldFileName -> old_file_name
    • + *
  • fileSuffix -> file_suffix
    • + *
  • filePath -> file_path
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ + return null; + } + switch (fieldName) { + case "id": return "id"; + case "fileName": return "file_name"; + case "oldFileName": return "old_file_name"; + case "fileSuffix": return "file_suffix"; + case "filePath": return "file_path"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • file_name -> fileName
    • + *
  • old_file_name -> oldFileName
    • + *
  • file_suffix -> fileSuffix
    • + *
  • file_path -> filePath
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ + return null; + } + switch (columnName) { + case "id": return "id"; + case "file_name": return "fileName"; + case "old_file_name": return "oldFileName"; + case "file_suffix": return "fileSuffix"; + case "file_path": return "filePath"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + default: return null; + } + } + + /** **/ + public String getId() { + int tableNameIndex = this.id.lastIndexOf("_"); + if(tableNameIndex!= -1){ + String tableName = this.id.substring(0, tableNameIndex); + this.tableName=tableName; + }else{ + logger.error("文件ID格式错误:"+this.id); + } + return this.id; + } + + /** **/ + public void setId(String id) { + if(tableName!=null && !tableName.isEmpty()){ + this.id = tableName+"_"+id; + } + //此处注意保存时表结构是否存在 + this.id=id; + } + + /** **/ + public String getFileName() { + return this.fileName; + } + + /** **/ + public void setFileName(String fileName) { + this.fileName = fileName; + } + + /** **/ + public String getOldFileName() { + return this.oldFileName; + } + + /** **/ + public void setOldFileName(String oldFileName) { + this.oldFileName = oldFileName; + } + + /** **/ + public String getFileSuffix() { + return this.fileSuffix; + } + + /** **/ + public void setFileSuffix(String fileSuffix) { + this.fileSuffix = fileSuffix; + } + + /** **/ + public String getFilePath() { + return this.filePath; + } + + /** **/ + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public String getTableName() { + if(this.tableName !=null && !this.tableName.isEmpty()){ + return this.tableName; + }else{ + int tableNameIndex = this.id.lastIndexOf("_"); + if(tableNameIndex !=-1){ + String tableName = this.id.substring(0, tableNameIndex); + this.tableName=tableName; + }else{ + logger.error("文件ID格式错误:"+this.id); + } + return this.tableName; + } + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getResId() { + return resId; + } + + public void setResId(String resId) { + this.resId = resId; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/entity/UeditorImage.java b/adc-da-sys/src/main/java/com/adc/da/att/entity/UeditorImage.java new file mode 100644 index 00000000..1ec8016b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/entity/UeditorImage.java @@ -0,0 +1,41 @@ +package com.adc.da.att.entity; + +public class UeditorImage { + + private String state; + private String url; + private String title; + private String original; + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getOriginal() { + return original; + } + + public void setOriginal(String original) { + this.original = original; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/page/AttFileEOPage.java b/adc-da-sys/src/main/java/com/adc/da/att/page/AttFileEOPage.java new file mode 100644 index 00000000..d34dba4c --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/page/AttFileEOPage.java @@ -0,0 +1,215 @@ +package com.adc.da.att.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：ATT_FILE AttFileEOPage
    + * 作者：code generator
    + * 日期： 2018-09-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class AttFileEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String fileName; + private String fileNameOperator = "="; + private String oldFileName; + private String oldFileNameOperator = "="; + private String fileSuffix; + private String fileSuffixOperator = "="; + private String filePath; + private String filePathOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + + private String tableName; + + public String getId() { + int tableNameIndex = this.id.lastIndexOf("_"); + String tableName = this.id.substring(0, tableNameIndex); + this.tableName=tableName; + return this.id; + } + + public void setId(String id) { + this.id = id; + int tableNameIndex = id.lastIndexOf("_"); + String tableName = id.substring(0, tableNameIndex); + this.tableName=tableName; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getFileName() { + return this.fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNameOperator() { + return this.fileNameOperator; + } + + public void setFileNameOperator(String fileNameOperator) { + this.fileNameOperator = fileNameOperator; + } + + public String getOldFileName() { + return this.oldFileName; + } + + public void setOldFileName(String oldFileName) { + this.oldFileName = oldFileName; + } + + public String getOldFileNameOperator() { + return this.oldFileNameOperator; + } + + public void setOldFileNameOperator(String oldFileNameOperator) { + this.oldFileNameOperator = oldFileNameOperator; + } + + public String getFileSuffix() { + return this.fileSuffix; + } + + public void setFileSuffix(String fileSuffix) { + this.fileSuffix = fileSuffix; + } + + public String getFileSuffixOperator() { + return this.fileSuffixOperator; + } + + public void setFileSuffixOperator(String fileSuffixOperator) { + this.fileSuffixOperator = fileSuffixOperator; + } + + public String getFilePath() { + return this.filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public String getFilePathOperator() { + return this.filePathOperator; + } + + public void setFilePathOperator(String filePathOperator) { + this.filePathOperator = filePathOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getTableName() { + int tableNameIndex = this.id.lastIndexOf("_"); + String tableName = this.id.substring(0, tableNameIndex); + this.tableName=tableName; + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java new file mode 100644 index 00000000..952fdc7f --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java @@ -0,0 +1,25 @@ +package com.adc.da.att.service; + +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.vo.AttFileVo; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.util.List; + +public interface IAttFileEOService extends IService { + + public AttFileVo saveFileInfo(File file); + + public AttFileVo saveFileInfo(MultipartFile file); + + public List saveFilesInfo(MultipartFile[] files); + + public AttFileEO getFileInfo(String attId); + + public List getMultiFileInfos(String fileIds); + + public String saveFileAttId(File file); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java new file mode 100644 index 00000000..07f8c0c0 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -0,0 +1,361 @@ +package com.adc.da.att.service.impl; + +import com.adc.da.att.dao.AttFileEODao; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.common.ValidFlagEnum; +import com.adc.da.util.FileUtil; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Service("attFileEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +@Slf4j +public class AttFileEOServiceImpl extends ServiceImpl implements IAttFileEOService { + + + @Value("${file.path}") + private String filePath;//文件存储路径 + + + /** + * 保存文件并返回文件ID + * + * @param file + */ + @Transactional(rollbackFor = Exception.class) + public AttFileVo saveFileInfo(File file) { + /** + * 1、首先生成文件保存的主键ID + * 2、根据文件ID生成随机路径 + * 3、生成文件名 + * 3、保存文件 + * 4、获取文件相关信息 + * 5、判断当前表是否有存在，如果存在则执行insert语句 如果不存在则创建表结构 + * 5、保存入库并返回主键ID + */ + AttFileVo attFileVo = new AttFileVo(); + String fileId = UUIDUtils.randomUUID20(); + try { + String uuidPath = UUIDUtils.getUUIDPath(fileId); + + String FileSavePath = filePath + uuidPath + "/"; + File dir = new File(FileSavePath); + if (!dir.exists()) { + dir.mkdirs(); + } + + String fileName = file.getName(); + String fileSuffix = fileName.substring(fileName.lastIndexOf(".")+1, fileName.length()); + String newFileName = fileId +"."+ fileSuffix; + File saveFile = new File(FileSavePath + newFileName); + FileUtils.copyFile(file,saveFile); + //开始存储文件信息 + String tableName = UUIDUtils.getAttTable(); + int existTable = this.baseMapper.existTable(tableName); + if (existTable == 0) { + this.baseMapper.creatTableInfo(tableName); + } + fileId = tableName + "_" + fileId; + AttFileEO attFileEO = new AttFileEO(); + attFileEO.setTableName(tableName); + attFileEO.setId(fileId); + attFileEO.setOldFileName(fileName); + attFileEO.setFileSuffix(fileSuffix); + attFileEO.setFilePath(uuidPath); + attFileEO.setFileName(newFileName); + attFileEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + attFileEO.setCreationTime(new Date()); + attFileEO.setModifyTime(new Date()); + this.baseMapper.insertData(attFileEO); + attFileVo.setId(fileId); + attFileVo.setFileName(newFileName); + attFileVo.setFilePath(uuidPath); + attFileVo.setFileSuffix(fileSuffix); + attFileVo.setOldFileName(fileName); + } catch (IOException e) { + log.error(e.getMessage(),e); + } catch (Exception e) { + log.error(e.getMessage(),e); + } + return attFileVo; + } + + /** + * 保存文件并返回文件ID + * + * @param file + */ + @Transactional(rollbackFor = Exception.class) + public AttFileVo saveFileInfo(MultipartFile file) { + /** + * 1、首先生成文件保存的主键ID + * 2、根据文件ID生成随机路径 + * 3、生成文件名 + * 3、保存文件 + * 4、获取文件相关信息 + * 5、判断当前表是否有存在，如果存在则执行insert语句 如果不存在则创建表结构 + * 5、保存入库并返回主键ID + */ + AttFileVo attFileVo = new AttFileVo(); + String fileId = UUIDUtils.randomUUID20(); + try { + String uuidPath = UUIDUtils.getUUIDPath(fileId); + + String FileSavePath = filePath + uuidPath; + File dir = new File(FileSavePath); + if (!dir.exists()) { + dir.mkdirs(); + } + //开始存储文件 + String fileName = file.getOriginalFilename(); + // 此处发现在IE 11中存在获取文件名时获取了文件路径，此处将文件路径去除 + if(fileName.indexOf(":\\")>-1){ + // 此时说明存在从根路径获取的内容 需要处理 + fileName = fileName.substring(fileName.lastIndexOf("\\") + 1, fileName.length()); + } + String fileSuffix = fileName.substring(fileName.lastIndexOf(".") + 1, fileName.length()); + String newFileName = fileId + "." + fileSuffix; + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(FileSavePath + newFileName)); + //开始存储文件信息 + String tableName = UUIDUtils.getAttTable(); + int existTable = this.baseMapper.existTable(tableName); + if (existTable == 0) { + this.baseMapper.creatTableInfo(tableName); + } + fileId = tableName + "_" + fileId; + AttFileEO attFileEO = new AttFileEO(); + attFileEO.setTableName(tableName); + attFileEO.setId(fileId); + attFileEO.setOldFileName(fileName); + attFileEO.setFileSuffix(fileSuffix); + attFileEO.setFilePath(uuidPath); + attFileEO.setFileName(newFileName); + attFileEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + attFileEO.setCreationTime(new Date()); + attFileEO.setModifyTime(new Date()); + this.baseMapper.insertData(attFileEO); + attFileVo.setId(fileId); + attFileVo.setFileName(newFileName); + attFileVo.setFilePath(uuidPath); + attFileVo.setFileSuffix(fileSuffix); + attFileVo.setOldFileName(fileName); + } catch (IOException e) { + log.error(e.getMessage(),e); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return attFileVo; + } + + + /*** + * 保存文件列表 + * @MethodName:saveFilesInfo + * @author: zhangyanduan + * @param:[files] + * @return:java.lang.String + * date: 2018/9/19 9:48 + */ + @Transactional(rollbackFor = Exception.class) + public List saveFilesInfo(MultipartFile[] files) { + /** + * 1、首先生成文件保存的主键ID + * 2、根据文件ID生成随机路径 + * 3、生成文件名 + * 3、保存文件 + * 4、获取文件相关信息 + * 5、判断当前表是否有存在，如果存在则执行insert语句 如果不存在则创建表结构 + * 5、保存入库并返回主键ID + */ + List fileInfoList = new ArrayList(); + if (files != null && files.length > 0) { + for (int index = 0; index < files.length; index++) { + MultipartFile file = files[index]; + AttFileVo attFileVo = new AttFileVo(); + String fileId = UUIDUtils.randomUUID20(); + try { + String uuidPath = UUIDUtils.getUUIDPath(fileId); + String FileSavePath = filePath + uuidPath; + File dir = new File(FileSavePath); + if (!dir.exists()) { + dir.mkdirs(); + } + //开始存储文件 + String fileName = file.getOriginalFilename(); + if(fileName.indexOf(":\\")>-1){ + // 此时说明存在从根路径获取的内容 需要处理 + fileName = fileName.substring(fileName.lastIndexOf("\\") + 1, fileName.length()); + } + String fileSuffix = fileName.substring(fileName.lastIndexOf(".") + 1, fileName.length()); + String newFileName = fileId + "." + fileSuffix; + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(FileSavePath + newFileName)); + //开始存储文件信息 + String tableName = UUIDUtils.getAttTable(); + int existTable = this.baseMapper.existTable(tableName); + if (existTable == 0) { + this.baseMapper.creatTableInfo(tableName); + } + fileId = tableName + "_" + fileId; + AttFileEO attFileEO = new AttFileEO(); + attFileEO.setTableName(tableName); + attFileEO.setId(fileId); + attFileEO.setOldFileName(fileName); + attFileEO.setFileSuffix(fileSuffix); + attFileEO.setFilePath(uuidPath); + attFileEO.setFileName(newFileName); + attFileEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + attFileEO.setCreationTime(new Date()); + attFileEO.setModifyTime(new Date()); + this.baseMapper.insertData(attFileEO); + attFileVo.setId(fileId); + attFileVo.setFileName(newFileName); + attFileVo.setFilePath(uuidPath); + attFileVo.setFileSuffix(fileSuffix); + attFileVo.setOldFileName(fileName); + fileInfoList.add(attFileVo); + } catch (IOException e) { + log.error(e.getMessage(),e); + } catch (Exception e) { + log.error(e.getMessage(),e); + } + } + } + + return fileInfoList; + } + + + /** + * 根据文件ID获取文件信息 + * + * @param attId + * @return + */ + public AttFileEO getFileInfo(String attId) { + /** + * 根据ID获取文件信息 + */ + AttFileEO attFileEO = new AttFileEO(); + AttFileEO attFileInfo=null; + try { + attFileEO.setId(attId); + attFileInfo = this.baseMapper.selectFileInfoById(attFileEO); + return attFileInfo; + } catch (Exception e) { + log.error(e.getMessage(),e); + } + return attFileEO; + } + + + /** + * @Author yangxuenan + * @Description 多文件查询 + * Date 2018/10/24 11:08 + * @Param [fileIds] + * @return java.util.List + **/ + public List getMultiFileInfos(String fileIds) { + List fileObj = new ArrayList<>(); + if(StringUtils.isNotEmpty(fileIds)){ + String idList[] = fileIds.split(","); + for(int i=0;i { + + private static final Logger logger = LoggerFactory.getLogger(PersonCollectEOController.class); + + @Autowired + private IPersonCollectEOService personCollectEOService; + + + /* + * @Author liuyinnan + * @Description //判断是法规，标准，动态 + * @Date 17:39 2018/9/28 + * @Param [pageNo, pageSize, modeType] + * @return com.adc.da.util.http.ResponseMessage> + **/ + @ApiOperation(value = "|PersonCollectEO|分页查询") + @GetMapping("/page") + public ResponseMessage> page(Integer pageNo, Integer pageSize, String modeType, String collectTitle) throws Exception { + PersonCollectEOPage page = new PersonCollectEOPage(); + if (StringUtils.isNotEmpty(modeType)) { + List collectTypes = new ArrayList<>(); + switch (modeType) { + case "STAND": + collectTypes.add("INLAND_STAND"); + collectTypes.add("FOREIGN_STAND"); + collectTypes.add("BUSINESS_STAND"); + break; + case "LAWS": + collectTypes.add("INLAND_LAWS"); + collectTypes.add("FOREIGN_LAWS"); + break; + case "MSG": + collectTypes.add("INLAND_MSG"); + collectTypes.add("FOREIGN_MSG"); + collectTypes.add("RESOURCE_MSG"); + break; + default:break; + } + page.setCollectTypeList(collectTypes); + } + if (pageNo != null) { + page.setPage(pageNo); + }else{ + page.setPage(1); + } + if (pageSize != null) { + page.setPageSize(pageSize); + }else{ + page.setPageSize(10); + } + if (StringUtils.isNotEmpty(collectTitle)) { + page.setCollectTitle(collectTitle); + } + page.setUserId(LoginUserUtil.getUserId()); + List rows = personCollectEOService.queryByPersonCollectPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + + } + + + @ApiOperation(value = "|PersonCollectEO|查询") + @GetMapping("") +// @RequiresPermissions("person:personCollect:list") + public ResponseMessage> list(PersonCollectEOPage page) throws Exception { + return Result.success(personCollectEOService.queryByList(page)); + } + + + @ApiOperation(value = "|PersonCollectEO|详情") + @GetMapping("/{id}") +// @RequiresPermissions("person:personCollect:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(personCollectEOService.getById(id)); + } + + + /** + * 刘寅楠 + * @param personCollectEO + * @return com.adc.da.person.entity.PersonCollectEO + * @throws Exception + */ + @ApiOperation(value = "|PersonCollectEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("person:personCollect:create") + public ResponseMessage create(@RequestBody PersonCollectEO personCollectEO) throws Exception { + String userId = LoginUserUtil.getUserId(); + personCollectEO.setId(UUIDUtils.randomUUID20()); + personCollectEO.setUserId(userId); + personCollectEO.setValidFlag(0); + personCollectEO.setCreationTime(new Date()); + personCollectEO.setModifyTime(new Date()); + personCollectEOService.save(personCollectEO); + return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。",personCollectEO); + } + + + @ApiOperation(value = "|PersonCollectEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("person:personCollect:update") + public ResponseMessage update(@RequestBody PersonCollectEO personCollectEO) throws Exception { + personCollectEO.setModifyTime(new Date()); + personCollectEOService.updateById(personCollectEO); + return Result.success(personCollectEO); + } + + + + + @ApiOperation(value = "|PersonCollectEO|删除") + @DeleteMapping("/{id}") +// @RequiresPermissions("person:personCollect:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + personCollectEOService.removeById(id); + logger.info("delete from TS_PERSON_COLLECT where id = {}", id); + return Result.success(); + } + + + + /* + * @Author liuyinnan + * @Description //对收藏数据进行取消收藏 + * @Date 17:31 2018/9/28 + * @Param [personCollectEO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "取消收藏") + @PutMapping("/updateByUserId") +// @RequiresPermissions("person:personCollect:updateByUserId") + public ResponseMessage updateByUserId(PersonCollectEO personCollectEO) throws Exception { + personCollectEO.setValidFlag(1); + boolean result = personCollectEOService.updateById(personCollectEO); + if(result){ + return Result.success("0","取消成功",personCollectEO); + } else { + return Result.error("0","取消失败",personCollectEO); + } + } + + @ApiOperation(value = "|批量取消收藏") + @PostMapping("/cancelCollectByBatch") + public ResponseMessage cancelCollectByBatch(String ids) throws Exception { + try { + String arr[] = ids.split(","); + List idList = Arrays.asList(arr); + int count = personCollectEOService.deleteByIdList(idList); + if (count > 0) { + return Result.success("200","取消收藏成功",true); + } else { + return Result.error("400","取消收藏失败"); + } + }catch (Exception e){ + logger.error(e.getMessage(),e); + return Result.error("400","取消收藏失败"); + } + } + + + + /* + * @Author liuyinnan + * @Description //通过检索模糊查询 + * @Date 17:38 2018/9/28 + * @Param [page] + * @return com.adc.da.util.http.ResponseMessage + **/ +// @ApiOperation(value = "通过内容标题模糊查询") +// @GetMapping("/selectByCollectTitle") +//// @RequiresPermissions("person:personCollect:list") +// public ResponseMessage> selectByCollectTitle(PersonCollectEOPage page) throws Exception { +// page.setValidFlag("0"); +// List personCollectEO=personCollectEOService.queryByList(page); +// return Result.success(personCollectEO); +// } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonConfEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonConfEOController.java new file mode 100644 index 00000000..ec6ed530 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonConfEOController.java @@ -0,0 +1,216 @@ +package com.adc.da.person.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.person.entity.PersonConfEO; +import com.adc.da.person.page.PersonConfEOPage; +import com.adc.da.person.service.IPersonConfEOService; +import com.adc.da.util.LoginUserUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/person/personConf") +@Api(description = "|PersonConfEO|") +public class PersonConfEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(PersonConfEOController.class); + + @Autowired + private IPersonConfEOService personConfEOService; + + + + @ApiOperation(value = "|PersonConfEO|分页查询") + @GetMapping("/page") + //@RequiresPermissions("person:personConf:page") + public ResponseMessage> page(PersonConfEOPage page) throws Exception { + List rows = personConfEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|PersonConfEO|查询") + @GetMapping("") + //@RequiresPermissions("person:personConf:list") + public ResponseMessage> list(PersonConfEOPage page) throws Exception { + return Result.success(personConfEOService.queryByList(page)); + } + + @ApiOperation(value = "|PersonConfEO|详情") + @GetMapping("/{id}") + //@RequiresPermissions("person:personConf:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(personConfEOService.getById(id)); + } + + /** + * gaoyan 用户新增过程中，默认全部新增 + * @param + * @param + * @return + */ + @ApiOperation(value = "|PersonConfEO|新增") + @PostMapping(value="addConfList") + // @RequiresPermissions("person:personConf:save") + public ResponseMessage> addConfList(String userId) throws Exception { + List list = personConfEOService.saveConfList(userId); + return Result.success(list); + } + + /* + * @Author liuyinnan + * @Description //按一个对象更新个人板块 + * @Date 8:38 2018/9/25 + * @Param [personConfEO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|PersonConfEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //@RequiresPermissions("person:personConf:update") + public ResponseMessage update(@RequestBody PersonConfEO personConfEO) throws Exception { + personConfEOService.updateById(personConfEO); + personConfEO.setCreationTime(new Date()); + personConfEO.setModifyTime(new Date()); + boolean result=personConfEOService.updateById(personConfEO); + if(!result){ + return Result.error("修改失败"); + } + return Result.success(personConfEO); + } + + +// @ApiOperation(value = "根据前台传来的对象保存") +// @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// public ResponseMessage insertByList(PersonConfEO personConfEO)throws Exception{ +// personConfEOService.updateByPrimaryKeySelective(personConfEO); +// personConfEOService.insertByList(personConfEO); +// return Result.success(personConfEO); +// } + + + @ApiOperation(value = "根据前台传来的对象保存") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + public ResponseMessage insertByList(@RequestBody List personConfEOList) throws Exception { + if (personConfEOList != null && personConfEOList.size() > 0) { + + // String[] personConfEO=personConfEO.split(","); + for (int i = 0; i < personConfEOList.size(); i++) { + PersonConfEO personConfEO = personConfEOList.get(i); + personConfEO.setUserId("1"); + personConfEO.setDisplaySeq(i+1); + personConfEO.setCreationTime(new Date()); + personConfEO.setModifyTime(new Date()); + System.out.println(personConfEOList.get(i)); + personConfEOService.updateById(personConfEOList.get(i)); + personConfEOService.insert1(personConfEOList.get(i)); + } + }else { + return Result.error("操作失败"); + } + return Result.success("","操作成功",personConfEOList); + } + + + @ApiOperation(value = "|PersonConfEO|删除") + @DeleteMapping("/{id}") + //@RequiresPermissions("person:personConf:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + personConfEOService.removeById(id); + logger.info("delete from TS_PERSON_CONF where id = {}", id); + return Result.success(); + } + + + /* + * @Author liuyinnan + * @Description //排序查询 + * @Date 16:13 2018/9/21 + * @Param [] + * @return com.adc.da.util.http.ResponseMessage> + **/ +// @ApiOperation(value = "排序查询") +// @GetMapping("/selectByDisplay") +// //@RequiresPermissions("person:personConf:list") +// public ResponseMessage> updateById() throws Exception { +// List personConfEO = personConfEOService.updateById(); +// return Result.success(personConfEO); +// } + + + /* + * @Author liuyinnan + * @Description //批量删除 + * @Date 16:12 2018/9/21 + * @Param [ids] + * @return com.adc.da.util.http.ResponseMessage> + **/ +// @ApiOperation(value = "批量删除") +// @DeleteMapping("/{ids}") +// public ResponseMessage> deleteByIdList(@PathVariable String ids) throws Exception { +// String[] idList = ids.split(","); +// if (idList != null && idList.length > 0) { +// for (String id : idList) { +// List list = personConfEOService.deleteByIdList(id); +// } +// } +// return Result.success(); +// } + + /** + * gaoyan + * 查询左侧可显示的目录 + * @param + * @return + * @throws Exception + */ + @ApiOperation(value = "|PersonConfEO|详情") + @GetMapping("/getPersonConf") + //@RequiresPermissions("person:personConf:get") + public ResponseMessage> getPersonConf() throws Exception { + List list = personConfEOService.selectByUserid(LoginUserUtil.getUserId()); + return Result.success(list); + } + + /** + * gaoyan + * 个人板块信息查询 + * @param + * @return + * @throws Exception + */ + @ApiOperation(value = "|PersonConfEO|详情") + @GetMapping("/getPersonConfList") + //@RequiresPermissions("person:personConf:getPersonConfList") + public ResponseMessage getPersonConfList() throws Exception { + Map result = personConfEOService.selectPersonConfByUserid(LoginUserUtil.getUserId()); + return Result.success(result); + } + + /** + * gaoyan + * 个人登录后修改自己显示板块 + * @param + * @return + * @throws Exception + */ + @ApiOperation(value = "|PersonConfEO|详情") + @PostMapping("/updatePersonConfList") + //@RequiresPermissions("person:personConf:updatePersonConfList") + public ResponseMessage updatePersonConfList(String[] targetKeys) throws Exception { + personConfEOService.updatePersonConfList(targetKeys, LoginUserUtil.getUserId()); + return Result.success("","保存成功",targetKeys); + } +} \ No newline at end of file diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCookiesEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCookiesEOController.java new file mode 100644 index 00000000..d7f6cff5 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCookiesEOController.java @@ -0,0 +1,176 @@ +package com.adc.da.person.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.person.entity.PersonCookiesEO; +import com.adc.da.person.page.PersonCookiesEOPage; +import com.adc.da.person.service.IPersonCookiesEOService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("/${restPath}/person/personCookies") +@Api(description = "|PersonCookiesEO|") +public class PersonCookiesEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(PersonCookiesEOController.class); + + @Autowired + private IPersonCookiesEOService personCookiesEOService; + + @ApiOperation(value = "|PersonCookiesEO|分页查询") + @GetMapping("/page") + //@RequiresPermissions("person:personCookies:page") + public ResponseMessage> page(PersonCookiesEOPage page) throws Exception { + page.setValidFlag("0"); + String userId= LoginUserUtil.getUserId(); + page.setUserId(userId); + List rows = personCookiesEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|PersonCookiesEO|查询") + @GetMapping("") + //@RequiresPermissions("person:personCookies:list") + public ResponseMessage> list(PersonCookiesEOPage page) throws Exception { + return Result.success(personCookiesEOService.queryByList(page)); + } + + @ApiOperation(value = "|PersonCookiesEO|详情") + @GetMapping("/{id}") + //@RequiresPermissions("person:personCookies:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(personCookiesEOService.getById(id)); + } + + /*@ApiOperation(value = "|PersonCookiesEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //@RequiresPermissions("person:personCookies:save") + public ResponseMessage create(@RequestBody PersonCookiesEO personCookiesEO) throws Exception { + personCookiesEOService.insertSelective(personCookiesEO); + return Result.success(personCookiesEO); + }*/ + + + @ApiOperation(value = "|PersonCookiesEO|新增") + @PostMapping("/create") + //@RequiresPermissions("person:personCookies:save") + public ResponseMessage create(@RequestBody PersonCookiesEO personCookiesEO) throws Exception { + personCookiesEO.setUserId(LoginUserUtil.getUserId()); + personCookiesEO.setId(UUIDUtils.randomUUID20()); + personCookiesEO.setCreationTime(new Date()); + personCookiesEO.setModifyTime(new Date()); + personCookiesEO.setValidFlag(0); + personCookiesEOService.saveBean(personCookiesEO); + return Result.success(personCookiesEO); + } + + @ApiOperation(value = "|PersonCookiesEO|批量删除") + @PostMapping("/deleteByBacth") + public ResponseMessage deleteByBacth(String ids) throws Exception { + try { + String arr[] = ids.split(","); + List idList = Arrays.asList(arr); + int count = personCookiesEOService.deleteByIdList(idList); + if (count > 0) { + return Result.success("200","删除成功",true); + } else { + return Result.error("400","删除失败"); + } + }catch (Exception e){ + logger.error(e.getMessage(),e); + return Result.error("400","删除失败"); + } + } + + + + + + /* + * @Author liuyinnan + * @Description //删除我的浏览所有记录 + * @Date 9:51 2018/9/27 + * @Param [ids] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|PersonCookiesEO|批量删除") + @PutMapping("/deleteBacth") + //@RequiresPermissions("person:personCookies:update") + public ResponseMessage update(PersonCookiesEO personCookiesEO) throws Exception { + personCookiesEO.setUserId(LoginUserUtil.getUserId()); + personCookiesEOService.updateByAll(personCookiesEO); + return Result.success("true","清除成功",personCookiesEO); + } + + @ApiOperation(value = "|PersonCookiesEO|删除") + @DeleteMapping("/{id}") + //@RequiresPermissions("person:personCookies:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + personCookiesEOService.removeById(id); + logger.info("delete from TS_PERSON_COOKIES where id = {}", id); + return Result.success("true","删除成功",1); + } + + + /* + * @Author liuyinnan + * @Description //单句删除 + * @Date 9:51 2018/9/27 + * @Param [personCookiesEO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "根据用户id删除浏览记录") + @PutMapping("/deleteBySimple") + //@RequiresPermissions("person:personCookies:updateByUserId") + public ResponseMessage updateByUserId(PersonCookiesEO personCookiesEO) throws Exception { + int personCookiesEO1=personCookiesEOService.updateByUserId(personCookiesEO); + return Result.success("true","删除成功",1); + } + + + +// @ApiOperation(value = "根据浏览类型查询") +// @GetMapping("/cookieType") +// @ResponseBody +// public ResponseMessage> queryByCookieType(String cookieType) throws Exception{ +// List personCookiesEO=personCookiesEOService.queryByCookieType(cookieType); +// if(personCookiesEO==null){ +// return Result.error("查询失败"); +// } +// return Result.success(personCookiesEO); +// } + + +// @ApiOperation(value = "根据用户id查询") +// @GetMapping("/userId") +// public ResponseMessage> queryByUserId(String ids) throws Exception { +// String[] idList = ids.split(","); +// if (idList != null && idList.length > 0) { +// for (String id : idList) { +// List list = personConfEOService.deleteByIdList(id); +// } +// } +// return Result.success(); +// } + + @ApiOperation(value = "|PersonCookiesEO|计算浏览数") + @GetMapping("/countPageCookie") + public ResponseMessage countPageCookie(PersonCookiesEO personCookiesEO){ + int count = personCookiesEOService.countPageCookie(personCookiesEO); + return Result.success(count); + } +} + diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonMsgEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonMsgEOController.java new file mode 100644 index 00000000..ca3913e2 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonMsgEOController.java @@ -0,0 +1,220 @@ +package com.adc.da.person.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.person.page.PersonMsgEOPage; +import com.adc.da.person.page.PersonShareEOPage; +import com.adc.da.person.service.IPersonMsgEOService; +import com.adc.da.person.service.IPersonShareEOService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + + +@RestController +@RequestMapping("/${restPath}/person/personMsg") +@Api(description = "|PersonMsgEO|") +public class PersonMsgEOController extends BaseController{ + + private static final Logger logger = LoggerFactory.getLogger(PersonMsgEOController.class); + + @Autowired + private IPersonMsgEOService personMsgEOService; + + @Autowired + private IPersonShareEOService personShareEOService; + + @ApiOperation(value = "|PersonMsgEO|分页查询") + @GetMapping("/page") + //@RequiresPermissions("person:personMsg:page") + public ResponseMessage> page(PersonMsgEOPage page) throws Exception { + page.setValidFlag("0"); + List rows = personMsgEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|PersonMsgEO|查询") + @GetMapping("") + //@RequiresPermissions("person:personMsg:list") + public ResponseMessage> list(PersonMsgEOPage page) throws Exception { + return Result.success(personMsgEOService.queryByList(page)); + } + + @ApiOperation(value = "|PersonMsgEO|详情") + @GetMapping("/{id}") + //@RequiresPermissions("person:personMsg:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(personMsgEOService.getById(id)); + } + + @ApiOperation(value = "|PersonMsgEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //@RequiresPermissions("person:personMsg:save") + public ResponseMessage create(@RequestBody PersonMsgEO personMsgEO) throws Exception { + personMsgEO.setUserId(LoginUserUtil.getUserId()); + personMsgEO.setId(UUIDUtils.randomUUID20()); + personMsgEO.setCreationTime(new Date()); + personMsgEO.setModifyTime(new Date()); + personMsgEO.setReadFlag(0); + personMsgEO.setValidFlag(0); + personMsgEOService.save(personMsgEO); + return Result.success(personMsgEO); + } + + @ApiOperation(value = "|PersonMsgEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //@RequiresPermissions("person:personMsg:update") + public ResponseMessage update(@RequestBody PersonMsgEO personMsgEO) throws Exception { + personMsgEOService.updateById(personMsgEO); + return Result.success(personMsgEO); + } + + @ApiOperation(value = "|PersonMsgEO|删除") + @DeleteMapping("/{id}") + //@RequiresPermissions("person:personMsg:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + personMsgEOService.removeById(id); + logger.info("delete from TS_PERSON_MSG where id = {}", id); + return Result.success(); + } + + + + /* + * @Author liuyinnan + * @Description 根据id查询详细信息 + * @Date 14:10 2018/10/19 + * @Param [id] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|PersonMsgEO|根据id查询详细信息") + @GetMapping("/selectByInfoId") + //@RequiresPermissions("person:personMsg:list") + public ResponseMessage selectByInfoId(String id) throws Exception { + PersonMsgEO personMsgEO = personMsgEOService.selectByInfoId(id); + + // 查询详情表示查看过这条数据同时去修改是否已读 + if( null !=personMsgEO.getReadFlag() && personMsgEO.getReadFlag() == 0) { + PersonMsgEO updatete = new PersonMsgEO(); + updatete.setId(personMsgEO.getId()); + updatete.setReadFlag(1); + updatete.setModifyTime(new Date()); + personMsgEOService.updateById(updatete); + } + return Result.success(personMsgEO); + } + + /* + * @Author liuyinnan + * @Description 查询当前登录人一共有多少条未读动态 + * @Date 14:10 2018/10/19 + * @Param [id] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|PersonMsgEO|查询当前登录人一共有多少条未读动态") + @GetMapping("/selectNotRed") + //@RequiresPermissions("person:personMsg:selectNotRed") + public ResponseMessage> selectNotRed() throws Exception { + Map resultMap = new HashMap(); + PersonMsgEOPage page = new PersonMsgEOPage(); + page.setValidFlag("0"); + page.setReadFlag("0"); + page.setUserId(LoginUserUtil.getUserId()); + int msgCount = personMsgEOService.selectByNotRed(page); + resultMap.put("msgCount",msgCount); + PersonShareEOPage personShareEOPage = new PersonShareEOPage(); + personShareEOPage.setReadFlag("0"); + personShareEOPage.setValidFlag("0"); + personShareEOPage.setRecipientId(LoginUserUtil.getUserId()); + int shareCount = personShareEOService.queryByCount(personShareEOPage); + resultMap.put("shareCount",shareCount); + int allCount = msgCount+shareCount; + resultMap.put("allCount",allCount); + return Result.success(resultMap); + } + + @ApiOperation(value = "批量删除") + @PostMapping("/deleteByIdList") + public ResponseMessage deleteByIdList(String ids){ + try { + String arr[] = ids.split(","); + List idList = Arrays.asList(arr); + personMsgEOService.deletePersonMsgByIdList(idList); + return Result.success("200","删除成功",true); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return Result.error("400","删除失败"); + } + } + + + /* + * @Author yuzhong + * @Description 根据流程编号更改动态信息 + * @Date 14:10 2018/10/19 + * @Param [id] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "根据流程编号更改动态信息") + @GetMapping("/updateMsgInfoByProcessNum") + //@RequiresPermissions("person:personMsg:selectNotRed") + public ResponseMessage> updateMsgInfoByProcessNum(String processNum) throws Exception { + Map resultMap = new HashMap(); + //为了把动态的信息关闭掉 + PersonMsgEOPage personMsgEOPage = new PersonMsgEOPage(); + personMsgEOPage.setProcessnum(processNum); + personMsgEOPage.setValidFlag("0"); + List personMsgEOList = personMsgEOService.queryByList(personMsgEOPage); + if(personMsgEOList!=null && !personMsgEOList.isEmpty()){ + for(PersonMsgEO personMsgEO : personMsgEOList){ + personMsgEO.setReadFlag(1); + personMsgEOService.updateById(personMsgEO); + } + } + PersonMsgEOPage page = new PersonMsgEOPage(); + page.setValidFlag("0"); + page.setReadFlag("0"); + page.setUserId(LoginUserUtil.getUserId()); + int msgCount = personMsgEOService.selectByNotRed(page); + resultMap.put("msgCount",msgCount); + PersonShareEOPage personShareEOPage = new PersonShareEOPage(); + personShareEOPage.setReadFlag("0"); + personShareEOPage.setValidFlag("0"); + personShareEOPage.setRecipientId(LoginUserUtil.getUserId()); + int shareCount = personShareEOService.queryByCount(personShareEOPage); + resultMap.put("shareCount",shareCount); + int allCount = msgCount+shareCount; + resultMap.put("allCount",allCount); + return Result.success(resultMap); + } + + @ApiOperation(value = "批量标记已读") + @PostMapping("/markIsReadByBatch") + public ResponseMessage markIsReadByBatch(String ids){ + try { + String arr[] = ids.split(","); + List idList = Arrays.asList(arr); + int count = personMsgEOService.markIsReadByBatch(idList); + if (count > 0) { + return Result.success("200","标记成功",true); + } else { + return Result.error("400","标记失败"); + } + }catch (Exception e){ + logger.error(e.getMessage(),e); + return Result.error("400","标记失败"); + } + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonNoteEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonNoteEOController.java new file mode 100644 index 00000000..f905a37c --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonNoteEOController.java @@ -0,0 +1,168 @@ +package com.adc.da.person.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.person.entity.PersonNoteEO; +import com.adc.da.person.page.PersonNoteEOPage; +import com.adc.da.person.service.IPersonNoteEOService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("/${restPath}/person/personNote") +@Api(description = "|PersonNoteEO|") +public class PersonNoteEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(PersonNoteEOController.class); + + @Autowired + private IPersonNoteEOService personNoteEOService; + + + @ApiOperation(value = "|PersonNoteEO|分页查询") + @GetMapping("/page") + //@RequiresPermissions("person:personNote:page") + public ResponseMessage> page(PersonNoteEOPage page) throws Exception { + List rows = personNoteEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|PersonNoteEO|查询") + @GetMapping("") + //@RequiresPermissions("person:personNote:list") + public ResponseMessage> list(PersonNoteEOPage page) throws Exception { + return Result.success(personNoteEOService.queryByList(page)); + } + + @ApiOperation(value = "|PersonNoteEO|详情") + @GetMapping("/{id}") + //@RequiresPermissions("person:personNote:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(personNoteEOService.getById(id)); + } + + + + /* + * @Author liuyinnan + * @Description //保存笔记 + * @Date 18:30 2018/9/28 + * @Param [personNoteEO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "保存笔记") + @PostMapping("/save") + //@RequiresPermissions("person:personNote:save") + public ResponseMessage save(@RequestBody PersonNoteEO personNoteEO) throws Exception { + personNoteEO.setId(personNoteEO.getId()); + personNoteEO.setUserId(personNoteEO.getUserId()); + boolean result=personNoteEOService.save(personNoteEO); + if(!result){ + return Result.error("保存失败"); + } + return Result.success("true","修改成功",personNoteEO); +} + + +/* @ApiOperation(value = "|PersonNoteEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("person:personNote:update") + public ResponseMessage update(@RequestBody PersonNoteEO personNoteEO) throws Exception { + personNoteEOService.updateByPrimaryKeySelective(personNoteEO); + return Result.success(personNoteEO); + }*/ + + @ApiOperation(value = "|PersonNoteEO|删除") + @DeleteMapping("/{id}") + // @RequiresPermissions("person:personNote:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + personNoteEOService.removeById(id); + logger.info("delete from TS_PERSON_NOTE where id = {}", id); + return Result.success(); + } + + + /* + * @Author liuyinnan + * @Description //通过笔记的id和收藏id进行修改笔记内容 + * @Date 8:49 2018/9/28 + * @Param [personNoteEO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "修改笔记") + @PutMapping("/updateById") + //@RequiresPermissions("person:personNote:updateByCollectId") + public ResponseMessage updateByCollectId(PersonNoteEO personNoteEO) throws Exception { + personNoteEOService.updateByCollectId(personNoteEO); + return Result.success("true","修改成功",personNoteEO); + } + + + /* + * @Author liuyinnan + * @Description //通过传入的收藏表的id对笔记表进行查询 + * @Date 8:44 2018/9/28 + * @Param [collectId] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "查询笔记") + @GetMapping("/collectId") + public ResponseMessage> queryByCollectId(PersonNoteEO personNoteEO) throws Exception { + //获取当前登录人 + System.err.println("zzzzzzzz "+personNoteEO); + List personNoteEO1 = personNoteEOService.queryByCollectId(personNoteEO); + System.err.println("xxxxxxxx "+personNoteEO1); + return Result.success(personNoteEO1); + } + + + /* + * @Author liuyinnan + * @Description //根据用户id和笔记id删除 + * @Date 8:38 2018/9/28 + * @Param [personNoteEO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "删除笔记") + @PutMapping("/updatePersonNote") + //@RequiresPermissions("person:personNote:updatePersonNote") + public ResponseMessage updatePersonNote(PersonNoteEO personNoteEO) throws Exception { + personNoteEOService.updateById(personNoteEO); + return Result.success("true", "删除成功",personNoteEO); + } + + + /* + * @Author liuyinnan + * @Description //根据收藏的id插入笔记 + * @Date 21:15 2018/9/27 + * @Param [personNoteEO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "插入笔记") + @PostMapping("/insertByCollectId") + //@RequiresPermissions("person:personNote:insert") + public ResponseMessage insert(PersonNoteEO personNoteEO) throws Exception { + personNoteEO.setId(UUIDUtils.randomUUID20()); + personNoteEO.setUserId(LoginUserUtil.getUserId()); + personNoteEO.setCreartionTime(new Date()); + personNoteEO.setModifyTime(new Date()); + personNoteEO.setValidFlag(0); + boolean result=personNoteEOService.save(personNoteEO); + if(!result){ + return Result.error("添加失败"); + } + return Result.success("true", "新增成功",personNoteEO); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonSearchEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonSearchEOController.java new file mode 100644 index 00000000..461afb3b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonSearchEOController.java @@ -0,0 +1,143 @@ +package com.adc.da.person.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.person.entity.PersonSearchEO; +import com.adc.da.person.page.PersonSearchEOPage; +import com.adc.da.person.service.IPersonSearchEOService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/person/personSearch") +@Api(description = "|PersonSearchEO|") +public class PersonSearchEOController extends BaseController{ + + private static final Logger logger = LoggerFactory.getLogger(PersonSearchEOController.class); + + @Autowired + private IPersonSearchEOService personSearchEOService; + + @ApiOperation(value = "|PersonSearchEO|分页查询") + @GetMapping("/page") + //@RequiresPermissions("person:personSearch:page") + public ResponseMessage> page(PersonSearchEOPage page) throws Exception { + List rows = personSearchEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|PersonSearchEO|查询") + @GetMapping("") + //@RequiresPermissions("person:personSearch:list") + public ResponseMessage> list(PersonSearchEOPage page) throws Exception { + return Result.success(personSearchEOService.queryByList(page)); + } + + @ApiOperation(value = "|PersonSearchEO|详情") + @GetMapping("/{id}") + //@RequiresPermissions("person:personSearch:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(personSearchEOService.getById(id)); + } + + @ApiOperation(value = "|PersonSearchEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //@RequiresPermissions("person:personSearch:save") + public ResponseMessage create(@RequestBody PersonSearchEO personSearchEO) throws Exception { + personSearchEO.setId(UUIDUtils.randomUUID20()); + personSearchEO.setCreationTime(new Date()); + personSearchEO.setModifyTime(new Date()); + personSearchEOService.save(personSearchEO); + return Result.success(personSearchEO); + } + + @ApiOperation(value = "|PersonSearchEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //@RequiresPermissions("person:personSearch:update") + public ResponseMessage update(@RequestBody PersonSearchEO personSearchEO) throws Exception { + personSearchEOService.updateById(personSearchEO); + return Result.success(personSearchEO); + } + + @ApiOperation(value = "|PersonSearchEO|删除") + @DeleteMapping("/{id}") + //@RequiresPermissions("person:personSearch:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + personSearchEOService.removeById(id); + logger.info("delete from TS_PERSON_SEARCH where id = {}", id); + return Result.success(); + } + + /** + * gaoyan + * 查询各人检索记录 + * @param page + * @return + * @throws Exception + */ + @ApiOperation(value = "|PersonSearchEO|查询") + @GetMapping("/selectPersonSearch") + //@RequiresPermissions("person:personSearch:list") + public ResponseMessage> selectPersonSearch(PersonSearchEOPage page) throws Exception { + page.setUserId(LoginUserUtil.getUserId()); + page.setOrderBy("creation_time desc"); + page.setValidFlag("0"); + List result = personSearchEOService.queryByList(page); + int i = 5; + if(result.size()<5){ + i = result.size(); + } + List newresult = result.subList(0,i); + return Result.success(newresult); + } + + /** + * gaoyan + * 删除或清空检索历史 + * @param + * @return + * @throws Exception + */ + @ApiOperation(value = "|PersonSearchEO|查询") + @PostMapping("/deletePersonSearch") + //@RequiresPermissions("person:personSearch:list") + public ResponseMessage> deletePersonSearch(String id,String type) throws Exception { + List idlist = new ArrayList<>(); + if(StringUtils.isNotEmpty(type) && type.equals("all")){ + // 清空当前登录人所有浏览记录 + PersonSearchEOPage personSearchEOPage = new PersonSearchEOPage(); + personSearchEOPage.setUserId(LoginUserUtil.getUserId()); + personSearchEOPage.setValidFlag("0"); + List resulist = personSearchEOService.queryByList(personSearchEOPage); + for(int i=0;i { + + private static final Logger logger = LoggerFactory.getLogger(PersonShareEOController.class); + + @Autowired + private IPersonShareEOService personShareEOService; + + @Autowired + private IUserEOService userEOService; + + @ApiOperation(value = "|PersonShareEO|推送分页查询") + @GetMapping("/page") + //@RequiresPermissions("person:personShare:page") + public ResponseMessage> page(PersonShareEOPage page) { + page.setValidFlag("0"); + page.setRecipientId(LoginUserUtil.getUserId()); + List rows = personShareEOService.queryByPage(page); + //加载分享人名称到前台 + if (rows != null && rows.size() > 0) { + for (PersonShareEO personShareEO : rows) { + String userid = personShareEO.getShareUserId(); + UserEO user = userEOService.selectByPrimaryKey(userid); + personShareEO.setShareUserId(user != null ? user.getUname() : null); + } + } + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|PersonShareEO|转发分页查询") + @GetMapping("/forwardPage") + //@RequiresPermissions("person:personShare:page") + public ResponseMessage> forwardPage(PersonShareEOPage page) throws Exception { + page.setFvalidFlag("0"); + page.setShareUserId(LoginUserUtil.getUserId()); + List rows = personShareEOService.queryByPage(page); + //加载转发人名称到前台 + if (rows != null && rows.size() > 0) { + for (PersonShareEO personShareEO : rows) { + String userid = personShareEO.getRecipientId(); + UserEO user = userEOService.selectByPrimaryKey(userid); + personShareEO.setShareUserId(user != null ? user.getUname() : null); + } + } + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|PersonShareEO|查询") + @GetMapping("") + //@RequiresPermissions("person:personShare:list") + public ResponseMessage> list(PersonShareEOPage page) throws Exception { + return Result.success(personShareEOService.queryByList(page)); + } + + @ApiOperation(value = "|PersonShareEO|详情") + @GetMapping("/{id}") + //@RequiresPermissions("person:personShare:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(personShareEOService.getById(id)); + } + + /** + * 功能描述: 消息推送新增 + * + * @param: [personShareEO] + * @return: com.adc.da.util.http.ResponseMessage + * @auther: SYT + * @date: 2018/10/15 14:00 + */ + @ApiOperation(value = "|PersonShareEO|分享新增") + @PostMapping("/savePersonShare") + //@RequiresPermissions("person:personShare:create") + public ResponseMessage create(PersonShareEO personShareEO) throws Exception { + + String[] split = personShareEO.getRecipientId().split(","); +// 去掉重复选择的人 + List idList = Arrays.asList(split); + List idListNew = new ArrayList<>(); + for (String id : idList) { + if (!idListNew.contains(id)) { + idListNew.add(id); + } + } + for (String s : idListNew) { + //前台传递的值 resType recipientId RES_ID RES_TITLE + personShareEO.setRecipientId(s); + personShareEO.setId(UUIDUtils.randomUUID20()); + personShareEO.setShareUserId(LoginUserUtil.getUserId()); + personShareEO.setValidFlag(0); + personShareEO.setResUri("推送信息"); + personShareEO.setReadFlag(0); + personShareEO.setModifyTime(new Date()); + personShareEO.setCreationTime(new Date()); + System.out.println(personShareEO); + personShareEOService.save(personShareEO); + } + return Result.success(personShareEO); + } + + @ApiOperation(value = "|PersonShareEO|转发新增") + @PostMapping("/savePersonForward") + //@RequiresPermissions("person:personShare:create") + public ResponseMessage forwardCreate(PersonShareEO personShareEO) throws Exception { + + String[] split = personShareEO.getRecipientId().split(","); +// 去掉重复选择的人 + List idList = Arrays.asList(split); + List idListNew = new ArrayList<>(); + for (String id : idList) { + if (!idListNew.contains(id)) { + idListNew.add(id); + } + } + for (String s : idListNew) { + //前台传递的值 resType recipientId RES_ID RES_TITLE + personShareEO.setRecipientId(s); + personShareEO.setId(UUIDUtils.randomUUID20()); + personShareEO.setShareUserId(LoginUserUtil.getUserId()); + personShareEO.setFvalidFlag(0); + personShareEO.setResUri("转发消息"); + personShareEO.setReadFlag(0); + personShareEO.setModifyTime(new Date()); + personShareEO.setCreationTime(new Date()); + System.out.println(personShareEO); + personShareEOService.save(personShareEO); + } + return Result.success(personShareEO); + } + + @ApiOperation(value = "|PersonShareEO|修改") + @PostMapping("/updateReadFlag") + //@RequiresPermissions("person:personShare:update") + public ResponseMessage updateReadFlag(@RequestBody PersonShareEO personShareEO) throws Exception { + personShareEO.setReadFlag(1); + personShareEOService.updateById(personShareEO); + return Result.success(personShareEO); + } + + @ApiOperation(value = "|PersonShareEO|删除") + @DeleteMapping("/{id}") + //@RequiresPermissions("person:personShare:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + personShareEOService.removeById(id); + logger.info("delete from TS_PERSON_SHARE where id = {}", id); + return Result.success(); + } + + @ApiOperation(value = "批量删除") + @PostMapping("/deleteByIdList") + public ResponseMessage deleteByIdList(String ids){ + try { + String arr[] = ids.split(","); + List idList = Arrays.asList(arr); + personShareEOService.deleteByIdList(idList); + return Result.success("200","删除成功",true); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return Result.error("400","删除失败"); + } + } + + @ApiOperation(value = "转发批量删除") + @PostMapping("/deleteByIdListForward") + public ResponseMessage deleteByIdListForward(String ids){ + try { + String arr[] = ids.split(","); + List idList = Arrays.asList(arr); + personShareEOService.deleteByIdListForward(idList); + return Result.success("200","删除成功",true); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return Result.error("400","删除失败"); + } + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java new file mode 100644 index 00000000..cd1fe6e9 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java @@ -0,0 +1,32 @@ +package com.adc.da.person.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonCollectEO; +import com.adc.da.person.page.PersonCollectEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_COLLECT PersonCollectEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface PersonCollectEODao extends BaseMapper { + + List queryByList(BasePage page); + + int queryByCount(BasePage var1); + + List queryByPage(BasePage page); + + public List queryByPersonCollectPage(PersonCollectEOPage page); + + int queryByPersonCollectPageCount(PersonCollectEOPage page); + + int deleteByIdList(@Param("idList") List idList); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonConfEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonConfEODao.java new file mode 100644 index 00000000..86b36d86 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonConfEODao.java @@ -0,0 +1,36 @@ +package com.adc.da.person.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonConfEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_CONF PersonConfEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface PersonConfEODao extends BaseMapper { + + List queryByList(BasePage page); + + int queryByCount(BasePage var1); + + List queryByPage(BasePage page); + +// List updateById(); +// List deleteByIdList(String ids); + +// List insertByList(PersonConfEO personConfEO); +// public void insertSelective(@Param("Id")); + + List insert1(PersonConfEO personConfEO); + + List selectByUserid(String userId); + + int updateConfByUserIdModuleCode(PersonConfEO personConfEO); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCookiesEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCookiesEODao.java new file mode 100644 index 00000000..c425927f --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCookiesEODao.java @@ -0,0 +1,60 @@ +package com.adc.da.person.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonCookiesEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_COOKIES PersonCookiesEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface PersonCookiesEODao extends BaseMapper { + + List queryByList(BasePage page); + + int queryByCount(BasePage var1); + + List queryByPage(BasePage page); + + List queryByCookieType(String cookieType); + + List queryByUserId(String userId); + + int updateByUserId(PersonCookiesEO personCookiesEO); + + public void update(String id); + + + //删除我的浏览所有记录 + public void updateByAll(PersonCookiesEO personCookiesEO); + + //liwenxuan:标准法规被查阅次数:国内标准 + List MonthlyNumberOfDomesticStandards(@Param("visitTime") Date visitTime, @Param("cookieType") String cookieType); + + + //liwenxuan:数据报表的系统用户访问数量 + int sysUserVisitCount(Date visitTime); + /** + * + * 功能描述: + * + * @param: 当前时间 + * @return: 动态信息访问量top10 + * @auther: bayulei + * @date: 2018/10/11 20:40 + */ + ArrayList selectMsgConsultNumber(Date date); + + int countPageCookie(PersonCookiesEO personCookiesEO); + + int deleteByIdList(@Param("idList") List idList); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonMsgEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonMsgEODao.java new file mode 100644 index 00000000..8e77d2aa --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonMsgEODao.java @@ -0,0 +1,36 @@ +package com.adc.da.person.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.person.page.PersonMsgEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_MSG PersonMsgEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface PersonMsgEODao extends BaseMapper { + + List queryByList(BasePage page); + + int queryByCount(BasePage var1); + + List queryByPage(BasePage page); + + public PersonMsgEO selectByInfoId(String id); + + public int selectByNotRed(PersonMsgEOPage page); + + void deleteByIdList(@Param("idList") List idList); + + void deletePersonMsgByIdList(@Param("idList") List idList); + + int markIsReadByBatch(@Param("idList") List idList); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonNoteEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonNoteEODao.java new file mode 100644 index 00000000..68c57aad --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonNoteEODao.java @@ -0,0 +1,31 @@ +package com.adc.da.person.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonNoteEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_NOTE PersonNoteEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface PersonNoteEODao extends BaseMapper { + + List queryByList(BasePage page); + + int queryByCount(BasePage var1); + + List queryByPage(BasePage page); + + Integer updateByCollectId(PersonNoteEO personNoteEO); + + List queryByCollectId(PersonNoteEO personNoteEO); + + int update(PersonNoteEO personNoteEO); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonSearchEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonSearchEODao.java new file mode 100644 index 00000000..2fe55c65 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonSearchEODao.java @@ -0,0 +1,25 @@ +package com.adc.da.person.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonSearchEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_SEARCH PersonSearchEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface PersonSearchEODao extends BaseMapper { + + List queryByList(BasePage page); + + int queryByCount(BasePage var1); + + List queryByPage(BasePage page); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonShareEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonShareEODao.java new file mode 100644 index 00000000..926fa370 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonShareEODao.java @@ -0,0 +1,29 @@ +package com.adc.da.person.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonShareEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_SHARE PersonShareEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public interface PersonShareEODao extends BaseMapper { + + List queryByList(BasePage page); + + int queryByCount(BasePage var1); + + List queryByPage(BasePage page); + + void deleteByIdList(@Param("idList") List idList); + + void deleteByIdListForward(@Param("idList") List idList); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java new file mode 100644 index 00000000..c7200d51 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java @@ -0,0 +1,211 @@ +package com.adc.da.person.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 功能：TS_PERSON_COLLECT PersonCollectEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonCollectEO extends BaseEntity { + + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + + private Date creationTime; + private Integer validFlag; + private String collectResId; + private String collectInfoUri; + private String collectTitle; + private String collectType; + private String userId; + private String id; + + //追加字段 + private List noteList = new ArrayList<>(); + + + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • collectResId -> collect_res_id
    • + *
  • collectInfoUri -> collect_info_uri
    • + *
  • collectTitle -> collect_title
    • + *
  • collectType -> collect_type
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "collectResId": return "collect_res_id"; + case "collectInfoUri": return "collect_info_uri"; + case "collectTitle": return "collect_title"; + case "collectType": return "collect_type"; + case "userId": return "user_id"; + case "id": return "id"; + case "noteContent": return "noteContent"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • collect_res_id -> collectResId
    • + *
  • collect_info_uri -> collectInfoUri
    • + *
  • collect_title -> collectTitle
    • + *
  • collect_type -> collectType
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "collect_res_id": return "collectResId"; + case "collect_info_uri": return "collectInfoUri"; + case "collect_title": return "collectTitle"; + case "collect_type": return "collectType"; + case "user_id": return "userId"; + case "id": return "id"; + case "noteContent": return "noteContent"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getCollectResId() { + return this.collectResId; + } + + /** **/ + public void setCollectResId(String collectResId) { + this.collectResId = collectResId; + } + + /** **/ + public String getCollectInfoUri() { + return this.collectInfoUri; + } + + /** **/ + public void setCollectInfoUri(String collectInfoUri) { + this.collectInfoUri = collectInfoUri; + } + + /** **/ + public String getCollectTitle() { + return this.collectTitle; + } + + /** **/ + public void setCollectTitle(String collectTitle) { + this.collectTitle = collectTitle; + } + + /** **/ + public String getCollectType() { + return this.collectType; + } + + /** **/ + public void setCollectType(String collectType) { + this.collectType = collectType; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public List getNoteList() { + return noteList; + } + + public void setNoteList(List noteList) { + this.noteList = noteList; + } + + @Override + public String toString() { + return "PersonCollectEO{" + + "modifyTime=" + modifyTime + + ", creationTime=" + creationTime + + ", validFlag=" + validFlag + + ", collectResId='" + collectResId + '\'' + + ", collectInfoUri='" + collectInfoUri + '\'' + + ", collectTitle='" + collectTitle + '\'' + + ", collectType='" + collectType + '\'' + + ", userId='" + userId + '\'' + + ", id='" + id + '\'' + + ", noteList=" + noteList + + '}'; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonConfEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonConfEO.java new file mode 100644 index 00000000..2d673838 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonConfEO.java @@ -0,0 +1,163 @@ +package com.adc.da.person.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：TS_PERSON_CONF PersonConfEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonConfEO extends BaseEntity { + + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private Integer displaySeq; + private String moduleCode; + private String moduleName; + private String userId; + private String id; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • displaySeq -> display_seq
    • + *
  • moduleCode -> module_code
    • + *
  • moduleName -> module_name
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "displaySeq": return "display_seq"; + case "moduleCode": return "module_code"; + case "moduleName": return "module_name"; + case "userId": return "user_id"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • display_seq -> displaySeq
    • + *
  • module_code -> moduleCode
    • + *
  • module_name -> moduleName
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "display_seq": return "displaySeq"; + case "module_code": return "moduleCode"; + case "module_name": return "moduleName"; + case "user_id": return "userId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Integer getDisplaySeq() { + return this.displaySeq; + } + + /** **/ + public void setDisplaySeq(Integer displaySeq) { + this.displaySeq = displaySeq; + } + + /** **/ + public String getModuleCode() { + return this.moduleCode; + } + + /** **/ + public void setModuleCode(String moduleCode) { + this.moduleCode = moduleCode; + } + + /** **/ + public String getModuleName() { + return this.moduleName; + } + + /** **/ + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCookiesEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCookiesEO.java new file mode 100644 index 00000000..bca3e60a --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCookiesEO.java @@ -0,0 +1,188 @@ +package com.adc.da.person.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：TS_PERSON_COOKIES PersonCookiesEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonCookiesEO extends BaseEntity { + + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + + private Date creationTime; + private Integer validFlag; + private String resUri; + private String resId; + private String resTitle; + private String cookieType; + private String userId; + private String id; + //新增字段 + private String resCount; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • resUri -> res_uri
    • + *
  • resId -> res_id
    • + *
  • resTitle -> res_title
    • + *
  • cookieType -> cookie_type
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "resUri": return "res_uri"; + case "resId": return "res_id"; + case "resTitle": return "res_title"; + case "cookieType": return "cookie_type"; + case "userId": return "user_id"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • res_uri -> resUri
    • + *
  • res_id -> resId
    • + *
  • res_title -> resTitle
    • + *
  • cookie_type -> cookieType
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "res_uri": return "resUri"; + case "res_id": return "resId"; + case "res_title": return "resTitle"; + case "cookie_type": return "cookieType"; + case "user_id": return "userId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getResUri() { + return this.resUri; + } + + /** **/ + public void setResUri(String resUri) { + this.resUri = resUri; + } + + /** **/ + public String getResId() { + return this.resId; + } + + /** **/ + public void setResId(String resId) { + this.resId = resId; + } + + /** **/ + public String getResTitle() { + return this.resTitle; + } + + /** **/ + public void setResTitle(String resTitle) { + this.resTitle = resTitle; + } + + /** **/ + public String getCookieType() { + return this.cookieType; + } + + /** **/ + public void setCookieType(String cookieType) { + this.cookieType = cookieType; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public String getResCount() { + return resCount; + } + + public void setResCount(String resCount) { + this.resCount = resCount; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonMsgEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonMsgEO.java new file mode 100644 index 00000000..a155e078 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonMsgEO.java @@ -0,0 +1,191 @@ +package com.adc.da.person.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：TS_PERSON_MSG PersonMsgEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonMsgEO extends BaseEntity { + + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private Integer readFlag; + private String msgContent; + private String msgTitle; + private String userId; + private String id; + + // 发送预警判断是否出现在产品中时使用 + private String warningId; + private String warningType; + + // 与流程相关，流程编号 + private String processnum; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • readFlag -> read_flag
    • + *
  • msgContent -> msg_content
    • + *
  • msgTitle -> msg_title
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "readFlag": return "read_flag"; + case "msgContent": return "msg_content"; + case "msgTitle": return "msg_title"; + case "userId": return "user_id"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • read_flag -> readFlag
    • + *
  • msg_content -> msgContent
    • + *
  • msg_title -> msgTitle
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "read_flag": return "readFlag"; + case "msg_content": return "msgContent"; + case "msg_title": return "msgTitle"; + case "user_id": return "userId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Integer getReadFlag() { + return this.readFlag; + } + + /** **/ + public void setReadFlag(Integer readFlag) { + this.readFlag = readFlag; + } + + /** **/ + public String getMsgContent() { + return this.msgContent; + } + + /** **/ + public void setMsgContent(String msgContent) { + this.msgContent = msgContent; + } + + public String getMsgTitle() { + return msgTitle; + } + + public void setMsgTitle(String msgTitle) { + this.msgTitle = msgTitle; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public String getWarningId() { + return warningId; + } + + public void setWarningId(String warningId) { + this.warningId = warningId; + } + + public String getWarningType() { + return warningType; + } + + public void setWarningType(String warningType) { + this.warningType = warningType; + } + + public String getProcessnum() { + return processnum; + } + + public void setProcessnum(String processnum) { + this.processnum = processnum; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonNoteEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonNoteEO.java new file mode 100644 index 00000000..fe79d5f4 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonNoteEO.java @@ -0,0 +1,190 @@ +package com.adc.da.person.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：TS_PERSON_NOTE PersonNoteEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonNoteEO extends BaseEntity { + + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creartionTime; + private Integer validFlag; + private String noteContent; + private String resType; + private String resId; + private String collectId; + private String userId; + private String id; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creartionTime -> creartion_time
    • + *
  • validFlag -> valid_flag
    • + *
  • noteContent -> note_content
    • + *
  • resType -> res_type
    • + *
  • resId -> res_id
    • + *
  • collectId -> collect_id
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creartionTime": return "creartion_time"; + case "validFlag": return "valid_flag"; + case "noteContent": return "note_content"; + case "resType": return "res_type"; + case "resId": return "res_id"; + case "collectId": return "collect_id"; + case "userId": return "user_id"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creartion_time -> creartionTime
    • + *
  • valid_flag -> validFlag
    • + *
  • note_content -> noteContent
    • + *
  • res_type -> resType
    • + *
  • res_id -> resId
    • + *
  • collect_id -> collectId
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creartion_time": return "creartionTime"; + case "valid_flag": return "validFlag"; + case "note_content": return "noteContent"; + case "res_type": return "resType"; + case "res_id": return "resId"; + case "collect_id": return "collectId"; + case "user_id": return "userId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreartionTime() { + return this.creartionTime; + } + + /** **/ + public void setCreartionTime(Date creartionTime) { + this.creartionTime = creartionTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public String getNoteContent() { + return noteContent; + } + + public void setNoteContent(String noteContent) { + this.noteContent = noteContent; + } + + /** **/ + public String getResType() { + return this.resType; + } + + /** **/ + public void setResType(String resType) { + this.resType = resType; + } + + /** **/ + public String getResId() { + return this.resId; + } + + /** **/ + public void setResId(String resId) { + this.resId = resId; + } + + /** **/ + public String getCollectId() { + return this.collectId; + } + + /** **/ + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + @Override + public String toString() { + return "PersonNoteEO{" + + "modifyTime=" + modifyTime + + ", creartionTime=" + creartionTime + + ", validFlag=" + validFlag + + ", noteContent='" + noteContent + '\'' + + ", resType='" + resType + '\'' + + ", resId='" + resId + '\'' + + ", collectId='" + collectId + '\'' + + ", userId='" + userId + '\'' + + ", id='" + id + '\'' + + '}'; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonSearchEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonSearchEO.java new file mode 100644 index 00000000..6d4ab3df --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonSearchEO.java @@ -0,0 +1,131 @@ +package com.adc.da.person.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：TS_PERSON_SEARCH PersonSearchEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonSearchEO extends BaseEntity { + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private String searchContent; + private String userId; + private String id; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • searchContent -> search_content
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "searchContent": return "search_content"; + case "userId": return "user_id"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • search_content -> searchContent
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "search_content": return "searchContent"; + case "user_id": return "userId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getSearchContent() { + return this.searchContent; + } + + /** **/ + public void setSearchContent(String searchContent) { + this.searchContent = searchContent; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonShareEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonShareEO.java new file mode 100644 index 00000000..de3def17 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonShareEO.java @@ -0,0 +1,236 @@ +package com.adc.da.person.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：TS_PERSON_SHARE PersonShareEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonShareEO extends BaseEntity { + + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + + private Date creationTime; + private Integer validFlag; + private Integer fvalidFlag; + private Integer readFlag; + private String resTitle; + private String resUri; + private String resId; + + private String resType; + private String shareUserId; + private String recipientId; + private String id; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • readFlag -> read_flag
    • + *
  • resTitle -> res_title
    • + *
  • resUri -> res_uri
    • + *
  • resId -> res_id
    • + *
  • resType -> res_type
    • + *
  • shareUserId -> share_user_id
    • + *
  • recipientId -> recipient_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "readFlag": return "read_flag"; + case "resTitle": return "res_title"; + case "resUri": return "res_uri"; + case "resId": return "res_id"; + case "resType": return "res_type"; + case "shareUserId": return "share_user_id"; + case "recipientId": return "recipient_id"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • read_flag -> readFlag
    • + *
  • res_title -> resTitle
    • + *
  • res_uri -> resUri
    • + *
  • res_id -> resId
    • + *
  • res_type -> resType
    • + *
  • share_user_id -> shareUserId
    • + *
  • recipient_id -> recipientId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "read_flag": return "readFlag"; + case "res_title": return "resTitle"; + case "res_uri": return "resUri"; + case "res_id": return "resId"; + case "res_type": return "resType"; + case "share_user_id": return "shareUserId"; + case "recipient_id": return "recipientId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Integer getReadFlag() { + return this.readFlag; + } + + /** **/ + public void setReadFlag(Integer readFlag) { + this.readFlag = readFlag; + } + + /** **/ + public String getResTitle() { + return this.resTitle; + } + + /** **/ + public void setResTitle(String resTitle) { + this.resTitle = resTitle; + } + + /** **/ + public String getResUri() { + return this.resUri; + } + + /** **/ + public void setResUri(String resUri) { + this.resUri = resUri; + } + + /** **/ + public String getResId() { + return this.resId; + } + + /** **/ + public void setResId(String resId) { + this.resId = resId; + } + + /** **/ + public String getResType() { + return this.resType; + } + + /** **/ + public void setResType(String resType) { + this.resType = resType; + } + + /** **/ + public String getShareUserId() { + return this.shareUserId; + } + + /** **/ + public void setShareUserId(String shareUserId) { + this.shareUserId = shareUserId; + } + + /** **/ + public String getRecipientId() { + return this.recipientId; + } + + /** **/ + public void setRecipientId(String recipientId) { + this.recipientId = recipientId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public Integer getFvalidFlag() { + return fvalidFlag; + } + + public void setFvalidFlag(Integer fvalidFlag) { + this.fvalidFlag = fvalidFlag; + } + + @Override + public String toString() { + return "PersonShareEO{" + + "modifyTime=" + modifyTime + + ", creationTime=" + creationTime + + ", validFlag=" + validFlag + + ", fvalidFlag=" + fvalidFlag + + ", readFlag=" + readFlag + + ", resTitle='" + resTitle + '\'' + + ", resUri='" + resUri + '\'' + + ", resId='" + resId + '\'' + + ", resType='" + resType + '\'' + + ", shareUserId='" + shareUserId + '\'' + + ", recipientId='" + recipientId + '\'' + + ", id='" + id + '\'' + + '}'; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/page/PersonCollectEOPage.java b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonCollectEOPage.java new file mode 100644 index 00000000..f2ee78b6 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonCollectEOPage.java @@ -0,0 +1,226 @@ +package com.adc.da.person.page; + + +import com.adc.da.base.page.BasePage; + +import java.util.ArrayList; +import java.util.List; + +/** + * 功能：TS_PERSON_COLLECT PersonCollectEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonCollectEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "LIKE"; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "LIKE"; + private String validFlag; + private String validFlagOperator = "="; + private String collectResId; + private String collectResIdOperator = "LIKE"; + private String collectInfoUri; + private String collectInfoUriOperator = "LIKE"; + private String collectTitle; + private String collectTitleOperator = "LIKE"; + private String collectType; + private String collectTypeOperator = "LIKE"; + private String userId; + private String userIdOperator = "="; + private String id; + private String idOperator = "LIKE"; + + private List collectTypeList = new ArrayList<>(); + + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCollectResId() { + return this.collectResId; + } + + public void setCollectResId(String collectResId) { + this.collectResId = collectResId; + } + + public String getCollectResIdOperator() { + return this.collectResIdOperator; + } + + public void setCollectResIdOperator(String collectResIdOperator) { + this.collectResIdOperator = collectResIdOperator; + } + + public String getCollectInfoUri() { + return this.collectInfoUri; + } + + public void setCollectInfoUri(String collectInfoUri) { + this.collectInfoUri = collectInfoUri; + } + + public String getCollectInfoUriOperator() { + return this.collectInfoUriOperator; + } + + public void setCollectInfoUriOperator(String collectInfoUriOperator) { + this.collectInfoUriOperator = collectInfoUriOperator; + } + + public String getCollectTitle() { + return this.collectTitle; + } + + public void setCollectTitle(String collectTitle) { + this.collectTitle = collectTitle; + } + + public String getCollectTitleOperator() { + return this.collectTitleOperator; + } + + public void setCollectTitleOperator(String collectTitleOperator) { + this.collectTitleOperator = collectTitleOperator; + } + + public String getCollectType() { + return this.collectType; + } + + public void setCollectType(String collectType) { + this.collectType = collectType; + } + + public String getCollectTypeOperator() { + return this.collectTypeOperator; + } + + public void setCollectTypeOperator(String collectTypeOperator) { + this.collectTypeOperator = collectTypeOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public List getCollectTypeList() { + return collectTypeList; + } + + public void setCollectTypeList(List collectTypeList) { + this.collectTypeList = collectTypeList; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/page/PersonConfEOPage.java b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonConfEOPage.java new file mode 100644 index 00000000..ddd52ce2 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonConfEOPage.java @@ -0,0 +1,194 @@ +package com.adc.da.person.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_PERSON_CONF PersonConfEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonConfEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String displaySeq; + private String displaySeqOperator = "="; + private String moduleCode; + private String moduleCodeOperator = "="; + private String moduleName; + private String moduleNameOperator = "="; + private String userId; + private String userIdOperator = "="; + private String id; + private String idOperator = "="; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getDisplaySeq() { + return this.displaySeq; + } + + public void setDisplaySeq(String displaySeq) { + this.displaySeq = displaySeq; + } + + public String getDisplaySeqOperator() { + return this.displaySeqOperator; + } + + public void setDisplaySeqOperator(String displaySeqOperator) { + this.displaySeqOperator = displaySeqOperator; + } + + public String getModuleCode() { + return this.moduleCode; + } + + public void setModuleCode(String moduleCode) { + this.moduleCode = moduleCode; + } + + public String getModuleCodeOperator() { + return this.moduleCodeOperator; + } + + public void setModuleCodeOperator(String moduleCodeOperator) { + this.moduleCodeOperator = moduleCodeOperator; + } + + public String getModuleName() { + return this.moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + public String getModuleNameOperator() { + return this.moduleNameOperator; + } + + public void setModuleNameOperator(String moduleNameOperator) { + this.moduleNameOperator = moduleNameOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/page/PersonCookiesEOPage.java b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonCookiesEOPage.java new file mode 100644 index 00000000..03e9e6b5 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonCookiesEOPage.java @@ -0,0 +1,212 @@ +package com.adc.da.person.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_PERSON_COOKIES PersonCookiesEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonCookiesEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String resUri; + private String resUriOperator = "="; + private String resId; + private String resIdOperator = "="; + private String resTitle; + private String resTitleOperator = "="; + private String cookieType; + private String cookieTypeOperator = "="; + private String userId; + private String userIdOperator = "="; + private String id; + private String idOperator = "="; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getResUri() { + return this.resUri; + } + + public void setResUri(String resUri) { + this.resUri = resUri; + } + + public String getResUriOperator() { + return this.resUriOperator; + } + + public void setResUriOperator(String resUriOperator) { + this.resUriOperator = resUriOperator; + } + + public String getResId() { + return this.resId; + } + + public void setResId(String resId) { + this.resId = resId; + } + + public String getResIdOperator() { + return this.resIdOperator; + } + + public void setResIdOperator(String resIdOperator) { + this.resIdOperator = resIdOperator; + } + + public String getResTitle() { + return this.resTitle; + } + + public void setResTitle(String resTitle) { + this.resTitle = resTitle; + } + + public String getResTitleOperator() { + return this.resTitleOperator; + } + + public void setResTitleOperator(String resTitleOperator) { + this.resTitleOperator = resTitleOperator; + } + + public String getCookieType() { + return this.cookieType; + } + + public void setCookieType(String cookieType) { + this.cookieType = cookieType; + } + + public String getCookieTypeOperator() { + return this.cookieTypeOperator; + } + + public void setCookieTypeOperator(String cookieTypeOperator) { + this.cookieTypeOperator = cookieTypeOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/page/PersonMsgEOPage.java b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonMsgEOPage.java new file mode 100644 index 00000000..28d6dcc3 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonMsgEOPage.java @@ -0,0 +1,213 @@ +package com.adc.da.person.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_PERSON_MSG PersonMsgEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonMsgEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "LIKE"; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "LIKE"; + private String validFlag; + private String validFlagOperator = "="; + private String readFlag; + private String readFlagOperator = "LIKE"; + private String msgContent; + private String msgContentOperator = "LIKE"; + private String msgTitle; + private String msgTitleOperator = "LIKE"; + private String userId; + private String userIdOperator = "="; + private String id; + private String idOperator = "LIKE"; + + private String processnum; + private String processnumOperator = "="; + + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getReadFlag() { + return this.readFlag; + } + + public void setReadFlag(String readFlag) { + this.readFlag = readFlag; + } + + public String getReadFlagOperator() { + return this.readFlagOperator; + } + + public void setReadFlagOperator(String readFlagOperator) { + this.readFlagOperator = readFlagOperator; + } + + public String getMsgContent() { + return this.msgContent; + } + + public void setMsgContent(String msgContent) { + this.msgContent = msgContent; + } + + public String getMsgContentOperator() { + return this.msgContentOperator; + } + + public void setMsgContentOperator(String msgContentOperator) { + this.msgContentOperator = msgContentOperator; + } + + public String getMsgTitle() { + return this.msgTitle; + } + + public void setMsgTitle(String msgTitle) { + this.msgTitle = msgTitle; + } + + public String getMsgTitleOperator() { + return this.msgTitleOperator; + } + + public void setMsgTitleOperator(String msgTitleOperator) { + this.msgTitleOperator = msgTitleOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getProcessnum() { + return processnum; + } + + public void setProcessnum(String processnum) { + this.processnum = processnum; + } + + public String getProcessnumOperator() { + return processnumOperator; + } + + public void setProcessnumOperator(String processnumOperator) { + this.processnumOperator = processnumOperator; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/page/PersonNoteEOPage.java b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonNoteEOPage.java new file mode 100644 index 00000000..e4a2509c --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonNoteEOPage.java @@ -0,0 +1,212 @@ +package com.adc.da.person.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_PERSON_NOTE PersonNoteEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonNoteEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creartionTime; + private String creartionTime1; + private String creartionTime2; + private String creartionTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String noteContent; + private String noteContentOperator = "="; + private String resType; + private String resTypeOperator = "="; + private String resId; + private String resIdOperator = "="; + private String collectId; + private String collectIdOperator = "="; + private String userId; + private String userIdOperator = "="; + private String id; + private String idOperator = "="; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreartionTime() { + return this.creartionTime; + } + + public void setCreartionTime(String creartionTime) { + this.creartionTime = creartionTime; + } + + public String getCreartionTime1() { + return this.creartionTime1; + } + + public void setCreartionTime1(String creartionTime1) { + this.creartionTime1 = creartionTime1; + } + + public String getCreartionTime2() { + return this.creartionTime2; + } + + public void setCreartionTime2(String creartionTime2) { + this.creartionTime2 = creartionTime2; + } + + public String getCreartionTimeOperator() { + return this.creartionTimeOperator; + } + + public void setCreartionTimeOperator(String creartionTimeOperator) { + this.creartionTimeOperator = creartionTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getNoteContent() { + return this.noteContent; + } + + public void setNoteContent(String noteContent) { + this.noteContent = noteContent; + } + + public String getNoteContentOperator() { + return this.noteContentOperator; + } + + public void setNoteContentOperator(String noteContentOperator) { + this.noteContentOperator = noteContentOperator; + } + + public String getResType() { + return this.resType; + } + + public void setResType(String resType) { + this.resType = resType; + } + + public String getResTypeOperator() { + return this.resTypeOperator; + } + + public void setResTypeOperator(String resTypeOperator) { + this.resTypeOperator = resTypeOperator; + } + + public String getResId() { + return this.resId; + } + + public void setResId(String resId) { + this.resId = resId; + } + + public String getResIdOperator() { + return this.resIdOperator; + } + + public void setResIdOperator(String resIdOperator) { + this.resIdOperator = resIdOperator; + } + + public String getCollectId() { + return this.collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public String getCollectIdOperator() { + return this.collectIdOperator; + } + + public void setCollectIdOperator(String collectIdOperator) { + this.collectIdOperator = collectIdOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/page/PersonSearchEOPage.java b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonSearchEOPage.java new file mode 100644 index 00000000..882ae627 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonSearchEOPage.java @@ -0,0 +1,158 @@ +package com.adc.da.person.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_PERSON_SEARCH PersonSearchEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonSearchEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "LIKE"; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "LIKE"; + private String validFlag; + private String validFlagOperator = "LIKE"; + private String searchContent; + private String searchContentOperator = "LIKE"; + private String userId; + private String userIdOperator = "LIKE"; + private String id; + private String idOperator = "LIKE"; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getSearchContent() { + return this.searchContent; + } + + public void setSearchContent(String searchContent) { + this.searchContent = searchContent; + } + + public String getSearchContentOperator() { + return this.searchContentOperator; + } + + public void setSearchContentOperator(String searchContentOperator) { + this.searchContentOperator = searchContentOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/page/PersonShareEOPage.java b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonShareEOPage.java new file mode 100644 index 00000000..74c0021b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/page/PersonShareEOPage.java @@ -0,0 +1,265 @@ +package com.adc.da.person.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_PERSON_SHARE PersonShareEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class PersonShareEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "LIKE"; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "LIKE"; + private String validFlag; + private String validFlagOperator = "="; + private String fvalidFlag; + private String fvalidFlagOperator = "="; + private String readFlag; + private String readFlagOperator = "LIKE"; + private String resTitle; + private String resTitleOperator = "LIKE"; + private String resUri; + private String resUriOperator = "LIKE"; + private String resId; + private String resIdOperator = "LIKE"; + private String resType; + private String resTypeOperator = "LIKE"; + private String shareUserId; + private String shareUserIdOperator = "LIKE"; + private String recipientId; + private String recipientIdOperator = "="; + private String id; + private String idOperator = "LIKE"; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getReadFlag() { + return this.readFlag; + } + + public void setReadFlag(String readFlag) { + this.readFlag = readFlag; + } + + public String getReadFlagOperator() { + return this.readFlagOperator; + } + + public void setReadFlagOperator(String readFlagOperator) { + this.readFlagOperator = readFlagOperator; + } + + public String getResTitle() { + return this.resTitle; + } + + public void setResTitle(String resTitle) { + this.resTitle = resTitle; + } + + public String getResTitleOperator() { + return this.resTitleOperator; + } + + public void setResTitleOperator(String resTitleOperator) { + this.resTitleOperator = resTitleOperator; + } + + public String getResUri() { + return this.resUri; + } + + public void setResUri(String resUri) { + this.resUri = resUri; + } + + public String getResUriOperator() { + return this.resUriOperator; + } + + public void setResUriOperator(String resUriOperator) { + this.resUriOperator = resUriOperator; + } + + public String getResId() { + return this.resId; + } + + public void setResId(String resId) { + this.resId = resId; + } + + public String getResIdOperator() { + return this.resIdOperator; + } + + public void setResIdOperator(String resIdOperator) { + this.resIdOperator = resIdOperator; + } + + public String getResType() { + return this.resType; + } + + public void setResType(String resType) { + this.resType = resType; + } + + public String getResTypeOperator() { + return this.resTypeOperator; + } + + public void setResTypeOperator(String resTypeOperator) { + this.resTypeOperator = resTypeOperator; + } + + public String getShareUserId() { + return this.shareUserId; + } + + public void setShareUserId(String shareUserId) { + this.shareUserId = shareUserId; + } + + public String getShareUserIdOperator() { + return this.shareUserIdOperator; + } + + public void setShareUserIdOperator(String shareUserIdOperator) { + this.shareUserIdOperator = shareUserIdOperator; + } + + public String getRecipientId() { + return this.recipientId; + } + + public void setRecipientId(String recipientId) { + this.recipientId = recipientId; + } + + public String getRecipientIdOperator() { + return this.recipientIdOperator; + } + + public void setRecipientIdOperator(String recipientIdOperator) { + this.recipientIdOperator = recipientIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getFvalidFlag() { + return fvalidFlag; + } + + public void setFvalidFlag(String fvalidFlag) { + this.fvalidFlag = fvalidFlag; + } + + public String getFvalidFlagOperator() { + return fvalidFlagOperator; + } + + public void setFvalidFlagOperator(String fvalidFlagOperator) { + this.fvalidFlagOperator = fvalidFlagOperator; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java new file mode 100644 index 00000000..37ddc989 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java @@ -0,0 +1,21 @@ +package com.adc.da.person.service; + +import com.adc.da.person.entity.PersonCollectEO; +import com.adc.da.person.page.PersonCollectEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IPersonCollectEOService extends IService { + + public List queryByPage(PersonCollectEOPage page); + + public List queryByList(PersonCollectEOPage page); + + public List queryByPersonCollectPage(PersonCollectEOPage page); + + public String queryCollectByUserAndId(String collectResId); + + public int deleteByIdList(List idList); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonConfEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonConfEOService.java new file mode 100644 index 00000000..3bf183e5 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonConfEOService.java @@ -0,0 +1,29 @@ +package com.adc.da.person.service; + +import com.adc.da.person.entity.PersonConfEO; +import com.adc.da.person.page.PersonConfEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public interface IPersonConfEOService extends IService { + + public List queryByPage(PersonConfEOPage page); + + public List queryByList(PersonConfEOPage page); + + public PersonConfEO saveBean(PersonConfEO personConfEO); + + public PersonConfEO insert1(PersonConfEO personConfEO ); + + public List selectByUserid(String userId); + + public Map selectPersonConfByUserid(String userId); + + public String[] updatePersonConfList(String[] kes,String userId); + + public List saveConfList(String userId); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCookiesEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCookiesEOService.java new file mode 100644 index 00000000..1611fac7 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCookiesEOService.java @@ -0,0 +1,34 @@ +package com.adc.da.person.service; + +import com.adc.da.person.entity.PersonCookiesEO; +import com.adc.da.person.page.PersonCookiesEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IPersonCookiesEOService extends IService { + + public List queryByPage(PersonCookiesEOPage page); + + public List queryByList(PersonCookiesEOPage page); + + + public PersonCookiesEO saveBean(PersonCookiesEO personCookiesEO); + + public void delete(String id); + + public List queryByCookieType(String cookieType); + + public List queryByUserId(String userId); + + + public int updateByUserId(PersonCookiesEO personCookiesEO); + + public void updateByAll(PersonCookiesEO personCookiesEO); + + public int countPageCookie(PersonCookiesEO personCookiesEO); + + public int deleteByIdList(List idList); + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonMsgEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonMsgEOService.java new file mode 100644 index 00000000..2cd8495e --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonMsgEOService.java @@ -0,0 +1,24 @@ +package com.adc.da.person.service; + +import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.person.page.PersonMsgEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IPersonMsgEOService extends IService { + + public List queryByPage(PersonMsgEOPage page); + + public List queryByList(PersonMsgEOPage page); + + public PersonMsgEO selectByInfoId(String id); + + public int selectByNotRed(PersonMsgEOPage page); + + public void deleteByIdList(List idList); + + public void deletePersonMsgByIdList(List idList); + + public int markIsReadByBatch(List idList); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonNoteEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonNoteEOService.java new file mode 100644 index 00000000..3d96c656 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonNoteEOService.java @@ -0,0 +1,25 @@ +package com.adc.da.person.service; + +import com.adc.da.person.entity.PersonNoteEO; +import com.adc.da.person.page.PersonNoteEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IPersonNoteEOService extends IService { + + + public List queryByPage(PersonNoteEOPage page); + + public List queryByList(PersonNoteEOPage page); + + public PersonNoteEO saveBean(PersonNoteEO personNoteEO); + + public void updateBeanById(PersonNoteEO personNoteEO); + + public void delete(String id); + + public Integer updateByCollectId(PersonNoteEO personNoteEO); + + public List queryByCollectId(PersonNoteEO personNoteEO); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonSearchEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonSearchEOService.java new file mode 100644 index 00000000..2dba666e --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonSearchEOService.java @@ -0,0 +1,15 @@ +package com.adc.da.person.service; + +import com.adc.da.person.entity.PersonSearchEO; +import com.adc.da.person.page.PersonSearchEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IPersonSearchEOService extends IService { + + public List queryByPage(PersonSearchEOPage page); + + public List queryByList(PersonSearchEOPage page); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonShareEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonShareEOService.java new file mode 100644 index 00000000..53125c08 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonShareEOService.java @@ -0,0 +1,22 @@ +package com.adc.da.person.service; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonShareEO; +import com.adc.da.person.page.PersonShareEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IPersonShareEOService extends IService { + + public List queryByPage(PersonShareEOPage page); + + public int queryByCount(BasePage page); + + public List queryByList(PersonShareEOPage page); + + public void deleteByIdList(List idList); + + public void deleteByIdListForward(List idList); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java new file mode 100644 index 00000000..c8c256a4 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -0,0 +1,94 @@ +package com.adc.da.person.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.dao.PersonCollectEODao; +import com.adc.da.person.dao.PersonNoteEODao; +import com.adc.da.person.entity.PersonCollectEO; +import com.adc.da.person.entity.PersonNoteEO; +import com.adc.da.person.page.PersonCollectEOPage; +import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.util.LoginUserUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：TS_PERSON_COLLECT PersonCollectEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("personCollectEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class PersonCollectEOServiceImpl extends ServiceImpl implements IPersonCollectEOService { + + + + @Autowired + private PersonNoteEODao personNoteEODao; + + + @Override + public List queryByPage(PersonCollectEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(PersonCollectEOPage page) { + return this.baseMapper.queryByList(page); + } + + public List queryByPersonCollectPage(PersonCollectEOPage page){ + page.setValidFlag("0"); + int ire = this.baseMapper.queryByPersonCollectPageCount(page); + page.getPager().setRowCount(ire); + List list = this.baseMapper.queryByPersonCollectPage(page); + for(int i =0;i notelist = personNoteEODao.queryByCollectId(personNoteEO); + list.get(i).setNoteList(notelist); + } + return list; + } + + /** + * @Author yangxuenan + * @Description 根据当前登录人及资源id查询收藏信息 + * Date 2018/10/12 14:31 + * @Param [collectResId] + * @return com.adc.da.person.entity.PersonCollectEO + **/ + public String queryCollectByUserAndId(String collectResId) { + PersonCollectEOPage page = new PersonCollectEOPage(); + String userId = LoginUserUtil.getUserId(); + page.setCollectResId(collectResId); + page.setUserId(userId); + page.setValidFlag("0"); + List getCollects = this.baseMapper.queryByList(page); + String collectId = ""; + if(getCollects != null){ + if(getCollects.size()>0){ + collectId = getCollects.get(0).getId(); + } + } + return collectId; + } + + public int deleteByIdList(List idList){ + return this.baseMapper.deleteByIdList(idList); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonConfEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonConfEOServiceImpl.java new file mode 100644 index 00000000..f4810480 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonConfEOServiceImpl.java @@ -0,0 +1,214 @@ +package com.adc.da.person.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.dao.PersonConfEODao; +import com.adc.da.person.entity.PersonConfEO; +import com.adc.da.person.page.PersonConfEOPage; +import com.adc.da.person.service.IPersonConfEOService; +import com.adc.da.sys.constant.PersonModelEnum; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + + +/** + * + *
    + * 功能：TS_PERSON_CONF PersonConfEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("personConfEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class PersonConfEOServiceImpl extends ServiceImpl implements IPersonConfEOService { + + + @Override + public List queryByPage(PersonConfEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(PersonConfEOPage page) { + return this.baseMapper.queryByList(page); + } + + public PersonConfEO saveBean(PersonConfEO personConfEO){ + personConfEO.setCreationTime(new Date()); + personConfEO.setModifyTime(new Date()); + this.baseMapper.insert(personConfEO); + return personConfEO; + } + + public PersonConfEO insert1(PersonConfEO personConfEO ){ + if(personConfEO!=null){ + this.baseMapper.insert(personConfEO); + } + return personConfEO; + } + +// public List insertByList(PersonConfEO personConfEO){ +// if(CollectionUtils.isNotEmpty(personConfEO.)){ +// dao.updateByPrimaryKeySelective(personConfEO.getId()); +// for(){ +// +// } +// } +// return dao.insertByList(personConfEO); +// } + + +// public void updateById(PersonConfEO personConfEO){ +// personConfEO.setCreationTime(new Date()); +// personConfEO.setModifyTime(new Date()); +// dao.updateById(personConfEO); +// +// } + + +// public List selectByDisplay(){ +// return dao.selectByDisplay(); +// } + + +// public List deleteByIdList(String ids){ +// return dao.deleteByIdList(ids); +// } + + /** + * gaoyan + */ + public List selectByUserid(String userId){ + List list = this.baseMapper.selectByUserid(userId); + List listresult = new ArrayList<>(); + for(int i=0;i alllist = new ArrayList<>(); + for(PersonModelEnum type : PersonModelEnum.values()) { + HashMap map = new HashMap(); + map.put("label",type.getLable()); + map.put("key",type.getValue()); + if(type.getValue().equals(PersonModelEnum.PLATE.getValue())){ + map.put("disabled",true); + } else { + map.put("disabled",false); + } + alllist.add(map); + } + List listresult = new ArrayList<>(); + List list = this.baseMapper.selectByUserid(userId); + for(int i=0;i getPath(String code){ + String result = ""; + String name = ""; + if(code.equals(PersonModelEnum.COLLECT.getValue())){ + result= PersonModelEnum.COLLECT.getPath(); + name = PersonModelEnum.COLLECT.getLable(); + } else if(code.equals(PersonModelEnum.COOKIES.getValue())){ + result= PersonModelEnum.COOKIES.getPath(); + name = PersonModelEnum.COOKIES.getLable(); + }else if(code.equals(PersonModelEnum.MSG.getValue())){ + result= PersonModelEnum.MSG.getPath(); + name = PersonModelEnum.MSG.getLable(); + }else if(code.equals(PersonModelEnum.SHARE.getValue())){ + result= PersonModelEnum.SHARE.getPath(); + name = PersonModelEnum.SHARE.getLable(); + }else if(code.equals(PersonModelEnum.FEEDBACK.getValue())){ + result= PersonModelEnum.FEEDBACK.getPath(); + name = PersonModelEnum.FEEDBACK.getLable(); + }else if(code.equals(PersonModelEnum.INFO.getValue())){ + result= PersonModelEnum.INFO.getPath(); + name = PersonModelEnum.INFO.getLable(); + }else if(code.equals(PersonModelEnum.PLATE.getValue())){ + result= PersonModelEnum.PLATE.getPath(); + name = PersonModelEnum.PLATE.getLable(); + } + Map map = new HashMap(); + map.put("name",name); + map.put("path",result); + return map; + } + + /** + * gaoyan 个人登录后，个人板块修改 + * @param kes + * @param userId + * @return + */ + public String[] updatePersonConfList(String[] kes,String userId){ + PersonConfEO personConfEO = new PersonConfEO(); + List alllist = new ArrayList<>(); + for(PersonModelEnum type : PersonModelEnum.values()) { + alllist.add(type.getValue()); + } + for(int i=0;i saveConfList(String userId){ + List list = new ArrayList<>(); + int i=0; + for(PersonModelEnum type : PersonModelEnum.values()) { + PersonConfEO personConfEO = new PersonConfEO(); + personConfEO.setId(UUIDUtils.randomUUID20()); + personConfEO.setUserId(userId); + personConfEO.setValidFlag(0); + personConfEO.setModuleCode(type.getValue()); + personConfEO.setModuleName(type.getLable()); + personConfEO.setDisplaySeq(i++); + personConfEO.setModifyTime(new Date()); + personConfEO.setCreationTime(new Date()); + this.baseMapper.insert(personConfEO); + list.add(personConfEO); + } + return list; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCookiesEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCookiesEOServiceImpl.java new file mode 100644 index 00000000..24dc817c --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCookiesEOServiceImpl.java @@ -0,0 +1,89 @@ +package com.adc.da.person.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.dao.PersonCookiesEODao; +import com.adc.da.person.entity.PersonCookiesEO; +import com.adc.da.person.page.PersonCookiesEOPage; +import com.adc.da.person.service.IPersonCookiesEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + + +/** + * + *
    + * 功能：TS_PERSON_COOKIES PersonCookiesEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("personCookiesEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class PersonCookiesEOServiceImpl extends ServiceImpl implements IPersonCookiesEOService { + + + @Override + public List queryByPage(PersonCookiesEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(PersonCookiesEOPage page) { + return this.baseMapper.queryByList(page); + } + + public PersonCookiesEO saveBean(PersonCookiesEO personCookiesEO){ + personCookiesEO.setCreationTime(new Date()); + personCookiesEO.setModifyTime(new Date()); + this.baseMapper.insert(personCookiesEO); + return personCookiesEO; + } + + //删除个人浏览记录 + public void delete(String id){ + this.baseMapper.deleteById(id); + } + +// public void updateById(PersonCookiesEO personCookiesEO){ +// personCookiesEO.setCreationTime(new Date()); +// personCookiesEO.setModifyTime(new Date()); +// dao.updateByPrimaryKeySelective(personCookiesEO); +// } + + + public List queryByCookieType(String cookieType){ + return this.baseMapper.queryByCookieType(cookieType); + } + + public List queryByUserId(String userId){ + return this.baseMapper.queryByUserId(userId); + } + + public int updateByUserId(PersonCookiesEO personCookiesEO){ + return this.baseMapper.updateByUserId(personCookiesEO); + } + + //删除我的浏览所有记录 + public void updateByAll(PersonCookiesEO personCookiesEO){ + this.baseMapper.updateByAll(personCookiesEO); + } + + public int countPageCookie(PersonCookiesEO personCookiesEO){ + return this.baseMapper.countPageCookie(personCookiesEO); + } + + public int deleteByIdList(List idList){ + return this.baseMapper.deleteByIdList(idList); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonMsgEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonMsgEOServiceImpl.java new file mode 100644 index 00000000..75d83cfb --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonMsgEOServiceImpl.java @@ -0,0 +1,65 @@ +package com.adc.da.person.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.dao.PersonMsgEODao; +import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.person.page.PersonMsgEOPage; +import com.adc.da.person.service.IPersonMsgEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_MSG PersonMsgEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("personMsgEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class PersonMsgEOServiceImpl extends ServiceImpl implements IPersonMsgEOService { + + + @Override + public List queryByPage(PersonMsgEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(PersonMsgEOPage page) { + return this.baseMapper.queryByList(page); + } + + public PersonMsgEO selectByInfoId(String id){ + return this.baseMapper.selectByInfoId(id); + } + + //查询未读动态 + public int selectByNotRed(PersonMsgEOPage page){ + return this.baseMapper.selectByNotRed(page); + } + + public void deleteByIdList(List idList){ + this.baseMapper.deleteByIdList(idList); + } + + public void deletePersonMsgByIdList(List idList) { + this.baseMapper.deletePersonMsgByIdList(idList); + } + + public int markIsReadByBatch(List idList){ + return this.baseMapper.markIsReadByBatch(idList); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonNoteEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonNoteEOServiceImpl.java new file mode 100644 index 00000000..def49626 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonNoteEOServiceImpl.java @@ -0,0 +1,77 @@ +package com.adc.da.person.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.dao.PersonNoteEODao; +import com.adc.da.person.entity.PersonNoteEO; +import com.adc.da.person.page.PersonNoteEOPage; +import com.adc.da.person.service.IPersonNoteEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + + +/** + *
    + * 功能：TS_PERSON_NOTE PersonNoteEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("personNoteEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class PersonNoteEOServiceImpl extends ServiceImpl implements IPersonNoteEOService { + + @Override + public List queryByPage(PersonNoteEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(PersonNoteEOPage page) { + return this.baseMapper.queryByList(page); + } + + //刘寅楠 + public PersonNoteEO saveBean(PersonNoteEO personNoteEO) { + personNoteEO.setCreartionTime(new Date()); + personNoteEO.setModifyTime(new Date()); + this.baseMapper.insert(personNoteEO); + return personNoteEO; + } + + + public void updateBeanById(PersonNoteEO personNoteEO) { + personNoteEO.setCreartionTime(new Date()); + personNoteEO.setModifyTime(new Date()); + this.baseMapper.updateById(personNoteEO); + } + + + public void delete(String id) { + this.baseMapper.deleteById(id); + } + + + public Integer updateByCollectId(PersonNoteEO personNoteEO) { + personNoteEO.setModifyTime(new Date()); + return this.baseMapper.updateByCollectId(personNoteEO); + } + + + public List queryByCollectId(PersonNoteEO personNoteEO) { + + return this.baseMapper.queryByCollectId(personNoteEO); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonSearchEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonSearchEOServiceImpl.java new file mode 100644 index 00000000..f59b61f0 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonSearchEOServiceImpl.java @@ -0,0 +1,43 @@ +package com.adc.da.person.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.dao.PersonSearchEODao; +import com.adc.da.person.entity.PersonSearchEO; +import com.adc.da.person.page.PersonSearchEOPage; +import com.adc.da.person.service.IPersonSearchEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：TS_PERSON_SEARCH PersonSearchEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("personSearchEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class PersonSearchEOServiceImpl extends ServiceImpl implements IPersonSearchEOService { + + @Override + public List queryByPage(PersonSearchEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(PersonSearchEOPage page) { + return this.baseMapper.queryByList(page); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonShareEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonShareEOServiceImpl.java new file mode 100644 index 00000000..93008101 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonShareEOServiceImpl.java @@ -0,0 +1,51 @@ +package com.adc.da.person.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.dao.PersonShareEODao; +import com.adc.da.person.entity.PersonShareEO; +import com.adc.da.person.page.PersonShareEOPage; +import com.adc.da.person.service.IPersonShareEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * + *
    + * 功能：TS_PERSON_SHARE PersonShareEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("personShareEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class PersonShareEOServiceImpl extends ServiceImpl implements IPersonShareEOService { + + @Override + public List queryByPage(PersonShareEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(PersonShareEOPage page) { + return this.baseMapper.queryByList(page); + } + + public void deleteByIdList(List idList){ + this.baseMapper.deleteByIdList(idList); + } + + public void deleteByIdListForward(List idList){ + this.baseMapper.deleteByIdListForward(idList); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/constant/IsBelongEnum.java b/adc-da-sys/src/main/java/com/adc/da/sys/constant/IsBelongEnum.java new file mode 100644 index 00000000..b57b8cc5 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/constant/IsBelongEnum.java @@ -0,0 +1,22 @@ +package com.adc.da.sys.constant; + +public enum IsBelongEnum { + BELONG(1, "属于"); + + private int value; + private String label; + + IsBelongEnum(int value, String label) { + this.value = value; + this.label = label; + } + + public int getValue() { + return value; + } + + public String getLabel() { + return label; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/constant/PersonModelEnum.java b/adc-da-sys/src/main/java/com/adc/da/sys/constant/PersonModelEnum.java new file mode 100644 index 00000000..1e2fdc7a --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/constant/PersonModelEnum.java @@ -0,0 +1,31 @@ +package com.adc.da.sys.constant; + +public enum PersonModelEnum { + + INFO("INFO","个人信息","/info"), + PLATE("PLATE","个人板块","/plate"), + MSG("MSG","我的动态","/dynamics"), + COLLECT("COLLECT","我的收藏","/collection"), + SHARE("SHARE","我的推送","/push"), + COOKIES("COOKIES","我的浏览","/browsing"), + FEEDBACK("FEEDBACK","意见反馈","/feedback"); + + private String value; + private String lable; + private String path; + + private PersonModelEnum(String value, String lable, String path) { + this.value = value; + this.lable = lable; + this.path = path; + } + public String getValue() { + return value; + } + public String getLable() { + return lable; + } + public String getPath() { return path;} + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/constant/UserSourceEnum.java b/adc-da-sys/src/main/java/com/adc/da/sys/constant/UserSourceEnum.java new file mode 100644 index 00000000..3563b294 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/constant/UserSourceEnum.java @@ -0,0 +1,21 @@ +package com.adc.da.sys.constant; + +public enum UserSourceEnum { + + SSO_USER("SSO","SSO用户"),LOCAL_USER("LOCAL","本地用户"); + + private String value; + private String lable; + private UserSourceEnum(String value, String lable) { + this.value = value; + this.lable = lable; + } + public String getValue() { + return value; + } + public String getLable() { + return lable; + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/FeedbackInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/FeedbackInfoEOController.java new file mode 100644 index 00000000..c8c33204 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/FeedbackInfoEOController.java @@ -0,0 +1,143 @@ +package com.adc.da.sys.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.FeedbackInfoEO; +import com.adc.da.sys.page.FeedbackInfoEOPage; +import com.adc.da.sys.service.IFeedbackInfoEOService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + + +@RestController +@RequestMapping("/${restPath}/sys/feedbackInfo") +@Api(description = "|FeedbackInfoEO|") +public class FeedbackInfoEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(FeedbackInfoEOController.class); + + @Autowired + private IFeedbackInfoEOService feedbackInfoEOService; + + @ApiOperation(value = "|FeedbackInfoEO|意见反馈分页查找") + @GetMapping("/page") + /*@RequiresPermissions("sys:feedbackInfo:page")*/ + public ResponseMessage> page(FeedbackInfoEOPage page) throws Exception { + List rows = feedbackInfoEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|FeedbackInfoEO|当前登录人意见反馈分页查找") + @GetMapping("/pageSelf") + public ResponseMessage> pageSelf(FeedbackInfoEOPage page) throws Exception { + String selfId = LoginUserUtil.getUserId(); + page.setSelfId(selfId); + List rows = feedbackInfoEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|FeedbackInfoEO|查询") + @GetMapping("") +// @RequiresPermissions("sys:feedbackInfo:list") + public ResponseMessage> list(FeedbackInfoEOPage page) { + return Result.success(feedbackInfoEOService.queryByList(page)); + } + + @ApiOperation(value = "|FeedbackInfoEO|详情") + @GetMapping("/{id}") +// @RequiresPermissions("sys:feedbackInfo:get") + public ResponseMessage find(@PathVariable String id) { + return Result.success(feedbackInfoEOService.getById(id)); + } + + @ApiOperation(value = "|FeedbackInfoEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("sys:feedbackInfo:create") + public ResponseMessage create(@RequestBody FeedbackInfoEO feedbackInfoEO) throws Exception { + feedbackInfoEO.setId(UUIDUtils.randomUUID20()); + feedbackInfoEO.setCreationTime(new Date()); + feedbackInfoEO.setModifyTime(new Date()); + feedbackInfoEOService.save(feedbackInfoEO); + return Result.success(feedbackInfoEO); + } + + @ApiOperation(value = "|FeedbackInfoEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("sys:feedbackInfo:update") + public ResponseMessage update(@RequestBody FeedbackInfoEO feedbackInfoEO) throws Exception { + feedbackInfoEOService.updateById(feedbackInfoEO); + return Result.success(feedbackInfoEO); + } + + + + /** + * + * 功能描述: + * + * @auther: renxu + * @date: 2018/12/6 13:57 + */ + @ApiOperation(value = "|FeedbackInfoEO|删除") + @DeleteMapping("/del") +// @RequiresPermissions("sys:feedbackInfo:delete") + public ResponseMessage delete(String id) throws Exception { + feedbackInfoEOService.removeById(id); + return Result.success("1","删除成功",1); + } + /** + * + * 功能描述: 调用更新接口批量删除 + * + * @auther: renxu + * @date: 2018/12/6 13:57 + */ + @ApiOperation(value = "|SarTestItemEO|删除多条数据") + @DeleteMapping("/deleteArr") + // @RequiresPermissions("sys:feedbackInfo:deleteArr") + public ResponseMessage deleteArr(String ids) { + FeedbackInfoEOPage page = new FeedbackInfoEOPage(); + page.setIdlist(ids.split(",")); + feedbackInfoEOService.deleteByPrimaryKeyList(page); + return Result.success("1", "删除成功", 1); + } + + + + @ApiOperation(value = "保存功能") + @PostMapping("/save") +// @RequiresPermissions("sys:feedbackInfo:save") + public ResponseMessage insertFeedbackInfo(FeedbackInfoEO feedBackInfo) throws Exception { + String userId = LoginUserUtil.getUserId(); + FeedbackInfoEO feedbackInfoEO = new FeedbackInfoEO(); + feedbackInfoEO.setUserId(userId); + feedbackInfoEO.setId(UUIDUtils.randomUUID20()); + feedbackInfoEO.setFeedbackInfo(feedBackInfo.getFeedbackInfo()); + feedbackInfoEO.setValidFlag(0); + feedbackInfoEO.setModifyTime(new Date()); + feedbackInfoEO.setCreationTime(new Date()); + feedbackInfoEO.setContentText(feedBackInfo.getContentText()); + boolean result = feedbackInfoEOService.save(feedbackInfoEO); + if(!result){ + return Result.error("保存失败"); + } + return Result.success("true", "提交成功",feedbackInfoEO); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/LinkInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/LinkInfoEOController.java new file mode 100644 index 00000000..67ec504c --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/LinkInfoEOController.java @@ -0,0 +1,110 @@ +package com.adc.da.sys.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.LinkInfoEO; +import com.adc.da.sys.page.LinkInfoEOPage; +import com.adc.da.sys.service.ILinkInfoEOService; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("/${restPath}/sys/linkInfo") +@Api(description = "|LinkInfoEO|") +public class LinkInfoEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(LinkInfoEOController.class); + + @Autowired + private ILinkInfoEOService linkInfoEOService; + + @ApiOperation(value = "|LinkInfoEO|分页查询") + @GetMapping("/page") +// @RequiresPermissions("sys:linkInfo:page") + public ResponseMessage> page(LinkInfoEOPage page) throws Exception { + page.setOrderBy("display_seq asc,id"); + List rows = linkInfoEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|LinkInfoEO|查询") + @GetMapping("/getLinkList") +// @RequiresPermissions("sys:linkInfo:list") + public ResponseMessage> list(LinkInfoEOPage page) throws Exception { + page.setOrderBy("display_seq asc,id"); + List getList = linkInfoEOService.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for (LinkInfoEO linkInfoEO : getList) { + if (StringUtils.isEmpty(linkInfoEO.getNewWebSite())) { + linkInfoEO.setNewWebSite(linkInfoEO.getOldWebSite()); + } + } + } + return Result.success(getList); + } + + @ApiOperation(value = "|LinkInfoEO|详情") + @GetMapping("/{id}") + @RequiresPermissions("sys:linkInfo:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(linkInfoEOService.getById(id)); + } + + @ApiOperation(value = "|LinkInfoEO|新增") + @PostMapping("/addLinkInfo") +// @RequiresPermissions("sys:linkInfo:save") + public ResponseMessage create(@RequestBody LinkInfoEO linkInfoEO) throws Exception { + linkInfoEO.setId(UUIDUtils.randomUUID20()); + linkInfoEO.setValidFlag(0); + linkInfoEO.setCreationTime(new Date()); + linkInfoEO.setModifyTime(new Date()); + linkInfoEOService.save(linkInfoEO); + return Result.success("0","新增成功",linkInfoEO); + } + + @ApiOperation(value = "|LinkInfoEO|修改") + @PutMapping("updateLinkInfo") +// @RequiresPermissions("sys:linkInfo:update") + public ResponseMessage update(@RequestBody LinkInfoEO linkInfoEO) throws Exception { + linkInfoEO.setModifyTime(new Date()); + linkInfoEOService.updateById(linkInfoEO); + return Result.success("0","修改成功",linkInfoEO); + } + + @ApiOperation(value = "|LinkInfoEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("sys:linkInfo:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + linkInfoEOService.removeById(id); + logger.info("delete from TS_LINK_INFO where id = {}", id); + return Result.success(); + } + + @ApiOperation(value = "|LinkInfoEO|批量删除") + @PutMapping("deleteLinkInfo") +// @RequiresPermissions("sys:linkInfo:update") + public ResponseMessage deleteLinkInfo(String ids) throws Exception { + if (StringUtils.isNotEmpty(ids)) { + String[] idArr = ids.split(","); + List idList = Arrays.asList(idArr); + linkInfoEOService.deleteByIds(idList); + return Result.success("0","删除成功",null); + } else { + return Result.error("删除失败"); + } + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/LoginInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/LoginInfoEOController.java new file mode 100644 index 00000000..62686b53 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/LoginInfoEOController.java @@ -0,0 +1,30 @@ +package com.adc.da.sys.controller; + +import com.adc.da.sys.service.ILoginInfoEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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; + +/** + * @Auther: renxu + * @Date: 2018/10/25 20:47 + * @Description: + */ +@RestController +@Api(description="LoginInfoEO") +@RequestMapping("/${restPath}/sys/loginInfoEO") +public class LoginInfoEOController { + @Autowired + ILoginInfoEOService loginInfoEOService; + + @ApiOperation(value = "|Login|计数") + @GetMapping("/count") + public int count(){ + + return loginInfoEOService.count(); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java new file mode 100644 index 00000000..f0ba2844 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java @@ -0,0 +1,164 @@ +package com.adc.da.sys.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.MenuEO; +import com.adc.da.sys.page.MenuEOPage; +import com.adc.da.sys.service.IMenuEOService; +import com.adc.da.sys.vo.MenuVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/sys/menu") +@Api(description = "菜单管理") +public class MenuEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(MenuEOController.class); + + @Autowired + private IMenuEOService menuEOService; + + + @ApiOperation(value = "|MenuEO|详情") + @GetMapping("/{id}") +// @RequiresPermissions("sys:menu:get") + public ResponseMessage find(@NotNull @PathVariable("id") String id) throws Exception { + return Result.success(BeanUtil.toBean(menuEOService.getById(id), MenuVO.class)); + } + + @ApiOperation(value = "|MenuEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("sys:menu:save") + public ResponseMessage create(@RequestBody MenuVO menuVO) throws Exception { + MenuEO menuEO = menuEOService.insertMenu(BeanUtil.toBean(menuVO,MenuEO.class)); + return Result.success(BeanUtil.toBean(menuEO,MenuVO.class)); + } + + @ApiOperation(value = "|MenuEO|列表 --> 角色对应的菜单") + @GetMapping + /*@RequiresPermissions("sys:menu:list")*/ + public ResponseMessage> list(String roleId) { + List menuVOs=new ArrayList<>(); + List menuEOS = menuEOService.findAll(); + if(menuEOS!=null && !menuEOS.isEmpty()){ + for(MenuEO source:menuEOS){ + menuVOs.add(BeanUtil.toBean(source,MenuVO.class)); + } + } + if(roleId != null && !"".equals(roleId)){ + for (MenuVO menuVO: menuVOs) { + if(menuEOService.isBelong(roleId, menuVO.getId())){ +// 这个字段已经修改 +// menuVO.setBelong(IsBelongEnum.BELONG.getValue()); + menuVO.setChecked(true); + }else{ + menuVO.setChecked(false); + } + } + } + return Result.success(menuVOs); + } + + @ApiOperation(value = "|MenuEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("sys:menu:update") + public ResponseMessage update(@RequestBody MenuVO menuVO) throws Exception { + menuEOService.updateMenu(menuVO); + return Result.success(menuVO); + } + + @ApiOperation(value = "|MenuEO|删除") + @DeleteMapping("/{ids}") +// @RequiresPermissions("sys:menu:delete") + public ResponseMessage delete(@NotNull @PathVariable("ids") String[] ids) throws Exception { + menuEOService.delete(ids); + logger.info("log===>delete from TS_MENU where ids = {}", ids); + return Result.success(); + } + + @ApiOperation(value = "用户菜单列表|MenuEO|") + @GetMapping("/listMenuByUserId/{userId}") +// @RequiresPermissions("sys:menu:listMenuByUserId") + public ResponseMessage> listMenuByUserId(@NotNull @PathVariable("userId") String userId) { + List resultList=new ArrayList<>(); + List menuEOS = menuEOService.listMenuEOByUserId(userId); + if(menuEOS!=null && !menuEOS.isEmpty()){ + for(MenuEO source:menuEOS){ + resultList.add(BeanUtil.toBean(source,MenuVO.class)); + } + } + return Result.success(resultList); + } + + + + @ApiOperation(value = "|MenuEO|查询全部权限菜单") + @GetMapping("/listAllMenu") + /*@RequiresPermissions("sys:menu:list")*/ + public ResponseMessage> listAllMenu(MenuEOPage page) throws Exception { + page.setValidFlag("0"); + page.setOrderBy("is_show,id"); + List getList = menuEOService.queryByAllMenu(page); + return Result.success(getList); + } + + @ApiOperation(value = "|MenuEO|新增") + @PostMapping("/addMenu") + public ResponseMessage addMenu(MenuEO menuEO) throws Exception { + return Result.success("0","新增成功",menuEOService.creatMenu(menuEO)); + } + + @ApiOperation(value = "|MenuEO|修改") + @PutMapping("/updateMenu") + public ResponseMessage updateMenu(MenuEO menuEO) throws Exception { + menuEO.setModifyTime(new Date()); + boolean countUpdate = menuEOService.updateById(menuEO); + if(countUpdate){ + return Result.success("0","修改成功",menuEO); + } else { + return Result.error("修改失败"); + } + } + + @ApiOperation(value = "|MenuEO|删除") + @PutMapping("/deleteMenuById") + /*@RequiresPermissions("lawss:sarMenu:delete")*/ + public ResponseMessage deleteMenuById(String id) throws Exception { + MenuEO menuEO = new MenuEO(); + menuEO.setId(id); + menuEO.setValidFlag(1); + boolean countSuc = menuEOService.updateById(menuEO); + if (countSuc) { + return Result.success("0","删除成功",menuEO); + } else { + return Result.error("删除失败"); + } + + } + + @ApiOperation(value = "|MenuEO|判断是否包含子节点") + @GetMapping("/judgeContentChild") + /*@RequiresPermissions("sys:menu:list")*/ + public ResponseMessage> judgeContentChild(String id) throws Exception { + MenuEOPage page = new MenuEOPage(); + page.setParentId(id); + page.setValidFlag("0"); + List getList = menuEOService.queryByAllMenu(page); + return Result.success(getList); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEORestController.java new file mode 100644 index 00000000..11876aaf --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEORestController.java @@ -0,0 +1,352 @@ +package com.adc.da.sys.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.OrgEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.page.OrgEOPage; +import com.adc.da.sys.service.IOrgEOService; +import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.vo.OrgVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/sys/org") +@Api(description = "组织机构管理") +public class OrgEORestController extends BaseController { + private static final Logger logger = LoggerFactory.getLogger(OrgEORestController.class); + + @Autowired + private IOrgEOService orgEOService; + @Autowired + private IUserEOService userEOService; + + /** + * @Author liwenxuan + * @Description 需求可能会变成分页查找+模糊查找（根据类型/用户名称/角色名称/用户状态） + * @Date Administrator 2018/9/17 + * @Param [orgName] + * @return com.adc.da.util.http.ResponseMessage> + **/ + @ApiOperation(value = "组织机构列表|OrgEO|") + @GetMapping("/listOrgByOrgName") +// @RequiresPermissions("sys:org:listMenuByUserId") + public ResponseMessage> listOrgByOrgName(String orgName) { + List orgEOS = orgEOService.listOrgEOByOrgName(orgName); + List result =new ArrayList<>(); + if(orgEOS!=null && !orgEOS.isEmpty()){ + for(OrgEO source:orgEOS){ + result.add(BeanUtil.toBean(source,OrgVO.class)); + } + } + return Result.success(result); + } + + /** + * @Author liwenxuan + * @Description 新增组织机构（入参：部门名称+部门简介+部门表述(不必须填写)） + * 注：判斷條件在前台設置 + * 1.判断部门简称不能为空，不能已经存在 + * 2.先判断返回对象不为空，然后在进行判断shotname + * @Date Administrator 2018/9/17 + * @Param [orgVO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @SuppressWarnings("unchecked") + @ApiOperation(value = "|OrgEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("sys:org:create") + public ResponseMessage create(@RequestBody OrgVO orgVO) throws Exception { + + return orgEOService.saveBean(BeanUtil.toBean(orgVO,OrgEO.class)); + + } + + + /** + * @Author liwenxuan + * @Description 修改组织机构（前台需要传入id） + * @Date Administrator 2018/9/17 + * @Param [orgVO] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("sys:org:update") + public ResponseMessage update(@RequestBody OrgVO orgVO) throws Exception { + + return orgEOService.updateBeanById(BeanUtil.toBean(orgVO,OrgEO.class)); + } + /** + * @Author liwenxuan + * @Description //详情，根据id查询组织机构 + * @Date Administrator 2018/9/17 + * @Param [id] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|详情") + @GetMapping("/{id}") +// @RequiresPermissions("sys:org:get") + public ResponseMessage getById(@NotNull @PathVariable("id") String id) throws Exception { + OrgVO orgVO = BeanUtil.toBean(orgEOService.getOrgEOById(id), OrgVO.class); + return Result.success(orgVO); + } + + /** + * @Author liwenxuan + * @Description 删除组织机构 + * 1.当前组织结构下面有子节点不可以删除（逻辑在service里面） + * @Date Administrator 2018/9/17 + * @Param [id] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|删除") + @DeleteMapping("") + @RequiresPermissions("sys:org:delete") + public ResponseMessage delete( String id) throws Exception { + return orgEOService.delete(id); + } + + + @ApiOperation(value = "|OrgEO|获取所有树结构") + @GetMapping("/getTree") +// @RequiresPermissions("sys:org:getTree") + public ResponseMessage> getTree(){ + List eos = orgEOService.selectOrgAllNode(); + return Result.success(eos); + } + + @ApiOperation(value = "|OrgEO|根据传入的orgId获取下层的部门树结构") + @GetMapping("/getChildDept") +// @RequiresPermissions("sys:org:getTree") + public ResponseMessage> getChildDept(String orgId){ + List eos = orgEOService.getChildDept(orgId); + return Result.success(eos); + } + + /** + * @Author liwenxuan + * @Description 删除指定用户的单个组织机构关联 + * @Date Administrator 2018/9/18 + * @Param [userId, orgId] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|删除组织机构下的用户关联") + @DeleteMapping("/{userId}/{orgId}") +// @RequiresPermissions("sys:org:delOrgOfUser") + public ResponseMessage delOrgRelatedUser(@NotNull @PathVariable("userId") String userId, @NotNull @PathVariable("orgId") String orgId){ + return orgEOService.delOrgRelatedUser(userId, orgId); + } + + + /** + * @Author liwenxuan + * @Description 前台传入类型(格式)：[{"userId":"QJX2Z8E678","orgId":"5W2J4AQ8KA"}] + * @Date Administrator 2018/9/17 + * @Param [userOrgs] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|给用户设置组织机构") + @PostMapping("/addOrgRelateUsers") + @RequiresPermissions("sys:org:addOrgRelateUsers") + public ResponseMessage addOrgRelatedUser(String userOrgs){ + + return orgEOService.addOrgRelatedUser(userOrgs); + } + + /** + * @Author liwenxuan + * @Description 传入字段是用户表id的String字符串中间用逗号隔开 + * 1.删除的是用户和组织机构表中的数据（是真删除，关系表中没有validflag字段） + * @Date Administrator 2018/9/18 + * @Param [ids] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|批量删除组织机构下的一些用户") + @DeleteMapping("/deleteList/{idList}") + @RequiresPermissions("sys:org:delOrgRelatedUsers") + public ResponseMessage delOrgRelatedUsers(@NotNull @PathVariable("idList") String ids){ + String[] idList=ids.split(","); + if(idList!=null && idList.length>0){ + for(String id:idList){ + orgEOService.delOrgRelatedUserByUserId(id); + } + return Result.success("true","删除成功",1); + } + return Result.error("false","删除失败"); + } + /** + * @Author liwenxuan + * @Description 传入的参数是根节点的id和orgName + * @Date Administrator 2018/9/18 + * @Param [id, userCorpName] + * @return com.adc.da.util.http.ResponseMessage> + **/ + @ApiOperation(value = "|OrgEO|获取树结构") + @GetMapping("/findById") +// @RequiresPermissions("sys:org:findById") + public ResponseMessage> findById(String id, String orgName){ + List eos = orgEOService.findById(id, orgName); +// eos.addAll(eos); 此方法是把两个list合并到一起 + return Result.success(eos); + } + /** + * @Author liwenxuan + * @Description //根据角色名称获取组织机构用户树 + * @Date Administrator 2018/10/25 + * @Param [roleName] + * @return com.adc.da.util.http.ResponseMessage> + **/ + @ApiOperation(value = "|OrgEO|根据角色名称获取组织机构用户树") + @GetMapping("/getTreeByRole") + // @RequiresPermissions("sys:org:getTreeByRole") + public ResponseMessage> getTreeByRole(String roleName){ + Map> map = new HashMap<>(); + //String[] split = roleName.split(","); + //for(int i=0;i treeByRole = orgEOService.getTreeByRole(roleName); + //map.put(i,treeByRole); + //} + return Result.success("true","操作成功",treeByRole); + } + /** + * @Author liwenxuan + * @Description //根据用户获取其所在组织结构下某个角色的用户 + * @Date Administrator 2018/10/25 + * @Param [orgType, roleName] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|根据用户获取其所在组织结构下部门负责人或者科级负责人") + @GetMapping("/getLeaderByUserId") + public ResponseMessage getLeaderByUserId(String userId,String orgType,String roleName){ + List leaderByUserId = orgEOService.getLeaderByUserId(userId,orgType, roleName); + if(leaderByUserId==null || leaderByUserId.size() == 0){ + return Result.success("","此用户未分配组织机构或未获取当前用户所在组织机构的领导id",new OrgEO()); + }else if(leaderByUserId != null && leaderByUserId.size()>1){ + return Result.error("false","此部门或科级存在多个负责人",new OrgEO()); + } + return Result.success("true","操作成功",leaderByUserId.get(0)); + } + /** + * @Author liwenxuan + * @Description //根据角色名称和部门id获取组织结构用户树 + * @Date Administrator 2018/10/25 + * @Param [roleName, orgId] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|根据角色名称和部门id获取组织结构用户树") + @GetMapping("/getTreeByRoleAndOrgId") + public ResponseMessage> getTreeByRoleAndOrgId(String roleName,String orgId){ + List treeByRoleAndOrgId = orgEOService.getTreeByRoleAndOrgId(roleName, orgId); + if(treeByRoleAndOrgId == null){ + return Result.success("true","此部门下没有项目经理",treeByRoleAndOrgId); + } + return Result.success("true","操作成功",treeByRoleAndOrgId); + } + + /** + * @Author liwenxuan + * @Description //流程3：根据角色名称和部门id获取组织结构用户树 + * @Date Administrator 2018/10/25 + * @Param [roleName, orgId] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|OrgEO|流程3：根据角色名称和userId获取组织结构用户树") + @GetMapping("/getTreeByRoleAndOrgIdProcess3") + public ResponseMessage> getTreeByRoleAndOrgIdProcess3(String userId,String roleName){ + //根据用户ID获取用户信息及角色、组织机构信息 + UserEO userWithRoles = userEOService.getUserWithRoles(userId); + //判断此用户是否有对应的组织机构 + if(userWithRoles ==null || userWithRoles.getOrgEOList().size()==0){ + return Result.success("true","此用户没有对应的组织结构",null); + } + //根据角色名称和部门id获取组织结构用户树 + List treeByRoleAndOrgId = orgEOService.getTreeByRoleAndOrgId3(roleName, userWithRoles); + if(treeByRoleAndOrgId == null){ + return Result.success("true","没有此id对应的组织机构",treeByRoleAndOrgId); + } + return Result.success("true","操作成功",treeByRoleAndOrgId); + } + /** + * @Author liwenxuan + * @Description //根据orgType查询查询部及以上组织结构 + * @Date Administrator 2018/11/1 + * @Param [] + * @return java.util.List + **/ + @ApiOperation(value = "|OrgEO|根据orgType查询查询部及以上组织结构") + @GetMapping("/getIdsByorgType") + public ResponseMessage> getIdsByorgType(){ + List list = orgEOService.getIdsByorgType(); + return Result.success(list); + } + @ApiOperation(value = "|OrgEO|根据角色名称和部门id获取用户树") + @GetMapping("/getTreeByRoleAndOrgId1") + public ResponseMessage> getTreeByRoleAndOrgId1(OrgEOPage orgEOPage){ + List treeByRoleAndOrgId1 = orgEOService.getTreeByRoleAndOrgId1(orgEOPage.getRoleName(), orgEOPage.getOrgId()); + + if(treeByRoleAndOrgId1== null || treeByRoleAndOrgId1.isEmpty()){ + return Result.success(getPageInfo(orgEOPage.getPager(), treeByRoleAndOrgId1)); + } + List list = new ArrayList(); + //yuzhong 流程过来的要全展示 + if(!"1".equals(orgEOPage.getProcessFlag())) { + int pageNo = (orgEOPage.getPage() - 1) * orgEOPage.getPageSize(); //每页的起始索引 + Integer sum = treeByRoleAndOrgId1.size(); //记录总数 + orgEOPage.getPager().setRowCount(sum); + if (pageNo + orgEOPage.getPageSize() > sum) { + list = treeByRoleAndOrgId1.subList(pageNo, sum); + } else { + list = treeByRoleAndOrgId1.subList(pageNo, pageNo + orgEOPage.getPageSize()); + } + }else{ + list = treeByRoleAndOrgId1; + } + return Result.success(getPageInfo(orgEOPage.getPager(), list)); + } + + + @ApiOperation(value = "(流程4)根据角色名称和部门id获取人员") + @GetMapping("/getManagerByOrgId") + public ResponseMessage> getManagerByOrgId(String roleName,String orgId){ + List orgEOList = orgEOService.getManagerByOrgId(roleName,orgId); + return Result.success(orgEOList); + } + + @ApiOperation(value = "根据角色id获取组织机构用户树") + @GetMapping("/getTreeByRoleId") + public ResponseMessage> getTreeByRoleId(String roleId){ + Map> map = new HashMap<>(); + List treeByRole = orgEOService.getTreeByRole2(roleId); + return Result.success(treeByRole); + } + + @ApiOperation(value = "|OrgEO|获取子公司结构") + @GetMapping("/getOrgRootTree") +// @RequiresPermissions("sys:org:getTree") + public ResponseMessage> getOrgRootTree()throws Exception{ + + + List list = orgEOService.getOrgRootTree(); + return Result.success(list); + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java new file mode 100644 index 00000000..6012f1b3 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java @@ -0,0 +1,294 @@ +package com.adc.da.sys.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.adc.da.base.page.Pager; +import com.adc.da.base.web.BaseController; +import com.adc.da.common.ValidFlagEnum; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.constant.IsBelongEnum; +import com.adc.da.sys.entity.RoleEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserRoleEO; +import com.adc.da.sys.page.RoleEOPage; +import com.adc.da.sys.service.IRoleEOService; +import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.vo.RoleVO; +import com.adc.da.util.LoginUserUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/sys/role") +@Api(description = "角色管理") +public class RoleEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(RoleEOController.class); + + @Autowired + private IRoleEOService roleEOService; + + @Autowired + private IUserEOService userService; + + @ApiOperation(value = "|RoleEO|分页查询") + @GetMapping("/page") +// @RequiresPermissions("sys:role:page") + public ResponseMessage> page(Integer pageNo, Integer pageSize, String roleName, String useFlag, String roleType) throws Exception { + RoleEOPage page = new RoleEOPage(); + if (pageNo != null) { + page.setPage(pageNo); + } + if (pageSize != null) { + page.setPageSize(pageSize); + } + if (StringUtils.isNotEmpty(roleName)) { + page.setName("%"+roleName+"%"); + page.setNameOperator("LIKE"); + } + if(StringUtils.isNotEmpty(useFlag)){ + page.setUseFlag(useFlag); + } + if(StringUtils.isNotEmpty(roleType)){ + page.setRoleType(roleType); + } + + page.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()+""); + page.setPager(new Pager()); + page.setOrderBy("modify_time desc"); + List rows = roleEOService.queryByPage(page); + //此处加载用户名称到前台 + if(rows!=null && rows.size()>0){ + for(RoleEO role:rows){ + String userId = role.getOperUser(); + if(userId!=null && !userId.isEmpty()){ + UserEO user = userService.selectByPrimaryKey(userId); + role.setOperUserName(user!=null?user.getUname():null); + } + } + } +// PageInfo mapPage = beanMapper.mapPage(getPageInfo(page.getPager(), rows), RoleVO.class); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|RoleEO|详情") + @GetMapping("/{id}") +// @RequiresPermissions("sys:role:get") + public ResponseMessage getById(@NotNull @PathVariable("id") String id) throws Exception { + RoleEO roleEO = roleEOService.getRoleWithMenus(id); + return Result.success(BeanUtil.toBean(roleEO, RoleVO.class)); + } + + @ApiOperation(value = "|RoleEO|列表") + @GetMapping("") + //@RequiresPermissions("sys:role:list") + public ResponseMessage> list(String userId) { + RoleVO setRole = new RoleVO(); + setRole.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + List roleEOList = roleEOService.findAll(setRole); + List resultList =new ArrayList<>(); + if(roleEOList!=null && !roleEOList.isEmpty()){ + for(RoleEO source:roleEOList){ + RoleVO roleVO = BeanUtil.toBean(source, RoleVO.class); + roleVO.setMenusstr(source.getMenuEOIdList()); + roleVO.setMenus(source.getMenuEOList()); + resultList.add(roleVO); + } + } + if (userId != null) { + for (RoleVO roleVO : resultList) { + if (roleEOService.isBelong(userId, roleVO.getRid())) { + roleVO.setBelong(IsBelongEnum.BELONG.getValue()); + } + } + } + return Result.success(resultList); + } + + @ApiOperation(value = "|RoleEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("sys:role:create") + public ResponseMessage create(@RequestBody RoleVO roleVO) throws Exception { + //TODO 此处调用了登录接口数据 暂时注销 + roleVO.setOprUser(LoginUserUtil.getUserId()); + if(StringUtils.isEmpty(roleVO.getName())){ + return Result.error("角色名称不能为空"); + } + RoleEO map = BeanUtil.toBean(roleVO, RoleEO.class); + logger.info("获取角色相关信息:"+map.getName()); + //判断角色名称不能重复，返回0代表角色名称已经存在,否则进行插入操作返回1 + int i = roleEOService.saveBean(map); + if(i<=0){ + return Result.error("角色名称已经存在"); + } + return Result.success("","新增成功",1); + } + + @ApiOperation(value = "|RoleEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("sys:role:update") + public ResponseMessage update(@RequestBody RoleVO roleVO) throws Exception { + if(StringUtils.isEmpty(roleVO.getName())){ + return Result.error("角色名称不能为空"); + } + RoleEO map = BeanUtil.toBean(roleVO, RoleEO.class); + //判断角色名称不能重复，返回0代表角色名称已经存在,否则进行修改操作返回1 + int i = roleEOService.updateByPrimaryKeySelective(map); + if(i<=0){ + return Result.error("角色名称已经存在"); + } + return Result.success("","操作成功",1); + + } + + @ApiOperation(value = "|RoleEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("sys:role:delete") + public ResponseMessage delete(@NotNull @PathVariable("id") String id) throws Exception { + List list = roleEOService.getUserRoleListByRoleId(id); + // 如果角色有对应用户，则不允许删除 + if (list != null && list.size() > 0) { + return Result.error( "该角色有对应用户，不能删除"); + } + roleEOService.delete(id); + return Result.success("true","操作成功",""); + } + /** + * @Author liwenxuan + * @Description 入参格式修改了，TODO 暂时注掉了中间那段代码 + * @Date Administrator 2018/9/24 + * @Param [ids] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|RoleEO|批量删除") + @DeleteMapping("/deleteList") + @RequiresPermissions("sys:role:deleteList") + public ResponseMessage deleteList( String ids) throws Exception { + String[] idList=ids.split(","); + String saveOrignRoles = ""; + String saveUserRoles = ""; + if(idList!=null && idList.length>0){ + for(String id:idList){ + //原始角色不能删除:orgId查询defaultFlag + RoleEO roleWithMenus = roleEOService.getRoleWithMenus(id); + List list = roleEOService.getUserRoleListByRoleId(id); + // 如果角色有对应用户，则不允许删除 + if(roleWithMenus !=null && roleWithMenus.getIsDefault().equals(1)){ + saveOrignRoles += roleWithMenus.getName() + " "; + } else if (list != null && list.size() > 0) { + saveUserRoles += roleWithMenus.getName() + " "; + } else { + roleEOService.delete(id); + } + /* String loginUserId = SecurityUtils.getSubject().getSession().getAttribute(RequestUtils.LOGIN_USER_ID).toString(); + if(loginUserId != null || loginUserId != ""){ + UserEO getUser = userService.selectRoleMessageByPrimaryKey(loginUserId); + *//*if(getUser != null && ! ("3").equals(getUser.getRoleExtInfo())){ + RoleEO getRole = roleEOService.selectByPrimaryKey(id); + if(!("").equals(getRole.getExtInfo()) && getRole.getExtInfo() != null){ + if(! getRole.getExtInfo().equals(getUser.getRoleExtInfo())){ + return Result.error("您无权限删除该角色"); + } + } + + }*//* + }*/ + } + } + if(StringUtils.isEmpty(saveOrignRoles) && StringUtils.isEmpty(saveUserRoles)){ + return Result.success("true","删除成功",""); + } else { + String msg = ""; + if(StringUtils.isNotEmpty(saveOrignRoles) && StringUtils.isEmpty(saveUserRoles)){ + msg = saveOrignRoles + "为原始角色，不能删除。其余删除成功"; + } else if (StringUtils.isEmpty(saveOrignRoles) && StringUtils.isNotEmpty(saveUserRoles)) { + msg = saveUserRoles + "下有对应用户，不能删除。其余删除成功"; + }else{ + msg = saveOrignRoles + "为原始角色，不能删除。"+ saveUserRoles + "下有对应用户，不能删除。其余删除成功"; + } + return Result.success("true",msg,""); + } + + } + + + @ApiOperation(value = "配置角色菜单|RoleEO|") + @PostMapping("/saveRoleMenu") +// @RequiresPermissions("sys:role:saveRoleMenu") + public ResponseMessage saveRoleMenu(@RequestBody RoleVO roleVO) throws Exception { + String roleIds = roleVO.getRid(); + if(roleIds!=null && roleIds.length()>0){ + String[] roleIdList=roleIds.split(","); + for(int i=0;i> findAll(String userId) { + RoleVO setRole = new RoleVO(); + List roleEOList = roleEOService.findAll(setRole); + List resultList =new ArrayList<>(); + if(roleEOList!=null && !roleEOList.isEmpty()){ + for(RoleEO source:roleEOList){ + RoleVO roleVO = BeanUtil.toBean(source, RoleVO.class); + roleVO.setMenusstr(source.getMenuEOIdList()); + roleVO.setMenus(source.getMenuEOList()); + resultList.add(roleVO); + } + } + return Result.success(resultList); + } + + @ApiOperation(value = "|RoleEO|判断当前登录人是否有购买流程权限") + @GetMapping("/judgeBuyRoleForSearch") + public ResponseMessage judgeBuyRoleForSearch(RoleVO roleVO){ + // 查询“工程师”，“超级管理员”角色id + String roleIdEngin = ""; + String roleIdAdmin = ""; + List getRoleIdEngins = roleEOService.selectByNameAndId(null,"工程师"); + if(getRoleIdEngins != null && getRoleIdEngins.size()>0){ + roleIdEngin = getRoleIdEngins.get(0).getId(); + } + List getRoleIdAdmins = roleEOService.selectByNameAndId(null,"工程师"); + if(getRoleIdAdmins != null && getRoleIdAdmins.size()>0){ + roleIdAdmin = getRoleIdAdmins.get(0).getId(); + } + // 查询当前登录人角色 + String roleIds = roleVO.getRoleIds(); + String[] roleArr = roleIds.split(","); + List roleIdList = Arrays.asList(roleArr); + if(roleIdList != null && roleIdList.size()>0){ + if(roleIdList.contains(roleIdEngin) || roleIdList.contains(roleIdAdmin)){ + return Result.success(roleIds); + } else { + return Result.error("noPermission"); + } + } + return Result.success(); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleSarMenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleSarMenuEOController.java new file mode 100644 index 00000000..490569dd --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleSarMenuEOController.java @@ -0,0 +1,153 @@ +package com.adc.da.sys.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.RoleSarMenuEO; +import com.adc.da.sys.page.RoleSarMenuEOPage; +import com.adc.da.sys.service.IRoleSarMenuEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/sys/roleSarMenu") +@Api(description = "|RoleSarMenuEO|") +public class RoleSarMenuEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(RoleSarMenuEOController.class); + + @Autowired + private IRoleSarMenuEOService roleSarMenuEOService; + + @ApiOperation(value = "|RoleSarMenuEO|分页查询") + @GetMapping("/page") + @RequiresPermissions("sys:roleSarMenu:page") + public ResponseMessage> page(RoleSarMenuEOPage page) throws Exception { + List rows = roleSarMenuEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|RoleSarMenuEO|查询") + @GetMapping("") + /*@RequiresPermissions("sys:roleSarMenu:list")*/ + public ResponseMessage> list(RoleSarMenuEOPage page) throws Exception { + List getList = roleSarMenuEOService.queryByList(page); + //数据中没有根节点的配置 + //查询根目录节点id + List rootIds = roleSarMenuEOService.selectSarMenuRoots(); + if(rootIds != null && !rootIds.isEmpty()){ + for(RoleSarMenuEO roleSarMenuEO : rootIds){ + roleSarMenuEO.setRoleId(page.getRoleId()); + roleSarMenuEO.setSarMenuId(roleSarMenuEO.getId()); + if (!"BUSINESS_STAND".equals(roleSarMenuEO.getSorDivide())) { + getList.add(roleSarMenuEO); + } + } + } + return Result.success(getList); + } + + @ApiOperation(value = "|RoleSarMenuEO|详情") + @GetMapping("/{roleId}") + @RequiresPermissions("sys:roleSarMenu:get") + public ResponseMessage find(@PathVariable String roleId) throws Exception { + return Result.success(roleSarMenuEOService.getById(roleId)); + } + + @ApiOperation(value = "|RoleSarMenuEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("sys:roleSarMenu:save") + public ResponseMessage create(@RequestBody RoleSarMenuEO roleSarMenuEO) throws Exception { + roleSarMenuEOService.save(roleSarMenuEO); + return Result.success(roleSarMenuEO); + } + + @ApiOperation(value = "|RoleSarMenuEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("sys:roleSarMenu:update") + public ResponseMessage update(@RequestBody RoleSarMenuEO roleSarMenuEO) throws Exception { + roleSarMenuEOService.updateById(roleSarMenuEO); + return Result.success(roleSarMenuEO); + } + + @ApiOperation(value = "|RoleSarMenuEO|删除") + @DeleteMapping("/{roleId}") + @RequiresPermissions("sys:roleSarMenu:delete") + public ResponseMessage delete(@PathVariable String roleId) throws Exception { + roleSarMenuEOService.removeById(roleId); + logger.info("delete from TS_ROLE_SAR_MENU where roleId = {}", roleId); + return Result.success(); + } + + + @ApiOperation(value = "|RoleSarMenuEO|绑定角色所拥有的节点 id") + @PostMapping("/bindRoleSarMenuId") + public ResponseMessage bindRoleSarMenuId(@RequestBody RoleSarMenuEO roleSarMenuEO) throws Exception { + List sarMenuIds = roleSarMenuEO.getSarMenuIds(); + roleSarMenuEOService.removeById(roleSarMenuEO.getRoleId()); + //查询根目录节点id + List rootIds = roleSarMenuEOService.selectSarMenuRoots(); + String inlandLawsId = ""; + String inlandStandId = ""; + String foreignStandId = ""; + String foreignLawsId = ""; + String BussId = ""; + for (RoleSarMenuEO sarMenuEO :rootIds){ + if(sarMenuEO.getSorDivide().equals("INLAND_LAWS")){ + //国内政策 + inlandLawsId = sarMenuEO.getId(); + + } + if(sarMenuEO.getSorDivide().equals("INLAND_STAND")){ + //国内标准法规 + inlandStandId = sarMenuEO.getId(); + + } + if(sarMenuEO.getSorDivide().equals("FOREIGN_STAND")){ + //国外标准法规 + foreignStandId = sarMenuEO.getId(); + + } + if(sarMenuEO.getSorDivide().equals("FOREIGN_LAWS")){ + //国外政策 + foreignLawsId = sarMenuEO.getId(); + + } + if(sarMenuEO.getSorDivide().equals("BUSINESS_STAND")){ + //国内政策 + BussId = sarMenuEO.getId(); + + } + } + //保存角色的配置，去除根节点 + for (String menuId : sarMenuIds){ + if( menuId.equals(inlandLawsId) || menuId.equals(inlandStandId) || menuId.equals(foreignStandId) || menuId.equals(foreignLawsId) ){ + continue; + } + RoleSarMenuEO sarMenuEO = new RoleSarMenuEO(); + sarMenuEO.setRoleId(roleSarMenuEO.getRoleId()); + sarMenuEO.setSarMenuId(menuId); + roleSarMenuEOService.save(sarMenuEO); + } + return Result.success(); + } + + /* @ApiOperation(value = "|RoleSarMenuEO|查询角色拥有的节点id") + @GetMapping("/{roleId}") + public ResponseMessage findRoleSarMenu(@PathVariable String roleId) throws Exception { + List roleSarMenuEOS = roleSarMenuEOService.findRoleSarMenu(roleId); + return Result.success(roleSarMenuEOService.selectByPrimaryKey(roleId)); + }*/ + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserConfigEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserConfigEOController.java new file mode 100644 index 00000000..b2f155c2 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserConfigEOController.java @@ -0,0 +1,98 @@ +package com.adc.da.sys.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.UserConfigEO; +import com.adc.da.sys.page.UserConfigEOPage; +import com.adc.da.sys.service.IUserConfigEOService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("/${restPath}/person/userConfig") +@Api(description = "|UserConfigEO|") +public class UserConfigEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(UserConfigEOController.class); + + @Autowired + private IUserConfigEOService userConfigEOService; + + @ApiOperation(value = "|UserConfigEO|分页查询") + @GetMapping("/page") + //@RequiresPermissions("person:userConfig:page") + public ResponseMessage> page(UserConfigEOPage page) throws Exception { + List rows = userConfigEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|UserConfigEO|查询") + @GetMapping("") + //@RequiresPermissions("person:userConfig:list") + public ResponseMessage> list(UserConfigEOPage page) throws Exception { + return Result.success(userConfigEOService.queryByList(page)); + } + + @ApiOperation(value = "|UserConfigEO|详情") + @GetMapping("/{id}") + //@RequiresPermissions("person:userConfig:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(userConfigEOService.getById(id)); + } + + @ApiOperation(value = "|UserConfigEO|新增") + @PostMapping("/createUserConfig") + //@RequiresPermissions("person:userConfig:save") + public ResponseMessage create(@RequestBody UserConfigEO userConfigEO) throws Exception { + UserConfigEOPage page = new UserConfigEOPage(); + page.setUserId(LoginUserUtil.getUserId()); + page.setConfigType("PAGE_SIZE"); + List userConfigEOList = userConfigEOService.queryByList(page); + if(userConfigEOList.size()>0){ + userConfigEO.setModifyTime(new Date()); + userConfigEO.setId(userConfigEOList.get(0).getId()); + userConfigEOService.updateById(userConfigEO); + } + else { + String userId = LoginUserUtil.getUserId(); + userConfigEO.setId(UUIDUtils.randomUUID20()); + userConfigEO.setUserId(userId); + userConfigEO.setValidFlag(0); + userConfigEO.setCreationTime(new Date()); + userConfigEO.setModifyTime(new Date()); + userConfigEOService.save(userConfigEO); + } + + return Result.success(userConfigEO); + } + + @ApiOperation(value = "|UserConfigEO|修改") + @PutMapping("/updateUserConfig") + //@RequiresPermissions("person:userConfig:update") + public ResponseMessage update(@RequestBody UserConfigEO userConfigEO) throws Exception { + userConfigEO.setModifyTime(new Date()); + userConfigEOService.updateById(userConfigEO); + return Result.success(userConfigEO); + } + + @ApiOperation(value = "|UserConfigEO|删除") + @DeleteMapping("/{id}") + //@RequiresPermissions("person:userConfig:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + userConfigEOService.removeById(id); + logger.info("delete from TS_USER_CONFIG where id = {}", id); + return Result.success(); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java new file mode 100644 index 00000000..77f627d8 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -0,0 +1,557 @@ +package com.adc.da.sys.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.adc.da.base.page.Pager; +import com.adc.da.base.web.BaseController; +import com.adc.da.common.ValidFlagEnum; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.RoleEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.page.UserEOPage; +import com.adc.da.sys.service.IOrgEOService; +import com.adc.da.sys.service.IRoleEOService; +import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.service.IUserInfoEOService; +import com.adc.da.sys.vo.UserVO; +import com.adc.da.util.LoginUserUtil; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@RestController +@RequestMapping("/${restPath}/sys/user") +@Api(description = "用户管理") +public class UserEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(UserEOController.class); + + @Autowired + private IUserEOService userEOService; + @Autowired + private IOrgEOService orgEOService; + + @Autowired + IUserInfoEOService userInfoEOService; + @Autowired + IRoleEOService roleEOService; + + @ApiOperation(value = "|UserEO|详情") + @GetMapping("/{id}") +// @RequiresPermissions("sys:user:get") + public ResponseMessage getById(@NotNull @PathVariable("id") String id) throws Exception { + UserEO userEO = userEOService.getUserWithRoles(id); + UserVO userVO= new UserVO(); + if(userEO!=null){ + userVO = BeanUtil.toBean(userEO,UserVO.class); + userVO.setRoles(userEO.getRoleEOList()); + userVO.setOrgsstr(userEO.getOrgIdList()); + userVO.setOrgs(userEO.getOrgEOList()); + userVO.setPassword(userEO.getPassword()); + } + return Result.success(userVO); + } + + /** + * @return com.adc.da.util.http.ResponseMessage> + * @Author liwenxuan + * @Description 用户分页 + * @Date Administrator 2018/9/27 + * @Param [pageNo, pageSize, orgId, userType, uname, roleName, disableFlag] + **/ + @ApiOperation(value = "|UserEO|分页查询") + @GetMapping("") + //@RequiresPermissions("sys:user:UserInfoPage") + public ResponseMessage> UserInfoPage(Integer pageNo, Integer pageSize, String orgId, String userType, String uname, String roleId, String disableFlag, String roleName, String account, String processFlag) throws Exception { + UserEOPage page = new UserEOPage(); + if (pageNo != null) { + page.setPage(pageNo); + } + if (pageSize != null) { + page.setPageSize(pageSize); + }else{ + page.setPageSize(Integer.MAX_VALUE); + } + if (StringUtils.isNotEmpty(uname)) { + page.setUname(uname); + } + if (StringUtils.isNotEmpty(userType)) { + page.setUserType(userType); + } + if (StringUtils.isNotEmpty(disableFlag)) { + page.setDisableFlag(disableFlag); + } + if (StringUtils.isNotEmpty(orgId)) { + page.setOrgId(orgId); + } + if (StringUtils.isNotEmpty(roleId)) { + page.setRoleId(roleId); + } + if (StringUtils.isNotEmpty(roleName)) { + page.setRoleName(roleName); + } + if (StringUtils.isNotEmpty(account)) { + page.setAccount(account); + } +// page.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue() + ""); + page.setPager(new Pager()); + List userEOs = userEOService.queryUserInfoByPage(page); +// 根据用户id查找用户的多个角色并放到roleIdList中 + if(processFlag==null || processFlag.isEmpty()) { + for (UserEO userEO : userEOs) { + UserEO userWithRoles = userEOService.getUserWithRolesAll(userEO.getUsid());//查询用户及用户所对应的角色 + if (userWithRoles != null) { + List roleEOList = userWithRoles.getRoleEOList(); + for (RoleEO role : roleEOList) { + String rolename = role.getName(); + String roleId1 = role.getId(); + userEO.getRoleNameList().add(rolename); + userEO.getRoleIdList().add(roleId1); + } + } + } + } + return Result.success(getPageInfo(page.getPager(), userEOs)); + } + + + @ApiOperation(value = "|UserEO|新增") + @PostMapping(value = "/addUser") +// @RequiresPermissions("sys:user:save") + public ResponseMessage create(String userStr) throws Exception { + if (StringUtils.isNotEmpty(userStr)) { + // 解密 + userStr = new StringBuilder(userStr).reverse().toString(); + userStr = new String(Base64.decodeBase64(userStr), StandardCharsets.UTF_8); + System.out.println(userStr); + // 转为对象 +// JSONObject jsonObject=JSONObject.fromObject(userStr); + UserEO userEO = JSON.parseObject(userStr, UserEO.class); +// 修改用户信息 + UserVO userVO= new UserVO(); + if(userEO!=null){ + userVO = BeanUtil.toBean(userEO,UserVO.class); + userVO.setRoles(userEO.getRoleEOList()); + userVO.setOrgsstr(userEO.getOrgIdList()); + userVO.setOrgs(userEO.getOrgEOList()); + userVO.setPassword(userEO.getPassword()); + } + ResponseMessage userVOResponseMessage = userEOService.createOrModifyIf(userVO); + if (userVOResponseMessage.getData() == null) { + return userVOResponseMessage; + } + userEO.setOperUser(LoginUserUtil.getUserId()); + UserEO userEORes = userEOService.saveBean(userEO); + if (userEORes == null) { + return Result.error("操作失败"); + } + //TODO 往个人板块插入数据失败 +// List personConfEOS = personConfEOService.saveConfList(userEO.getUsid()); + return Result.success("true", "操作成功", null); + } else { + return Result.error("操作失败"); + } + + } + + /** + * @return com.adc.da.util.http.ResponseMessage + * @Author liwenxuan + * @Description 修改时同时对用户表、用户角色表关联表、用户组织机构关联表信息修改 + * 前台必传参数：usid、orgId、roleIdList + * @Date Administrator 2018/9/26 + * @Param [userVO] + **/ + @ApiOperation(value = "|UserEO|修改") + @PutMapping(value = "/updateUser") +// @RequiresPermissions("sys:user:modifyUser") + public ResponseMessage update(String userStr) throws Exception { + if (StringUtils.isNotEmpty(userStr)) { + // 解密 + userStr = new StringBuilder(userStr).reverse().toString(); + userStr = new String(Base64.decodeBase64(userStr), StandardCharsets.UTF_8); + // 转为对象 + UserEO userEO = JSON.parseObject(userStr, UserEO.class); +// 修改用户信息 + UserVO userVO= new UserVO(); + if(userEO!=null){ + userVO = BeanUtil.toBean(userEO,UserVO.class); + userVO.setRoles(userEO.getRoleEOList()); + userVO.setOrgsstr(userEO.getOrgIdList()); + userVO.setOrgs(userEO.getOrgEOList()); + userVO.setPassword(userEO.getPassword()); + } + ResponseMessage userVOResponseMessage = userEOService.createOrModifyIf(userVO); + if (userVOResponseMessage.getData() == null) { + return userVOResponseMessage; + } else { + userEO.setRoleIdList(userEO.getRoleIdList()); + userEOService.updateUserEOInfo(userEO); + return Result.success("true", "操作成功", null); + } + } else { + return Result.error("操作失败"); + } + } + + @ApiOperation(value = "|UserEO|删除") + @DeleteMapping("/{ids}") + @RequiresPermissions("sys:user:delete") + public ResponseMessage delete(@NotNull @PathVariable("ids") String[] ids) throws Exception { + int i = userEOService.delete(Arrays.asList(ids)); + if (i == 0) { + return Result.error("删除失败"); + } + return Result.success("true", "删除成功", ""); + } + + @ApiOperation(value = "配置用户角色|UserEO|") + @PostMapping("/saveUserRole") + /*@RequiresPermissions("sys:user:saveUserRole")*/ + public ResponseMessage saveUserRole(@RequestBody UserVO userVO) { + //查询部门负责人id + String mainRoleId=""; + String userIds = userVO.getUsid(); + String[] userIdList = userIds.split(","); + List getRoleId = roleEOService.selectByNameAndId(null,"部门负责人"); + if(getRoleId!=null && getRoleId.size()>0){ + mainRoleId = getRoleId.get(0).getId(); + if(userVO.getRoleIdList().contains(mainRoleId) && userIds != null && userIdList.length>1){ + return Result.error("同一部门下仅允许设置一个部门负责人"); + } else if (userVO.getRoleIdList().contains(mainRoleId) && userIds != null && userIdList.length>0 && userIdList.length<=1) { + List getUser = userEOService.getUserEOBySpecRole(userVO.getOrgId(),userIdList[0]); + if(getUser!=null && getUser.size()>0){ + return Result.error("此部门下，拥有部门负责人角色的用户已经存在"); + } + } + } + if (userIds != null && userIds.length() > 0 && userVO.getRoleIdList()!=null && !userVO.getRoleIdList().isEmpty()) { + // 此处需要维护用户角色--单个用户可以拥有多个角色 + List roleIdList = userVO.getRoleIdList(); + if(roleIdList!=null && !roleIdList.isEmpty()){ + for(String roleId:roleIdList){ + if (StringUtils.isNotEmpty(roleId)) { + // 判断是否为科级负责人，科级负责人角色只能在科级部门 + int SectionFlag = StringUtils.equals(roleId,"YK5P33FZ29TPN2VPDP6E")?1:0; +// int i1 = roleEOService.querySectionCount(roleId); + // 判断是否为部门负责人，部门负责人角色只能在部级部门 +// int i2 = roleEOService.querySectionCount1(roleId); + int SectionFlagOfB = StringUtils.equals(roleId,"GQSBB2N3KURYYC6AUFER")?1:0; + if (SectionFlag == 1) { + // 所选部门角色是否为科级负责人 + // for 循环判断每一个人的部门 + String[] orgIdList = userVO.getOrgId().split(","); + for (int i = 0; i < orgIdList.length; i++) { + String orgId = orgIdList[i]; + UserVO userParame = new UserVO(); + userParame.setOrgId(orgId); + int orgNamebyOrgId = orgEOService.getOrgNamebyOrgId(userParame); + if (orgNamebyOrgId != 1) { + return Result.error("科级负责任人只能创建在科级部门"); + } + } + } + if (SectionFlagOfB == 1) { + // 所选部门角色是否为部门级 + String[] orgIdList = userVO.getOrgId().split(","); + for (int i = 0; i < orgIdList.length; i++) { + String orgId = orgIdList[i]; + UserVO userParame = new UserVO(); + userParame.setOrgId(orgId); + int orgNamebyOrgId = orgEOService.getOrgNamebyOrgId(userParame); + if (orgNamebyOrgId != 2) { + return Result.error("部门负责任人只能创建在部门级部门"); + } + } + } + } + } + } +/* String roleIds = userVO.getRoleId(); + String[] roleIDs = roleIds.split(","); + for (int ii = 0; ii < roleIDs.length; ii++) { + if (StringUtils.isNotEmpty(roleIDs[ii])) { + // 判断是否为科级负责人，科级负责人角色只能在科级部门 + int i1 = roleEOService.querySectionCount(roleIDs[ii]); + // 判断是否为部门负责人，部门负责人角色只能在部级部门 + int i2 = roleEOService.querySectionCount1(roleIDs[ii]); + if (i1 == 1) { + // 所选部门角色是否为科级负责人 + // for 循环判断每一个人的部门 + String[] orgIdList = userVO.getOrgId().split(","); + for (int i = 0; i < orgIdList.length; i++) { + String orgId = orgIdList[i]; + UserVO userParame = new UserVO(); + userParame.setOrgId(orgId); + int orgNamebyOrgId = orgEOService.getOrgNamebyOrgId(userParame); + if (orgNamebyOrgId != 1) { + return Result.error("科级负责任人只能创建在科级部门"); + } + } + } else if (i2 == 1) { + // 所选部门角色是否为部门级 + String[] orgIdList = userVO.getOrgId().split(","); + for (int i = 0; i < orgIdList.length; i++) { + String orgId = orgIdList[i]; + UserVO userParame = new UserVO(); + userParame.setOrgId(orgId); + int orgNamebyOrgId = orgEOService.getOrgNamebyOrgId(userParame); + if (orgNamebyOrgId != 2) { + return Result.error("部门负责任人只能创建在部门级部门"); + } + } + } + } + }*/ + for (int i = 0; i < userIdList.length; i++) { + String userId = userIdList[i]; + UserEO user=new UserEO(); + user.setUsid(userId); + user.setRoleIdList(userVO.getRoleIdList()); + userEOService.saveUserRole(user); + } + } else { + return Result.error("未设置角色信息"); + } + return Result.success("", "操作成功", userVO); + } + + + /** + * @return com.adc.da.util.http.ResponseMessage> + * @Author liwenxuan + * @Description //组织机构分页： + * 根据组织机构和用户的关联表进行中orgId字段作为判断条件进行查询 + * @Date Administrator 2018/9/25 + * @Param [page] + **/ + @ApiOperation(value = "|UserEO|组织机构查询用户") + @GetMapping("/findByOrg") + // @RequiresPermissions("sys:user:queryByOrg") + public ResponseMessage> queryByOrg(UserEOPage page) { + /* if (StringUtils.isNotBlank(page.getUname())) + page.setUname("%" + page.getUname() + "%");*/ +// page.setDisableFlag(UserDisableFlagEnum.disableFlag_TRUE.getValue()); + List userEOs = userEOService.queryUserInfoByPage(page); + PageInfo pageInfo = getPageInfo(page.getPager(), userEOs); + // 根据用户id查找用户的多个角色并放到roleIdList中 + List resultList =new ArrayList<>(); + for (UserEO userEO : userEOs) { + UserEO userWithRoles = userEOService.getUserWithRolesAll(userEO.getUsid());//查询用户及用户所对应的角色 + if(userWithRoles != null){ + List roleEOList = userWithRoles.getRoleEOList(); + for (RoleEO role : roleEOList) { + String rolename = role.getName(); + String roleId1 = role.getId(); + userEO.getRoleNameList().add(rolename); + userEO.getRoleIdList().add(roleId1); + } + } + UserVO userVO = BeanUtil.toBean(userEO, UserVO.class); + userVO.setRoles(userEO.getRoleEOList()); + userVO.setOrgsstr(userEO.getOrgIdList()); + userVO.setOrgs(userEO.getOrgEOList()); + resultList.add(userVO); + } + PageInfo resultPage =new PageInfo<>(); + resultPage.setCount(pageInfo.getCount()); + resultPage.setList(resultList); + resultPage.setOrderBy(pageInfo.getOrderBy()); + resultPage.setPageCount(pageInfo.getPageCount()); + resultPage.setPageNo(pageInfo.getPageNo()); + resultPage.setPageSize(pageInfo.getPageSize()); +// PageInfo mapPage = beanMapper.mapPage(getPageInfo(page.getPager(), userEOs), UserVO.class); + return Result.success(resultPage); + } + + /** + * @return com.adc.da.util.http.ResponseMessage> + * @Author liwenxuan + * @Description 查找未分配组织结构的用户的行数 + * @Date Administrator 2018/9/21 + * @Param [page] + **/ + @ApiOperation(value = "|UserEO|查询未配置组织机构的用户") + @GetMapping("/findBySetOrg") + // @RequiresPermissions("sys:user:findBySetOrg") + public ResponseMessage> findBySetOrg(UserEOPage page) { + page.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue() + ""); + // page.setPager(new Pager()); + List userInfoByPage = userEOService.findUserInfoByPage(page); + PageInfo pageInfo = getPageInfo(page.getPager(), userInfoByPage); + List resultList =new ArrayList<>(); + for (UserEO userEO : userInfoByPage) { + UserEO userWithRoles = userEOService.getUserWithRolesAll(userEO.getUsid());//查询用户及用户所对应的角色 + if(userWithRoles != null){ + List roleEOList = userWithRoles.getRoleEOList(); + for (RoleEO role : roleEOList) { + String rolename = role.getName(); + String roleId1 = role.getId(); + userEO.getRoleNameList().add(rolename); + userEO.getRoleIdList().add(roleId1); + } + UserVO userVO = BeanUtil.toBean(userEO, UserVO.class); + userVO.setRoles(userEO.getRoleEOList()); + userVO.setOrgsstr(userEO.getOrgIdList()); + userVO.setOrgs(userEO.getOrgEOList()); + resultList.add(userVO); + } + } + PageInfo resultPage =new PageInfo<>(); + resultPage.setCount(pageInfo.getCount()); + resultPage.setList(resultList); + resultPage.setOrderBy(pageInfo.getOrderBy()); + resultPage.setPageCount(pageInfo.getPageCount()); + resultPage.setPageNo(pageInfo.getPageNo()); + resultPage.setPageSize(pageInfo.getPageSize()); +// PageInfo mapPage = beanMapper.mapPage(getPageInfo(page.getPager(), userInfoByPage), UserVO.class); + return Result.success(resultPage); + + } + +//通过userId查询关联表，没有orgId的就是没有组织结构的用户 +// 把这些用户对应的信息显示出来 + + /** + * 功能描述: 查询所有用户信息 + * + * @param: [page] + * @return: + * @auther: SYT + * @date: 2018/10/16 8:44 + */ + @ApiOperation(value = "|UserEO|查询") + @GetMapping("/userEoList") + //@RequiresPermissions("sys:user:userEoList") + public ResponseMessage> userEoList(UserEOPage page) throws Exception { + + List userInfoEOList = userEOService.queryUserEoList(page); + return Result.success(userInfoEOList); + } + + /** + * @return com.adc.da.util.http.ResponseMessage> + * @Author liwenxuan + * @Description //查询院领导下面的用户：RoleName可传可不传 + * @Date Administrator 2018/10/31 + * @Param [RoleName] + **/ + @ApiOperation(value = "|UserEO|查询院领导下面的用户") + @GetMapping("/findLeaderByOrgIdAndRoleName") + //@RequiresPermissions("sys:user:findLeaderByOrgIdAndRoleName") + public ResponseMessage> queryByOrgIdAndRoleName(String roleName) { + UserEOPage page = new UserEOPage(); + page.setOrgId("669LUSZYJ99EZ5ZDU84U"); + page.setRoleName(roleName); + List userEOs = userEOService.queryUserInfoByPage(page); + List resultList =new ArrayList<>(); + if(userEOs!=null && !userEOs.isEmpty()){ + for(UserEO source: userEOs){ + UserVO userVO = BeanUtil.toBean(source, UserVO.class); + userVO.setRoles(source.getRoleEOList()); + userVO.setOrgsstr(source.getOrgIdList()); + userVO.setOrgs(source.getOrgEOList()); + resultList.add(userVO); + } + } + return Result.success(resultList); + } + + + /** + * @return com.adc.da.sys.entity.UserEO + * @Author liwenxuan + * @Description //根据roleName获取用户List + * @Date Administrator 2018/11/12 + * @Param [RoleName] + **/ + @ApiOperation(value = "|UserEO|根据roleName获取用户List") + @GetMapping("/getUserListByRoleName") + public ResponseMessage> getUserListByRoleName(String RoleName) { + + List userListByRoleName = userEOService.getUserListByRoleName(RoleName); + if (userListByRoleName == null) { + return Result.error(); + } + return Result.success("", "true", userListByRoleName); + } + + /** + * @return com.adc.da.util.http.ResponseMessage> + * @Author liwenxuan + * @Description //ceshi + * @Date Administrator 2018/11/23 + * @Param [userId] + **/ + @ApiOperation(value = "|UserEO|测试") + @GetMapping("/ceshi") + public ResponseMessage> selectThatOrgUser(String userId) { + List list = userEOService.selectThatOrgUser(userId); + return Result.success("", "", list); + } + + + + + + @ApiOperation(value = "|UserEO|重置密码") + @PostMapping(value = "/resetPassword") + public ResponseMessage resetPassword(String userId) { + //翻转 + userId = new StringBuilder(userId).reverse().toString(); + //解密 + userId = new String(Base64.decodeBase64(userId)); + + int line = userEOService.resetPassword(userId); + if (line == 0) { + return Result.error(); + } else { + return Result.success("true","密码重置为：123456a",""); + } + } + + @ApiOperation(value = "|UserEO|新增固定账号") + @GetMapping(value = "/createSpecialUser") +// @RequiresPermissions("sys:user:save") + public ResponseMessage createSpecialUser(String account) throws Exception { + UserVO userVO = new UserVO(); + userVO.setOperUser(LoginUserUtil.getUserId()); + userVO.setPassword("123456"); + userVO.setAccount(account); + userVO.setOrgId("5W2J4AQ8KA"); + userVO.setDisableFlag(0); + List roleId = new ArrayList<>(); + roleId.add("ZVXUGCP56D"); + userVO.setRoleIdList(roleId); + UserEO userEO=new UserEO(); + if(userVO!=null){ + userEO = BeanUtil.toBean(userVO,UserEO.class); + userEO.setRoleEOList(userVO.getRoles()); + userEO.setOrgIdList(userVO.getOrgsstr()); + userEO.setOrgEOList(userVO.getOrgs()); + userEO.setPassword(userVO.getPassword()); + } + userEO = userEOService.saveBean(userEO); + if (userEO == null) { + return Result.error("操作失败"); + } + //TODO 往个人板块插入数据失败 +// List personConfEOS = personConfEOService.saveConfList(userEO.getUsid()); + return Result.success("true", "操作成功", userVO); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java new file mode 100644 index 00000000..4692a62d --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java @@ -0,0 +1,168 @@ +package com.adc.da.sys.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.common.ValidFlagEnum; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.RoleEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserInfoEO; +import com.adc.da.sys.page.UserInfoEOPage; +import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.service.IUserInfoEOService; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/person/userInfo") +@Api(description = "|UserInfoEO|") +public class UserInfoEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(UserInfoEOController.class); + + @Autowired + private IUserInfoEOService userInfoEOService; + @Autowired + private IUserEOService userEOService; + + @ApiOperation(value = "|UserInfoEO|分页查询") + @GetMapping("/page") + //@RequiresPermissions("person:userInfo:page") + public ResponseMessage> page(UserInfoEOPage page) throws Exception { + List rows = userInfoEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + + @ApiOperation(value = "|UserInfoEO|查询") + @GetMapping("") + @RequiresPermissions("person:userInfo:list") + public ResponseMessage> list(UserInfoEOPage page) throws Exception { + return Result.success(userInfoEOService.queryByList(page)); + } + + /** + * 刘寅楠 + * @param + * @return com.adc.da.person.entity.UserInfoEO + * @throws Exception + */ + @ApiOperation(value = "查找用户信息接口") + @GetMapping("/getByUserInfoCode") + //@RequiresPermissions("person:userInfo:getByUserInfoCode") + public ResponseMessage getByUserInfoCode() throws Exception { + //获取当前登录人 + String userId= LoginUserUtil.getUserId(); + UserInfoEO userInfoEO =new UserInfoEO(); + userInfoEO.setUserId(userId); + userInfoEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + UserInfoEO getInfo = userInfoEOService.getUserEOAndInfoEOByUserCode(userInfoEO); + if(getInfo!=null){ + //开始获取用户角色信息 + UserEO user= userEOService.getUserWithRoles(userId); + String userRoles = ""; + if (user!=null && user.getRoleEOList()!=null &&!user.getRoleEOList().isEmpty()) { + for (RoleEO role : user.getRoleEOList()) { + userRoles += role.getName() + ","; + } + // RoleEO role=user.getRoleEOList().get(0); + getInfo.setUserRole(userRoles); + } + } + return Result.success(getInfo); + } + + + /** + * 刘寅楠 + * @param userInfoEO + * @param UserId + * @return + * @throws Exception + */ + @ApiOperation(value = "|UserInfoEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + // @RequiresPermissions("person:userInfo:save") + public ResponseMessage create(@RequestBody UserInfoEO userInfoEO, String UserId) throws Exception { +// //判断用户必填信息是否为空 +// if(StringUtils.isBlank(userInfoEO.getOfficePhone())){ +// return Result.error("r0018","电话号码不能为空"); +// } +// if(StringUtils.isBlank(userInfoEO.getAddress())){ +// return Result.error("r0019","个人邮箱地址不能为空"); +// } +// if(StringUtils.isBlank(userInfoEO.getMobilePhone())){ +// return Result.error("r0020","手机号码不能为空"); +// } +// if(StringUtils.isBlank(userInfoEO.getFaxAddress())){ +// return Result.error("r0021","传真地址不能为空"); +// } + userInfoEO.setId(UUIDUtils.randomUUID20()); + userInfoEO.setUserId(UserId); + userInfoEOService.save(userInfoEO); + return Result.success(userInfoEO); + } + + + + /* + * @Author liuyinnan + * @Description //修改用户详细信息 + * @Date 19:33 2018/9/20 + * @Param [userInfoEO, restPath] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "保存修改用户信息") + @PostMapping(value = "/updatePersonInfo") + //@RequiresPermissions("person:userInfo:update") + public ResponseMessage update(@RequestBody UserInfoEO userInfoEO) throws Exception { + userInfoEO.setUserId(LoginUserUtil.getUserId()); + /* if(StringUtils.isBlank(userInfoEO.getOfficePhone())){ + return Result.error("r0018","电话号码不能为空"); + } + if(StringUtils.isBlank(userInfoEO.getEmail())){ + return Result.error("r0019","个人邮箱不能为空"); + } + if(StringUtils.isBlank(userInfoEO.getMobilePhone())){ + return Result.error("r0020","手机号码不能为空"); + } + if(StringUtils.isBlank(userInfoEO.getFaxAddress())){ + return Result.error("r0021","传真地址不能为空"); + }*/ + return Result.success(userInfoEOService.updateByUserId(userInfoEO)); + } + + + + @ApiOperation(value = "|UserInfoEO|删除") + @DeleteMapping("/{id}") + @RequiresPermissions("person:userInfo:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + userInfoEOService.removeById(id); + logger.info("delete from TS_USER_INFO where id = {}", id); + return Result.success(); + } + + + + + @ApiOperation(value = "保存用户信息") + @PutMapping("/updateByUserInfo") + public ResponseMessage updateByUserInfo(UserInfoEO userInfoEO)throws Exception{ + String userId= LoginUserUtil.getUserId(); + return userInfoEOService.updateByUserId(userInfoEO); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/WarnTimeEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/WarnTimeEOController.java new file mode 100644 index 00000000..2bd7b1e2 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/WarnTimeEOController.java @@ -0,0 +1,124 @@ +package com.adc.da.sys.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.ResponseMessageCodeEnum; +import com.adc.da.http.Result; +import com.adc.da.sys.entity.WarnTimeEO; +import com.adc.da.sys.page.WarnTimeEOPage; +import com.adc.da.sys.service.IWarnTimeEOService; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotNull; +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/sys/warnTime") +@Api(description = "|WarnTimeEO|") +public class WarnTimeEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(WarnTimeEOController.class); + + @Autowired + private IWarnTimeEOService warnTimeEOService; + + @ApiOperation(value = "|WarnTimeEO|分页查询") + @GetMapping("/page") +// @RequiresPermissions("sys:warnTime:page") + public ResponseMessage> page(WarnTimeEOPage page) throws Exception { + List rows = warnTimeEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|WarnTimeEO|查询") + @GetMapping("") + //@RequiresPermissions("sys:warnTime:list") + public ResponseMessage> list(WarnTimeEOPage page) throws Exception { + return Result.success(warnTimeEOService.queryByList(page)); + } +/** + * @Author liwenxuan + * @Description //用来 + * @Date Administrator 2018/10/14 + * @Param [id] + * @return com.adc.da.util.http.ResponseMessage + **/ + @ApiOperation(value = "|WarnTimeEO|详情") + @GetMapping("/find") + //@RequiresPermissions("sys:warnTime:get") + public ResponseMessage find(WarnTimeEOPage page) throws Exception { + List getList = warnTimeEOService.queryByList(page); + WarnTimeEO warnTimeEO = new WarnTimeEO(); + if (getList != null && getList.size()>0) { + warnTimeEO = getList.get(0); + } + return Result.success("true","操作成功",warnTimeEO); + } + + @ApiOperation(value = "|WarnTimeEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("sys:warnTime:save") + public ResponseMessage create(@RequestBody WarnTimeEO warnTimeEO) throws Exception { + warnTimeEOService.save(warnTimeEO); + return Result.success(warnTimeEO); + } + + @ApiOperation(value = "|WarnTimeEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("sys:warnTime:update") + public ResponseMessage update(@RequestBody WarnTimeEO warnTimeEO) throws Exception { + warnTimeEOService.updateById(warnTimeEO); + return Result.success(warnTimeEO); + } + + @ApiOperation(value = "|WarnTimeEO|删除") + @DeleteMapping("/{id}") +// @RequiresPermissions("sys:warnTime:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + warnTimeEOService.removeById(id); + logger.info("delete from TS_WARN_TIME where id = {}", id); + return Result.success(); + } + + + @ApiOperation(value = "|WarnTimeEO|修改") + @PutMapping(value = "/updateSource",consumes = APPLICATION_JSON_UTF8_VALUE) + @RequiresPermissions("sys:warnTime:updateSource") + public ResponseMessage updateSource(@NotNull @RequestBody WarnTimeEO warnTimeEO) throws Exception { + WarnTimeEOPage page=new WarnTimeEOPage(); + List warnTimeEOList=warnTimeEOService.queryByList(page); + if(warnTimeEOList!= null && !warnTimeEOList.isEmpty()){ + if(warnTimeEOList.size()>1){ + WarnTimeEO eo=warnTimeEOList.get(0); + eo.setWarnType(warnTimeEO.getWarnType()); + warnTimeEOService.updateById(eo); + //此处删除多余数据 + for(int i=1;i功能：    TS_FEEDBACK_INFO FeedbackInfoEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class FeedbackInfoEO extends BaseEntity { + + private String id; + private String userId; + private String feedbackInfo; + private Integer readFlag; + private Integer validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + //新增字段 + private String duty; + private String officePhone; + private String mobilePhone; + private String uname; + private String orgName; + private String contentText; + + public String getContentText() { + return contentText; + } + + public void setContentText(String contentText) { + this.contentText = contentText; + } + + public String getDuty() { + return duty; + } + + public void setDuty(String duty) { + this.duty = duty; + } + + public String getOfficePhone() { + return officePhone; + } + + public void setOfficePhone(String officePhone) { + this.officePhone = officePhone; + } + + public String getMobilePhone() { + return mobilePhone; + } + + public void setMobilePhone(String mobilePhone) { + this.mobilePhone = mobilePhone; + } + + public String getUname() { + return uname; + } + + public void setUname(String uname) { + this.uname = uname; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getFeedbackInfo() { + return this.feedbackInfo; + } + + /** **/ + public void setFeedbackInfo(String feedbackInfo) { + this.feedbackInfo = feedbackInfo; + } + + /** **/ + public Integer getReadFlag() { + return this.readFlag; + } + + /** **/ + public void setReadFlag(Integer readFlag) { + this.readFlag = readFlag; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/LinkInfoEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/LinkInfoEO.java new file mode 100644 index 00000000..b87e6d4a --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/LinkInfoEO.java @@ -0,0 +1,117 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.util.Date; + +/** + * 功能：TS_LINK_INFO LinkInfoEOEntity
    + * 作者：code generator
    + * 日期： 2020-01-13
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class LinkInfoEO extends BaseEntity { + + private String id; + private String webName; + private String oldWebSite; + private String newWebSite; + private Integer displaySeq; + private Integer isShow; + private Integer validFlag; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getWebName() { + return this.webName; + } + + /** **/ + public void setWebName(String webName) { + this.webName = webName; + } + + /** **/ + public String getOldWebSite() { + return this.oldWebSite; + } + + /** **/ + public void setOldWebSite(String oldWebSite) { + this.oldWebSite = oldWebSite; + } + + /** **/ + public String getNewWebSite() { + return this.newWebSite; + } + + /** **/ + public void setNewWebSite(String newWebSite) { + this.newWebSite = newWebSite; + } + + /** **/ + public Integer getDisplaySeq() { + return this.displaySeq; + } + + /** **/ + public void setDisplaySeq(Integer displaySeq) { + this.displaySeq = displaySeq; + } + + /** **/ + public Integer getIsShow() { + return this.isShow; + } + + /** **/ + public void setIsShow(Integer isShow) { + this.isShow = isShow; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/LoginInfoEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/LoginInfoEO.java new file mode 100644 index 00000000..3c4391bc --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/LoginInfoEO.java @@ -0,0 +1,148 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.util.Date; + +/** + * 功能：TS_LOGIN_INFO LoginInfoEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class LoginInfoEO extends BaseEntity { + + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private String loginAddress; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date loginTime; + private String userId; + private String id; + private int countNum; + private String maxCountDate; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • loginAddress -> login_address
    • + *
  • loginTime -> login_time
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "loginAddress": return "login_address"; + case "loginTime": return "login_time"; + case "userId": return "user_id"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • login_address -> loginAddress
    • + *
  • login_time -> loginTime
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "login_address": return "loginAddress"; + case "login_time": return "loginTime"; + case "user_id": return "userId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public String getLoginAddress() { + return this.loginAddress; + } + + /** **/ + public void setLoginAddress(String loginAddress) { + this.loginAddress = loginAddress; + } + + /** **/ + public Date getLoginTime() { + return this.loginTime; + } + + /** **/ + public void setLoginTime(Date loginTime) { + this.loginTime = loginTime; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public int getCountNum() { + return countNum; + } + + public void setCountNum(int countNum) { + this.countNum = countNum; + } + + public String getMaxCountDate() { + return maxCountDate; + } + + public void setMaxCountDate(String maxCountDate) { + this.maxCountDate = maxCountDate; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java new file mode 100644 index 00000000..1b7d17d8 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java @@ -0,0 +1,219 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.TreeEntity; + +import java.io.Serializable; +import java.util.Date; + +/** + * 功能：TS_MENU MenuEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class MenuEO extends TreeEntity implements Serializable{ + + private static final long serialVersionUID = 2497292638985614077L; + + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private String remarks; + private String permission; + private Integer isShow; + private String icon; + private String href; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • remarks -> remarks
    • + *
  • permission -> permission
    • + *
  • isShow -> is_show
    • + *
  • icon -> icon
    • + *
  • href -> href
    • + *
  • parentIds -> parent_ids
    • + *
  • parentId -> parent_id
    • + *
  • name -> name
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "remarks": return "remarks"; + case "permission": return "permission"; + case "isShow": return "is_show"; + case "icon": return "icon"; + case "href": return "href"; + case "parentIds": return "parent_ids"; + case "parentId": return "parent_id"; + case "name": return "name"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • remarks -> remarks
    • + *
  • permission -> permission
    • + *
  • is_show -> isShow
    • + *
  • icon -> icon
    • + *
  • href -> href
    • + *
  • parent_ids -> parentIds
    • + *
  • parent_id -> parentId
    • + *
  • name -> name
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "remarks": return "remarks"; + case "permission": return "permission"; + case "is_show": return "isShow"; + case "icon": return "icon"; + case "href": return "href"; + case "parent_ids": return "parentIds"; + case "parent_id": return "parentId"; + case "name": return "name"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getRemarks() { + return this.remarks; + } + + /** **/ + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + /** **/ + public String getPermission() { + return this.permission; + } + + /** **/ + public void setPermission(String permission) { + this.permission = permission; + } + + /** **/ + public Integer getIsShow() { + return this.isShow; + } + + /** **/ + public void setIsShow(Integer isShow) { + this.isShow = isShow; + } + + /** **/ + public String getIcon() { + return this.icon; + } + + /** **/ + public void setIcon(String icon) { + this.icon = icon; + } + + /** **/ + public String getHref() { + return this.href; + } + + /** **/ + public void setHref(String href) { + this.href = href; + } + + /** **/ + public String getParentIds() { + return this.parentIds; + } + + /** **/ + public void setParentIds(String parentIds) { + this.parentIds = parentIds; + } + + /** **/ + public String getParentId() { + return this.parentId; + } + + /** **/ + public void setParentId(String parentId) { + this.parentId = parentId; + } + + /** **/ + public String getName() { + return this.name; + } + + /** **/ + public void setName(String name) { + this.name = name; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java new file mode 100644 index 00000000..2d961ec6 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java @@ -0,0 +1,311 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 功能：TS_ORG OrgEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class OrgEO extends BaseEntity implements Serializable { + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private Integer isShow; + private String parentIds; + private String pId; + private String shotName; + private String remarks; + private Integer orgDesc; + private String orgType; + private String orgCode; + private String orgName; + private String id; + + //补充字段 + private String ssoId; + private String ssoOrgId; + private String userName; + private String usId; + private String roleId; + private String roleName; + private List parentIdsList; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • isShow -> is_show
    • + *
  • parentIds -> parent_ids
    • + *
  • parentId -> parent_id
    • + *
  • shotName -> shot_name
    • + *
  • remarks -> remarks
    • + *
  • orgDesc -> org_desc
    • + *
  • orgType -> org_type
    • + *
  • orgCode -> org_code
    • + *
  • orgName -> org_name
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "isShow": return "is_show"; + case "parentIds": return "parent_ids"; + case "parentId": return "parent_id"; + case "shotName": return "shot_name"; + case "remarks": return "remarks"; + case "orgDesc": return "org_desc"; + case "orgType": return "org_type"; + case "orgCode": return "org_code"; + case "orgName": return "org_name"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • is_show -> isShow
    • + *
  • parent_ids -> parentIds
    • + *
  • parent_id -> parentId
    • + *
  • shot_name -> shotName
    • + *
  • remarks -> remarks
    • + *
  • org_desc -> orgDesc
    • + *
  • org_type -> orgType
    • + *
  • org_code -> orgCode
    • + *
  • org_name -> orgName
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "is_show": return "isShow"; + case "parent_ids": return "parentIds"; + case "parent_id": return "parentId"; + case "shot_name": return "shotName"; + case "remarks": return "remarks"; + case "org_desc": return "orgDesc"; + case "org_type": return "orgType"; + case "org_code": return "orgCode"; + case "org_name": return "orgName"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + if(modifyTime==null){ + return new Date(); + }else{ + return this.modifyTime; + } + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + if(creationTime == null){ + return new Date(); + }else{ + return this.creationTime; + } + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Integer getIsShow() { + return this.isShow; + } + + /** **/ + public void setIsShow(Integer isShow) { + this.isShow = isShow; + } + + /** **/ + public String getParentIds() { + return this.parentIds; + } + + /** **/ + public void setParentIds(String parentIds) { + this.parentIds = parentIds; + } + + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + /** **/ + public String getShotName() { + return this.shotName; + } + + /** **/ + public void setShotName(String shotName) { + this.shotName = shotName; + } + + /** **/ + public String getRemarks() { + return this.remarks; + } + + /** **/ + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + /** **/ + public Integer getOrgDesc() { + return this.orgDesc; + } + + /** **/ + public void setOrgDesc(Integer orgDesc) { + this.orgDesc = orgDesc; + } + + /** **/ + public String getOrgType() { + return this.orgType; + } + + /** **/ + public void setOrgType(String orgType) { + this.orgType = orgType; + } + + /** **/ + public String getOrgCode() { + return this.orgCode; + } + + /** **/ + public void setOrgCode(String orgCode) { + this.orgCode = orgCode; + } + + /** **/ + public String getOrgName() { + return this.orgName; + } + + /** **/ + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + + public String getSsoId() { + return ssoId; + } + + public void setSsoId(String ssoId) { + this.ssoId = ssoId; + } + + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUsId() { + return usId; + } + + public void setUsId(String usId) { + this.usId = usId; + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } + + public String getSsoOrgId() { + return ssoOrgId; + } + + public void setSsoOrgId(String ssoOrgId) { + this.ssoOrgId = ssoOrgId; + } + + public List getParentIdsList() { + return parentIdsList; + } + + public void setParentIdsList(List parentIdsList) { + this.parentIdsList = parentIdsList; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleEO.java new file mode 100644 index 00000000..5fe48c07 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleEO.java @@ -0,0 +1,301 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 功能：TS_ROLE RoleEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class RoleEO extends BaseEntity implements Serializable { + + private static final long serialVersionUID = -1386892031737294731L; + + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private String operUser; + private String extInfo; + private String remarks; + private Integer isDefault; + private Integer useFlag; + private String roleType; + private String name; + private String id; + + private String operUserName; + + private List menuEOList = new ArrayList<>(); + private List menuEOIdList = new ArrayList<>(); + + private String orgUseName; + + private Integer disableFlag; + + private Integer unlockFlag; + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • operUser -> oper_user
    • + *
  • extInfo -> ext_info
    • + *
  • remarks -> remarks
    • + *
  • isDefault -> is_default
    • + *
  • useFlag -> use_flag
    • + *
  • roleType -> role_type
    • + *
  • name -> name
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "disableFlag": return "disable_flag"; + case "unlockFlag": return "unlock_flag"; + case "operUser": return "oper_user"; + case "extInfo": return "ext_info"; + case "remarks": return "remarks"; + case "isDefault": return "is_default"; + case "useFlag": return "use_flag"; + case "roleType": return "role_type"; + case "name": return "name"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • oper_user -> operUser
    • + *
  • ext_info -> extInfo
    • + *
  • remarks -> remarks
    • + *
  • is_default -> isDefault
    • + *
  • use_flag -> useFlag
    • + *
  • role_type -> roleType
    • + *
  • name -> name
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "disable_flag": return "disableFlag"; + case "unlock_flag": return "unlockFlag"; + case "oper_user": return "operUser"; + case "ext_info": return "extInfo"; + case "remarks": return "remarks"; + case "is_default": return "isDefault"; + case "use_flag": return "useFlag"; + case "role_type": return "roleType"; + case "name": return "name"; + case "id": return "id"; + default: return null; + } + } + public RoleEO(){} + public RoleEO(Date modifyTime, Date creationTime, Integer validFlag, String operUser, String extInfo, String remarks, Integer isDefault, Integer useFlag, String roleType, String name, String id, List menuEOList, List menuEOIdList, Integer disableFlag, Integer unlockFlag) { + this.modifyTime = modifyTime; + this.creationTime = creationTime; + this.validFlag = validFlag; + this.operUser = operUser; + this.extInfo = extInfo; + this.remarks = remarks; + this.isDefault = isDefault; + this.useFlag = useFlag; + this.roleType = roleType; + this.name = name; + this.id = id; + this.menuEOList = menuEOList; + this.menuEOIdList = menuEOIdList; + this.disableFlag=disableFlag; + this.unlockFlag=unlockFlag; + } + + /** **/ + public Date getModifyTime() { + if(modifyTime==null){ + return new Date(); + }else{ + return this.modifyTime; + } + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + if(creationTime == null){ + return new Date(); + }else{ + return this.creationTime; + } + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getOperUser() { + return this.operUser; + } + + /** **/ + public void setOperUser(String operUser) { + this.operUser = operUser; + } + + public String getExtInfo() { + return extInfo; + } + + public void setExtInfo(String extInfo) { + this.extInfo = extInfo; + } + + /** **/ + public String getRemarks() { + return this.remarks; + } + + /** **/ + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + /** **/ + public Integer getIsDefault() { + return this.isDefault; + } + + /** **/ + public void setIsDefault(Integer isDefault) { + this.isDefault = isDefault; + } + + /** **/ + public Integer getUseFlag() { + return this.useFlag; + } + + /** **/ + public void setUseFlag(Integer useFlag) { + this.useFlag = useFlag; + } + + /** **/ + public String getRoleType() { + return this.roleType; + } + + /** **/ + public void setRoleType(String roleType) { + this.roleType = roleType; + } + + /** **/ + public String getName() { + return this.name; + } + + /** **/ + public void setName(String name) { + this.name = name; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public List getMenuEOList() { + return menuEOList; + } + + public void setMenuEOList(List menuEOList) { + this.menuEOList = menuEOList; + } + + public List getMenuEOIdList() { + return menuEOIdList; + } + + public void setMenuEOIdList(List menuEOIdList) { + this.menuEOIdList = menuEOIdList; + } + + public RoleEO(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public String getOperUserName() { + return operUserName; + } + + public void setOperUserName(String operUserName) { + this.operUserName = operUserName; + } + + public void setOrgUseName(String orgUseName) { + this.orgUseName =orgUseName; + } + + public String getOrgUseName(){ + return this.orgUseName; + } + + public void setDisableFlag(Integer disableFlag){ + this.disableFlag=disableFlag; + } + + public Integer getDisableFlag(){ + return this.disableFlag; + } + + public void setUnlockFlag(Integer unlockFlag){ + this.unlockFlag=unlockFlag; + } + + public Integer getUnlockFlag(){ + return this.unlockFlag; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleMenuEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleMenuEO.java new file mode 100644 index 00000000..ed79681d --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleMenuEO.java @@ -0,0 +1,67 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; + + +/** + * 功能：TS_ROLE_MENU RoleMenuEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class RoleMenuEO extends BaseEntity { + + private String menuId; + private String roleId; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • menuId -> menu_id
    • + *
  • roleId -> role_id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "menuId": return "menu_id"; + case "roleId": return "role_id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • menu_id -> menuId
    • + *
  • role_id -> roleId
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "menu_id": return "menuId"; + case "role_id": return "roleId"; + default: return null; + } + } + + /** **/ + public String getMenuId() { + return this.menuId; + } + + /** **/ + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + /** **/ + public String getRoleId() { + return this.roleId; + } + + /** **/ + public void setRoleId(String roleId) { + this.roleId = roleId; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleSarMenuEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleSarMenuEO.java new file mode 100644 index 00000000..eadfc16f --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/RoleSarMenuEO.java @@ -0,0 +1,113 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.util.List; + + +/** + * 功能：TS_ROLE_SAR_MENU RoleSarMenuEOEntity
    + * 作者：code generator
    + * 日期： 2019-02-19
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class RoleSarMenuEO extends BaseEntity { + + private String roleId; + private String sarMenuId; + private List sarMenuIds; + + private String id; + private String parentId; + private String menuName; + private String sorDivide; + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • roleId -> role_id
    • + *
  • sarMenuId -> sar_menu_id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "roleId": return "role_id"; + case "sarMenuId": return "sar_menu_id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • role_id -> roleId
    • + *
  • sar_menu_id -> sarMenuId
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "role_id": return "roleId"; + case "sar_menu_id": return "sarMenuId"; + default: return null; + } + } + + /** **/ + public String getRoleId() { + return this.roleId; + } + + /** **/ + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + /** **/ + public String getSarMenuId() { + return this.sarMenuId; + } + + /** **/ + public void setSarMenuId(String sarMenuId) { + this.sarMenuId = sarMenuId; + } + + public List getSarMenuIds() { + return sarMenuIds; + } + + public void setSarMenuIds(List sarMenuIds) { + this.sarMenuIds = sarMenuIds; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getMenuName() { + return menuName; + } + + public void setMenuName(String menuName) { + this.menuName = menuName; + } + + public String getSorDivide() { + return sorDivide; + } + + public void setSorDivide(String sorDivide) { + this.sorDivide = sorDivide; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserConfigEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserConfigEO.java new file mode 100644 index 00000000..2c56a3a5 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserConfigEO.java @@ -0,0 +1,145 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.util.Date; + +/** + * 功能：TS_USER_CONFIG UserConfigEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserConfigEO extends BaseEntity { + + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private String configContent; + private String configType; + private String userId; + private String id; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • configContent -> config_content
    • + *
  • configType -> config_type
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "configContent": return "config_content"; + case "configType": return "config_type"; + case "userId": return "user_id"; + case "id": return "id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • config_content -> configContent
    • + *
  • config_type -> configType
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "config_content": return "configContent"; + case "config_type": return "configType"; + case "user_id": return "userId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getConfigContent() { + return this.configContent; + } + + /** **/ + public void setConfigContent(String configContent) { + this.configContent = configContent; + } + + /** **/ + public String getConfigType() { + return this.configType; + } + + /** **/ + public void setConfigType(String configType) { + this.configType = configType; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java new file mode 100644 index 00000000..1337593e --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -0,0 +1,385 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 功能：TS_USER UserEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserEO extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 3658632939727891047L; + + private Integer validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private String operUser; + private String extInfo; + private String workNum; + private String email; + private String userSource; + private String uname; + private String password; + private String account; + private String usid; + // 扩展字段 + private String userType; + private String orgId; + private String orgName; + private String roleId; + private String roleName; + private List roleIdList = new ArrayList<>(); + private List roleNameList = new ArrayList<>(); + private List roleEOList = new ArrayList<>(); + private List orgIdList = new ArrayList<>(); + private List orgEOList = new ArrayList<>(); + private String mobilePhone; + private String officePhone; + private String address; + private String faxAddress; + private Integer disableFlag; + private Integer unlockFlag; + private String userInfoId; + private String orgType; + + private String ssoId; + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • validFlag -> valid_flag
    • + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • operUser -> oper_user
    • + *
  • extInfo -> ext_info
    • + *
  • workNum -> work_num
    • + *
  • email -> email
    • + *
  • userSource -> user_source
    • + *
  • uname -> uname
    • + *
  • password -> password
    • + *
  • account -> account
    • + *
  • usid -> usid
    • + */ + public static String fieldToColumn(String fieldName) { + switch (fieldName) { + case "validFlag": return "valid_flag"; + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "operUser": return "oper_user"; + case "extInfo": return "ext_info"; + case "workNum": return "work_num"; + case "email": return "email"; + case "userSource": return "user_source"; + case "unlockFlag": return "unlock_flag"; + case "uname": return "uname"; + case "password": return "password"; + case "account": return "account"; + case "usid": return "usid"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • valid_flag -> validFlag
    • + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • oper_user -> operUser
    • + *
  • ext_info -> extInfo
    • + *
  • work_num -> workNum
    • + *
  • email -> email
    • + *
  • user_source -> userSource
    • + *
  • uname -> uname
    • + *
  • password -> password
    • + *
  • account -> account
    • + *
  • usid -> usid
    • + */ + public static String columnToField(String columnName) { + switch (columnName) { + case "valid_flag": return "validFlag"; + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "oper_user": return "operUser"; + case "ext_info": return "extInfo"; + case "work_num": return "workNum"; + case "email": return "email"; + case "user_source": return "userSource"; + case "unlock_flag": return "unlockFlag"; + case "uname": return "uname"; + case "password": return "password"; + case "account": return "account"; + case "usid": return "usid"; + default: return null; + } + } + + public Integer getValidFlag() { + return validFlag; + } + + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public Date getModifyTime() { + if(modifyTime==null){ + return new Date(); + }else{ + return modifyTime; + } + + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Date getCreationTime() { + if(creationTime == null){ + return new Date(); + }else{ + return creationTime; + } + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public String getOperUser() { + return operUser; + } + + public void setOperUser(String operUser) { + this.operUser = operUser; + } + + public String getExtInfo() { + return extInfo; + } + + public void setExtInfo(String extInfo) { + this.extInfo = extInfo; + } + + public String getWorkNum() { + return workNum; + } + + public void setWorkNum(String workNum) { + this.workNum = workNum; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getUserSource() { + return userSource; + } + + public void setUserSource(String userSource) { + this.userSource = userSource; + } + + public String getUname() { + return uname; + } + + public void setUname(String uname) { + this.uname = uname; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getUsid() { + return usid; + } + + public void setUsid(String usid) { + this.usid = usid; + } + + public List getRoleIdList() { + return roleIdList; + } + + public void setRoleIdList(List roleIdList) { + this.roleIdList = roleIdList; + } + + public List getRoleEOList() { + return roleEOList; + } + + public void setRoleEOList(List roleEOList) { + this.roleEOList = roleEOList; + } + + public List getOrgIdList() { + return orgIdList; + } + + public void setOrgIdList(List orgIdList) { + this.orgIdList = orgIdList; + } + + public List getOrgEOList() { + return orgEOList; + } + + public void setOrgEOList(List orgEOList) { + this.orgEOList = orgEOList; + } + + public void setUserType(String userType){ + this.userType=userType; + } + + public String getUserType(){ + return this.userType; + } + + public void setOrgName(String orgName){ + this.orgName=orgName; + } + + public String getOrgName(){ + return this.orgName; + } + + public void setOrgId(String orgId){ + this.orgId=orgId; + } + + public String getOrgId(){ + return orgId; + } + + public void setRoleId(String roleId){ + this.roleId=roleId; + } + + public String getRoleId(){ + return this.roleId; + } + + public void setMobilePhone(String mobilePhone){ + this.mobilePhone=mobilePhone; + } + + public String getMobilePhone(){ + return this.mobilePhone; + } + + public void setOfficePhone(String officePhone){ + this.officePhone=officePhone; + } + public String getOfficePhone(){ + return this.officePhone; + } + + public Integer getDisableFlag() { + return disableFlag; + } + + public void setDisableFlag(Integer disableFlag) { + this.disableFlag = disableFlag; + } + + public Integer getUnlockFlag() { + return unlockFlag; + } + + public void setUnlockFlag(Integer unlockFlag) { + this.unlockFlag = unlockFlag; + } + + public void setRoleName(String roleName){ + this.roleName=roleName; + } + + public String getRoleName(){ + return this.roleName; + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getFaxAddress() { + return faxAddress; + } + + public void setFaxAddress(String faxAddress) { + this.faxAddress = faxAddress; + } + + public String getUserInfoId() { + return userInfoId; + } + + public void setUserInfoId(String userInfoId) { + this.userInfoId = userInfoId; + } + + public String getSsoId() { + return ssoId; + } + + public void setSsoId(String ssoId) { + this.ssoId = ssoId; + } + + public List getRoleNameList() { + return roleNameList; + } + + public void setRoleNameList(List roleNameList) { + this.roleNameList = roleNameList; + } + + public String getOrgType() { + return orgType; + } + + public void setOrgType(String orgType) { + this.orgType = orgType; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserInfoEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserInfoEO.java new file mode 100644 index 00000000..568b8509 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserInfoEO.java @@ -0,0 +1,389 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：TS_USER_INFO UserInfoEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserInfoEO extends BaseEntity { + + //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + //@org.springframework.format.annotation.DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + + private Date creationTime; + private Integer validFlag; + private String signature; + private String faxAddress; + private String address; + private Integer gender; + private String partPost; + private String assistantPost; + private String mainPost; + private String mobilePhone; + private String officePhone; + private String userPic; + private String duty; + private String userId; + private String id; + // 追加字段 + private String account; + private String uName; + private String email; + private String orgName; + private String userInfoId; + private String configType; + private String configContent; + // 追加 + private String userRole; + + public String getUserRole() { + return userRole; + } + + public void setUserRole(String userRole) { + this.userRole = userRole; + } + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • signature -> signature
    • + *
  • faxAddress -> fax_address
    • + *
  • address -> address
    • + *
  • gender -> gender
    • + *
  • partPost -> part_post
    • + *
  • assistantPost -> assistant_post
    • + *
  • mainPost -> main_post
    • + *
  • mobilePhone -> mobile_phone
    • + *
  • officePhone -> office_phone
    • + *
  • userPic -> user_pic
    • + *
  • duty -> duty
    • + *
  • userId -> user_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": + return "modify_time"; + case "creationTime": + return "creation_time"; + case "validFlag": + return "valid_flag"; + case "signature": + return "signature"; + case "faxAddress": + return "fax_address"; + case "address": + return "address"; + case "gender": + return "gender"; + case "partPost": + return "part_post"; + case "assistantPost": + return "assistant_post"; + case "mainPost": + return "main_post"; + case "mobilePhone": + return "mobile_phone"; + case "officePhone": + return "office_phone"; + case "userPic": + return "user_pic"; + case "duty": + return "duty"; + case "userId": + return "user_id"; + case "id": + return "id"; + default: + return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • signature -> signature
    • + *
  • fax_address -> faxAddress
    • + *
  • address -> address
    • + *
  • gender -> gender
    • + *
  • part_post -> partPost
    • + *
  • assistant_post -> assistantPost
    • + *
  • main_post -> mainPost
    • + *
  • mobile_phone -> mobilePhone
    • + *
  • office_phone -> officePhone
    • + *
  • user_pic -> userPic
    • + *
  • duty -> duty
    • + *
  • user_id -> userId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": + return "modifyTime"; + case "creation_time": + return "creationTime"; + case "valid_flag": + return "validFlag"; + case "signature": + return "signature"; + case "fax_address": + return "faxAddress"; + case "address": + return "address"; + case "gender": + return "gender"; + case "part_post": + return "partPost"; + case "assistant_post": + return "assistantPost"; + case "main_post": + return "mainPost"; + case "mobile_phone": + return "mobilePhone"; + case "office_phone": + return "officePhone"; + case "user_pic": + return "userPic"; + case "duty": + return "duty"; + case "user_id": + return "userId"; + case "id": + return "id"; + default: + return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public String getSignature() { + return signature; + } + + public void setSignature(String signature) { + this.signature = signature; + } + + /** **/ + public String getFaxAddress() { + return this.faxAddress; + } + + /** **/ + public void setFaxAddress(String faxAddress) { + this.faxAddress = faxAddress; + } + + /** **/ + public String getAddress() { + return this.address; + } + + /** **/ + public void setAddress(String address) { + this.address = address; + } + + /** **/ + public Integer getGender() { + return this.gender; + } + + /** **/ + public void setGender(Integer gender) { + this.gender = gender; + } + + /** **/ + public String getPartPost() { + return this.partPost; + } + + /** **/ + public void setPartPost(String partPost) { + this.partPost = partPost; + } + + /** **/ + public String getAssistantPost() { + return this.assistantPost; + } + + /** **/ + public void setAssistantPost(String assistantPost) { + this.assistantPost = assistantPost; + } + + /** **/ + public String getMainPost() { + return this.mainPost; + } + + /** **/ + public void setMainPost(String mainPost) { + this.mainPost = mainPost; + } + + /** **/ + public String getMobilePhone() { + return this.mobilePhone; + } + + /** **/ + public void setMobilePhone(String mobilePhone) { + this.mobilePhone = mobilePhone; + } + + /** **/ + public String getOfficePhone() { + return this.officePhone; + } + + /** **/ + public void setOfficePhone(String officePhone) { + this.officePhone = officePhone; + } + + /** **/ + public String getUserPic() { + return this.userPic; + } + + /** **/ + public void setUserPic(String userPic) { + this.userPic = userPic; + } + + /** **/ + public String getDuty() { + return this.duty; + } + + /** **/ + public void setDuty(String duty) { + this.duty = duty; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getuName() { + return uName; + } + + public void setuName(String uName) { + this.uName = uName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getUserInfoId() { + return userInfoId; + } + + public void setUserInfoId(String userInfoId) { + this.userInfoId = userInfoId; + } + + public String getConfigType() { + return configType; + } + + public void setConfigType(String configType) { + this.configType = configType; + } + + public String getConfigContent() { + return configContent; + } + + public void setConfigContent(String configContent) { + this.configContent = configContent; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserOrgEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserOrgEO.java new file mode 100644 index 00000000..2f13cc34 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserOrgEO.java @@ -0,0 +1,67 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; + + +/** + * 功能：TS_USER_ORG UserOrgEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserOrgEO extends BaseEntity { + + private String orgId; + private String userId; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • orgId -> org_id
    • + *
  • userId -> user_id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "orgId": return "org_id"; + case "userId": return "user_id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • org_id -> orgId
    • + *
  • user_id -> userId
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "org_id": return "orgId"; + case "user_id": return "userId"; + default: return null; + } + } + + /** **/ + public String getOrgId() { + return this.orgId; + } + + /** **/ + public void setOrgId(String orgId) { + this.orgId = orgId; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserRoleEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserRoleEO.java new file mode 100644 index 00000000..ff52a4f5 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserRoleEO.java @@ -0,0 +1,67 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; + + +/** + * 功能：TS_USER_ROLE UserRoleEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserRoleEO extends BaseEntity { + + private String roleId; + private String userId; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • roleId -> role_id
    • + *
  • userId -> user_id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "roleId": return "role_id"; + case "userId": return "user_id"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • role_id -> roleId
    • + *
  • user_id -> userId
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "role_id": return "roleId"; + case "user_id": return "userId"; + default: return null; + } + } + + /** **/ + public String getRoleId() { + return this.roleId; + } + + /** **/ + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + /** **/ + public String getUserId() { + return this.userId; + } + + /** **/ + public void setUserId(String userId) { + this.userId = userId; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/WarnTimeEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/WarnTimeEO.java new file mode 100644 index 00000000..d50deb15 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/WarnTimeEO.java @@ -0,0 +1,67 @@ +package com.adc.da.sys.entity; + +import com.adc.da.base.entity.BaseEntity; + + +/** + * 功能：TS_WARN_TIME WarnTimeEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class WarnTimeEO extends BaseEntity { + + private String id; + private String warnType; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • warnType -> warn_type
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "id": return "id"; + case "warnType": return "warn_type"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • warn_type -> warnType
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "id": return "id"; + case "warn_type": return "warnType"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getWarnType() { + return this.warnType; + } + + /** **/ + public void setWarnType(String warnType) { + this.warnType = warnType; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/FeedbackInfoEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/FeedbackInfoEOPage.java new file mode 100644 index 00000000..9f56027e --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/FeedbackInfoEOPage.java @@ -0,0 +1,222 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_FEEDBACK_INFO FeedbackInfoEOPage
    + * 作者：code generator
    + * 日期： 2018-09-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class FeedbackInfoEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String userId; + private String userIdOperator = "="; + private String feedbackInfo; + private String feedbackInfoOperator = "="; + private String readFlag; + private String readFlagOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + +// 附加字段 + private String uname; + private String orgType; + private String[] idlist; + private String contentText; + private String selfId; + + public String getContentText() { + return contentText; + } + + public void setContentText(String contentText) { + this.contentText = contentText; + } + + public String[] getIdlist() { + return idlist; + } + + public void setIdlist(String[] idlist) { + this.idlist = idlist; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getFeedbackInfo() { + return this.feedbackInfo; + } + + public void setFeedbackInfo(String feedbackInfo) { + this.feedbackInfo = feedbackInfo; + } + + public String getFeedbackInfoOperator() { + return this.feedbackInfoOperator; + } + + public void setFeedbackInfoOperator(String feedbackInfoOperator) { + this.feedbackInfoOperator = feedbackInfoOperator; + } + + public String getReadFlag() { + return this.readFlag; + } + + public void setReadFlag(String readFlag) { + this.readFlag = readFlag; + } + + public String getReadFlagOperator() { + return this.readFlagOperator; + } + + public void setReadFlagOperator(String readFlagOperator) { + this.readFlagOperator = readFlagOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getUname() { + return uname; + } + + public void setUname(String uname) { + this.uname = uname; + } + + public String getOrgType() { + return orgType; + } + + public void setOrgType(String orgType) { + this.orgType = orgType; + } + + public String getSelfId() { + return selfId; + } + + public void setSelfId(String selfId) { + this.selfId = selfId; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/LinkInfoEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/LinkInfoEOPage.java new file mode 100644 index 00000000..05143943 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/LinkInfoEOPage.java @@ -0,0 +1,212 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_LINK_INFO LinkInfoEOPage
    + * 作者：code generator
    + * 日期： 2020-01-13
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class LinkInfoEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String webName; + private String webNameOperator = "="; + private String oldWebSite; + private String oldWebSiteOperator = "="; + private String newWebSite; + private String newWebSiteOperator = "="; + private String displaySeq; + private String displaySeqOperator = "="; + private String isShow; + private String isShowOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getWebName() { + return this.webName; + } + + public void setWebName(String webName) { + this.webName = webName; + } + + public String getWebNameOperator() { + return this.webNameOperator; + } + + public void setWebNameOperator(String webNameOperator) { + this.webNameOperator = webNameOperator; + } + + public String getOldWebSite() { + return this.oldWebSite; + } + + public void setOldWebSite(String oldWebSite) { + this.oldWebSite = oldWebSite; + } + + public String getOldWebSiteOperator() { + return this.oldWebSiteOperator; + } + + public void setOldWebSiteOperator(String oldWebSiteOperator) { + this.oldWebSiteOperator = oldWebSiteOperator; + } + + public String getNewWebSite() { + return this.newWebSite; + } + + public void setNewWebSite(String newWebSite) { + this.newWebSite = newWebSite; + } + + public String getNewWebSiteOperator() { + return this.newWebSiteOperator; + } + + public void setNewWebSiteOperator(String newWebSiteOperator) { + this.newWebSiteOperator = newWebSiteOperator; + } + + public String getDisplaySeq() { + return this.displaySeq; + } + + public void setDisplaySeq(String displaySeq) { + this.displaySeq = displaySeq; + } + + public String getDisplaySeqOperator() { + return this.displaySeqOperator; + } + + public void setDisplaySeqOperator(String displaySeqOperator) { + this.displaySeqOperator = displaySeqOperator; + } + + public String getIsShow() { + return this.isShow; + } + + public void setIsShow(String isShow) { + this.isShow = isShow; + } + + public String getIsShowOperator() { + return this.isShowOperator; + } + + public void setIsShowOperator(String isShowOperator) { + this.isShowOperator = isShowOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/LoginInfoEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/LoginInfoEOPage.java new file mode 100644 index 00000000..71e18577 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/LoginInfoEOPage.java @@ -0,0 +1,176 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_LOGIN_INFO LoginInfoEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class LoginInfoEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String loginAddress; + private String loginAddressOperator = "="; + private String loginTime; + private String loginTime1; + private String loginTime2; + private String loginTimeOperator = "="; + private String userId; + private String userIdOperator = "="; + private String id; + private String idOperator = "="; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getLoginAddress() { + return this.loginAddress; + } + + public void setLoginAddress(String loginAddress) { + this.loginAddress = loginAddress; + } + + public String getLoginAddressOperator() { + return this.loginAddressOperator; + } + + public void setLoginAddressOperator(String loginAddressOperator) { + this.loginAddressOperator = loginAddressOperator; + } + + public String getLoginTime() { + return this.loginTime; + } + + public void setLoginTime(String loginTime) { + this.loginTime = loginTime; + } + + public String getLoginTime1() { + return this.loginTime1; + } + + public void setLoginTime1(String loginTime1) { + this.loginTime1 = loginTime1; + } + + public String getLoginTime2() { + return this.loginTime2; + } + + public void setLoginTime2(String loginTime2) { + this.loginTime2 = loginTime2; + } + + public String getLoginTimeOperator() { + return this.loginTimeOperator; + } + + public void setLoginTimeOperator(String loginTimeOperator) { + this.loginTimeOperator = loginTimeOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleEOPage.java new file mode 100644 index 00000000..606d6a43 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleEOPage.java @@ -0,0 +1,248 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_ROLE RoleEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class RoleEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String operUser; + private String operUserOperator = "="; + private String extInfo; + private String extInfoOperator = "="; + private String remarks; + private String remarksOperator = "="; + private String isDefault; + private String isDefaultOperator = "="; + private String useFlag; + private String useFlagOperator = "="; + private String roleType; + private String roleTypeOperator = "="; + private String name; + private String nameOperator = "="; + private String id; + private String idOperator = "="; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getOperUser() { + return this.operUser; + } + + public void setOperUser(String operUser) { + this.operUser = operUser; + } + + public String getOperUserOperator() { + return this.operUserOperator; + } + + public void setOperUserOperator(String operUserOperator) { + this.operUserOperator = operUserOperator; + } + + public String getExtInfo() { + return extInfo; + } + + public void setExtInfo(String extInfo) { + this.extInfo = extInfo; + } + + public String getExtInfoOperator() { + return this.extInfoOperator; + } + + public void setExtInfoOperator(String extInfoOperator) { + this.extInfoOperator = extInfoOperator; + } + + public String getRemarks() { + return this.remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getRemarksOperator() { + return this.remarksOperator; + } + + public void setRemarksOperator(String remarksOperator) { + this.remarksOperator = remarksOperator; + } + + public String getIsDefault() { + return this.isDefault; + } + + public void setIsDefault(String isDefault) { + this.isDefault = isDefault; + } + + public String getIsDefaultOperator() { + return this.isDefaultOperator; + } + + public void setIsDefaultOperator(String isDefaultOperator) { + this.isDefaultOperator = isDefaultOperator; + } + + public String getUseFlag() { + return this.useFlag; + } + + public void setUseFlag(String useFlag) { + this.useFlag = useFlag; + } + + public String getUseFlagOperator() { + return this.useFlagOperator; + } + + public void setUseFlagOperator(String useFlagOperator) { + this.useFlagOperator = useFlagOperator; + } + + public String getRoleType() { + return this.roleType; + } + + public void setRoleType(String roleType) { + this.roleType = roleType; + } + + public String getRoleTypeOperator() { + return this.roleTypeOperator; + } + + public void setRoleTypeOperator(String roleTypeOperator) { + this.roleTypeOperator = roleTypeOperator; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNameOperator() { + return this.nameOperator; + } + + public void setNameOperator(String nameOperator) { + this.nameOperator = nameOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleMenuEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleMenuEOPage.java new file mode 100644 index 00000000..e221950b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleMenuEOPage.java @@ -0,0 +1,51 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + + +/** + * 功能：TS_ROLE_MENU RoleMenuEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class RoleMenuEOPage extends BasePage { + + private String menuId; + private String menuIdOperator = "="; + private String roleId; + private String roleIdOperator = "="; + + public String getMenuId() { + return this.menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getMenuIdOperator() { + return this.menuIdOperator; + } + + public void setMenuIdOperator(String menuIdOperator) { + this.menuIdOperator = menuIdOperator; + } + + public String getRoleId() { + return this.roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getRoleIdOperator() { + return this.roleIdOperator; + } + + public void setRoleIdOperator(String roleIdOperator) { + this.roleIdOperator = roleIdOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleSarMenuEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleSarMenuEOPage.java new file mode 100644 index 00000000..f042a0db --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/RoleSarMenuEOPage.java @@ -0,0 +1,51 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + + +/** + * 功能：TS_ROLE_SAR_MENU RoleSarMenuEOPage
    + * 作者：code generator
    + * 日期： 2019-02-19
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class RoleSarMenuEOPage extends BasePage { + + private String roleId; + private String roleIdOperator = "="; + private String sarMenuId; + private String sarMenuIdOperator = "="; + + public String getRoleId() { + return this.roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getRoleIdOperator() { + return this.roleIdOperator; + } + + public void setRoleIdOperator(String roleIdOperator) { + this.roleIdOperator = roleIdOperator; + } + + public String getSarMenuId() { + return this.sarMenuId; + } + + public void setSarMenuId(String sarMenuId) { + this.sarMenuId = sarMenuId; + } + + public String getSarMenuIdOperator() { + return this.sarMenuIdOperator; + } + + public void setSarMenuIdOperator(String sarMenuIdOperator) { + this.sarMenuIdOperator = sarMenuIdOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/UserConfigEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserConfigEOPage.java new file mode 100644 index 00000000..b75bc19d --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserConfigEOPage.java @@ -0,0 +1,176 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_USER_CONFIG UserConfigEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserConfigEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String configContent; + private String configContentOperator = "="; + private String configType; + private String configTypeOperator = "="; + private String userId; + private String userIdOperator = "="; + private String id; + private String idOperator = "="; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getConfigContent() { + return this.configContent; + } + + public void setConfigContent(String configContent) { + this.configContent = configContent; + } + + public String getConfigContentOperator() { + return this.configContentOperator; + } + + public void setConfigContentOperator(String configContentOperator) { + this.configContentOperator = configContentOperator; + } + + public String getConfigType() { + return this.configType; + } + + public void setConfigType(String configType) { + this.configType = configType; + } + + public String getConfigTypeOperator() { + return this.configTypeOperator; + } + + public void setConfigTypeOperator(String configTypeOperator) { + this.configTypeOperator = configTypeOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/UserEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserEOPage.java new file mode 100644 index 00000000..0915cc94 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserEOPage.java @@ -0,0 +1,256 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + + +/** + * 功能：TS_USER UserEOPage
    + * 作者：code generator
    + * 日期： 2017-11-06
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserEOPage extends BasePage { + + private String usid; + private String usidOperator = "="; + private String account; + private String accountOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String password; + private String passwordOperator = "="; + private String uname; + private String unameOperator = "like"; + private String roleName; + private String roleNameOperator = "like"; + private String roleId; + private String roleIdOperator = "="; + private String orgName; + private String orgNameOperator = "="; + private String workNum; + private String workNumOperator ="="; + private String orgId; + private String orgIdOperator = "="; + private String disableFlag; + private String disableFlagOperator = "="; + private String unlockFlag; + private String unlockFLagOperator = "="; + private String userType; + private String userTypeOperator = "="; + private boolean disAdmin=true; + + + + public String getUsid() { + return this.usid; + } + + public void setUsid(String usid) { + this.usid = usid; + } + + public String getUsidOperator() { + return this.usidOperator; + } + + public void setUsidOperator(String usidOperator) { + this.usidOperator = usidOperator; + } + + public String getAccount() { + return this.account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAccountOperator() { + return this.accountOperator; + } + + public void setAccountOperator(String accountOperator) { + this.accountOperator = accountOperator; + } + + public String getValidFlag() { + return validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getPassword() { + return this.password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getPasswordOperator() { + return this.passwordOperator; + } + + public void setPasswordOperator(String passwordOperator) { + this.passwordOperator = passwordOperator; + } + + public String getUname() { + return uname; + } + + public void setUname(String uname) { + this.uname = uname; + } + + public String getUnameOperator() { + return this.unameOperator; + } + + public void setUnameOperator(String uameOperator) { + this.unameOperator = unameOperator; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getOrgNameOperator() { + return orgNameOperator; + } + + public void setOrgNameOperator(String orgNameOperator) { + this.orgNameOperator = orgNameOperator; + } + + public String getWorkNum() { + return workNum; + } + + public void setWorkNum(String workNum) { + this.workNum = workNum; + } + + public String getWorkNumOperator() { + return workNumOperator; + } + + public void setWorkNumOperator(String workNumOperator) { + this.workNumOperator = workNumOperator; + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getRoleIdOperator() { + return roleIdOperator; + } + + public void setRoleIdOperator(String roleIdOperator) { + this.roleIdOperator = roleIdOperator; + } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } + + public void setDisableFlag(String disableFlag){ + this.disableFlag=disableFlag; + } + + public String getDisableFlag(){ + return this.disableFlag; + } + + public void setDisableFlagOperator(String disableFlagOperator){ + this.disableFlagOperator=disableFlagOperator; + } + + public String getDisableFlagOperator(){ + return this.disableFlagOperator; + } + + public void setUnlockFlag(String unlockFlag){ + this.unlockFlag = unlockFlag; + } + + public String getUnlockFlag(){ + return this.unlockFlag; + } + + public void setUnlockFLagOperator(String unlockFLagOperator){ + this.unlockFLagOperator =unlockFLagOperator; + } + + public String getUnlockFLagOperator(){ + return this.unlockFLagOperator; + } + + public void setUserType(String userType){ + this.userType=userType; + } + public String getUserType(){ + return this.userType; + } + + public String getUserTypeOperator(){ + return this.userTypeOperator; + } + public void setUserTypeOperator(String userTypeOperator){ + this.userTypeOperator=userTypeOperator; + } + + public void setRoleNameOperator(String roleNameOperator){ + this.roleNameOperator=roleNameOperator; + } + public String getRoleNameOperator(){ + return this.roleNameOperator; + } + + public void setOrgId(String orgId){ + this.orgId=orgId; + } + + public String getOrgId(){ + return this.orgId; + } + + public String getOrgIdOperator() { + return orgIdOperator; + } + + public void setOrgIdOperator(String orgIdOperator) { + this.orgIdOperator = orgIdOperator; + } + + public boolean isDisAdmin() { + return disAdmin; + } + + public void setDisAdmin(boolean disAdmin) { + this.disAdmin = disAdmin; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/UserInfoEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserInfoEOPage.java new file mode 100644 index 00000000..ef8e60a0 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserInfoEOPage.java @@ -0,0 +1,339 @@ +package com.adc.da.sys.page; + + +import com.adc.da.base.page.BasePage; + +/** + * 功能：TS_USER_INFO UserInfoEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserInfoEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String signature; + private String signatureOperator = "="; + private String faxAddress; + private String faxAddressOperator = "="; + private String address; + private String addressOperator = "="; + private String gender; + private String genderOperator = "="; + private String partPost; + private String partPostOperator = "="; + private String assistantPost; + private String assistantPostOperator = "="; + private String mainPost; + private String mainPostOperator = "="; + private String mobilePhone; + private String mobilePhoneOperator = "="; + private String officePhone; + private String officePhoneOperator = "="; + private String userPic; + private String userPicOperator = "="; + private String duty; + private String dutyOperator = "="; + private String userId; + private String userIdOperator = "="; + private String id; + private String idOperator = "="; + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getSignature() { + return this.signature; + } + + public void setSignature(String signature) { + this.signature = signature; + } + + public String getSignatureOperator() { + return this.signatureOperator; + } + + public void setSignatureOperator(String signatureOperator) { + this.signatureOperator = signatureOperator; + } + + public String getFaxAddress() { + return this.faxAddress; + } + + public void setFaxAddress(String faxAddress) { + this.faxAddress = faxAddress; + } + + public String getFaxAddressOperator() { + return this.faxAddressOperator; + } + + public void setFaxAddressOperator(String faxAddressOperator) { + this.faxAddressOperator = faxAddressOperator; + } + + public String getAddress() { + return this.address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getAddressOperator() { + return this.addressOperator; + } + + public void setAddressOperator(String addressOperator) { + this.addressOperator = addressOperator; + } + + public String getGender() { + return this.gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderOperator() { + return this.genderOperator; + } + + public void setGenderOperator(String genderOperator) { + this.genderOperator = genderOperator; + } + + public String getPartPost() { + return this.partPost; + } + + public void setPartPost(String partPost) { + this.partPost = partPost; + } + + public String getPartPostOperator() { + return this.partPostOperator; + } + + public void setPartPostOperator(String partPostOperator) { + this.partPostOperator = partPostOperator; + } + + public String getAssistantPost() { + return this.assistantPost; + } + + public void setAssistantPost(String assistantPost) { + this.assistantPost = assistantPost; + } + + public String getAssistantPostOperator() { + return this.assistantPostOperator; + } + + public void setAssistantPostOperator(String assistantPostOperator) { + this.assistantPostOperator = assistantPostOperator; + } + + public String getMainPost() { + return this.mainPost; + } + + public void setMainPost(String mainPost) { + this.mainPost = mainPost; + } + + public String getMainPostOperator() { + return this.mainPostOperator; + } + + public void setMainPostOperator(String mainPostOperator) { + this.mainPostOperator = mainPostOperator; + } + + public String getMobilePhone() { + return this.mobilePhone; + } + + public void setMobilePhone(String mobilePhone) { + this.mobilePhone = mobilePhone; + } + + public String getMobilePhoneOperator() { + return this.mobilePhoneOperator; + } + + public void setMobilePhoneOperator(String mobilePhoneOperator) { + this.mobilePhoneOperator = mobilePhoneOperator; + } + + public String getOfficePhone() { + return this.officePhone; + } + + public void setOfficePhone(String officePhone) { + this.officePhone = officePhone; + } + + public String getOfficePhoneOperator() { + return this.officePhoneOperator; + } + + public void setOfficePhoneOperator(String officePhoneOperator) { + this.officePhoneOperator = officePhoneOperator; + } + + public String getUserPic() { + return this.userPic; + } + + public void setUserPic(String userPic) { + this.userPic = userPic; + } + + public String getUserPicOperator() { + return this.userPicOperator; + } + + public void setUserPicOperator(String userPicOperator) { + this.userPicOperator = userPicOperator; + } + + public String getDuty() { + return this.duty; + } + + public void setDuty(String duty) { + this.duty = duty; + } + + public String getDutyOperator() { + return this.dutyOperator; + } + + public void setDutyOperator(String dutyOperator) { + this.dutyOperator = dutyOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/UserOrgEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserOrgEOPage.java new file mode 100644 index 00000000..b8222422 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserOrgEOPage.java @@ -0,0 +1,51 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + + +/** + * 功能：TS_USER_ORG UserOrgEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserOrgEOPage extends BasePage { + + private String orgId; + private String orgIdOperator = "="; + private String userId; + private String userIdOperator = "="; + + public String getOrgId() { + return this.orgId; + } + + public void setOrgId(String orgId) { + this.orgId = orgId; + } + + public String getOrgIdOperator() { + return this.orgIdOperator; + } + + public void setOrgIdOperator(String orgIdOperator) { + this.orgIdOperator = orgIdOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/UserRoleEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserRoleEOPage.java new file mode 100644 index 00000000..4bf046fc --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/UserRoleEOPage.java @@ -0,0 +1,51 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + + +/** + * 功能：TS_USER_ROLE UserRoleEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class UserRoleEOPage extends BasePage { + + private String roleId; + private String roleIdOperator = "="; + private String userId; + private String userIdOperator = "="; + + public String getRoleId() { + return this.roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getRoleIdOperator() { + return this.roleIdOperator; + } + + public void setRoleIdOperator(String roleIdOperator) { + this.roleIdOperator = roleIdOperator; + } + + public String getUserId() { + return this.userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdOperator() { + return this.userIdOperator; + } + + public void setUserIdOperator(String userIdOperator) { + this.userIdOperator = userIdOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/WarnTimeEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/WarnTimeEOPage.java new file mode 100644 index 00000000..8ec99ef1 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/WarnTimeEOPage.java @@ -0,0 +1,51 @@ +package com.adc.da.sys.page; + +import com.adc.da.base.page.BasePage; + + +/** + * 功能：TS_WARN_TIME WarnTimeEOPage
    + * 作者：code generator
    + * 日期： 2018-09-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class WarnTimeEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String warnType; + private String warnTypeOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getWarnType() { + return this.warnType; + } + + public void setWarnType(String warnType) { + this.warnType = warnType; + } + + public String getWarnTypeOperator() { + return this.warnTypeOperator; + } + + public void setWarnTypeOperator(String warnTypeOperator) { + this.warnTypeOperator = warnTypeOperator; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IFeedbackInfoEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IFeedbackInfoEOService.java new file mode 100644 index 00000000..50159a28 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IFeedbackInfoEOService.java @@ -0,0 +1,17 @@ +package com.adc.da.sys.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.sys.entity.FeedbackInfoEO; +import com.adc.da.sys.page.FeedbackInfoEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IFeedbackInfoEOService extends IService { + + public List queryByPage(FeedbackInfoEOPage page); + + public List queryByList(FeedbackInfoEOPage page); + + public ResponseMessage deleteByPrimaryKeyList(FeedbackInfoEOPage page); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/ILinkInfoEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/ILinkInfoEOService.java new file mode 100644 index 00000000..9f241bda --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/ILinkInfoEOService.java @@ -0,0 +1,16 @@ +package com.adc.da.sys.service; + +import com.adc.da.sys.entity.LinkInfoEO; +import com.adc.da.sys.page.LinkInfoEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface ILinkInfoEOService extends IService { + + public List queryByPage(LinkInfoEOPage page); + + public List queryByList(LinkInfoEOPage page); + + public int deleteByIds(List idList); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/ILoginInfoEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/ILoginInfoEOService.java new file mode 100644 index 00000000..b4fcf380 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/ILoginInfoEOService.java @@ -0,0 +1,18 @@ +package com.adc.da.sys.service; + +import com.adc.da.sys.entity.LoginInfoEO; +import com.adc.da.sys.page.LoginInfoEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface ILoginInfoEOService extends IService { + + public List queryByPage(LoginInfoEOPage page); + + public List queryByList(LoginInfoEOPage page); + + public int saveBean(LoginInfoEO loginInfoEO); + + public int count(); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IMenuEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IMenuEOService.java new file mode 100644 index 00000000..7622c495 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IMenuEOService.java @@ -0,0 +1,32 @@ +package com.adc.da.sys.service; + +import com.adc.da.sys.entity.MenuEO; +import com.adc.da.sys.page.MenuEOPage; +import com.adc.da.sys.vo.MenuVO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IMenuEOService extends IService { + + public List queryByList(MenuEOPage page); + + public MenuEO insertMenu(MenuEO menuEO); + + public void updateMenu(MenuVO menuVO); + + public void delete(String[] ids); + + public List listMenuEOByUserId(String userId); + + public List findAll(); + + public boolean isBelong(String roleId, String menuId); + + public List listMenuEOByRoleId(String roleId); + + public List queryByAllMenu(MenuEOPage page); + + public MenuEO creatMenu(MenuEO menuEO); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IOrgEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IOrgEOService.java new file mode 100644 index 00000000..6637d2da --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IOrgEOService.java @@ -0,0 +1,78 @@ +package com.adc.da.sys.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.sys.entity.OrgEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.page.OrgEOPage; +import com.adc.da.sys.vo.UserVO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.LinkedList; +import java.util.List; + +public interface IOrgEOService extends IService { + + + public List listOrgEOByOrgName(String orgName); + + public OrgEO getOrgEOByNameAndPid(String orgName, String pId); + + public List getOrgEOByPid(String pId); + + public ResponseMessage saveBean(OrgEO orgEO); + + public OrgEO getOrgEOById(String id); + + public ResponseMessage delete(String id); + + public LinkedList selectOrgAllNode(); + + public List getChildDept(String orgId); + + public LinkedList getTree(); + +// public void addNodes(LinkedList rootNodes, int i); + + public ResponseMessage updateBeanById(OrgEO orgEO); + + public ResponseMessage delOrgRelatedUser(String userId, String orgId); + + public ResponseMessage addOrgRelatedUser(String userOrgs); + + public int delOrgRelatedUserByUserId(String usId); + + public List findById(String id, String orgName); + + public List getTreeByRole(String roleName); + + public List getLeaderByUserId(String userId, String orgType, String roleName); + + public List getTreeByRoleAndOrgId(String roleName, String orgId); + + public List getTreeByRoleNameAndOrgId(String roleName, String orgId); + + public List getIdsByorgType(); + + public List getAllOrgbyOrgId(String orgId); + + public int getOrgNamebyOrgId(UserVO userVO); + + public List getTreeByRoleAndOrgId1(String roleName, String orgId); + + public List getTreeByRoleAndOrgId3(String roleName, UserEO userEO); + + public int getOrgbyOrgId1(String orgId); + + public List getManagerByOrgId(String roleName, String orgId); + + public List queryOrgByList(String orgName); + + public List getTreeByRole2(String roleId); + + public OrgEO getOrgInfoByOrgId(String OrgId); + + public OrgEO getOrgParentInfoOrgId(OrgEO orgEO); + + public List getOrgRootTree(); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IRoleEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IRoleEOService.java new file mode 100644 index 00000000..0a183788 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IRoleEOService.java @@ -0,0 +1,43 @@ +package com.adc.da.sys.service; + +import com.adc.da.sys.entity.RoleEO; +import com.adc.da.sys.entity.UserRoleEO; +import com.adc.da.sys.page.RoleEOPage; +import com.adc.da.sys.vo.RoleVO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IRoleEOService extends IService { + + public List queryByPage(RoleEOPage page); + + public List queryByList(RoleEOPage page); + + public int saveBean(RoleEO sysRoleEO); + + public int updateByPrimaryKeySelective(RoleEO roleEO); + + public RoleEO getRoleWithMenus(String id); + + public List getSysRoleListByUserId(String userId); + + public void delete(String roleId); + + public List findAll(RoleVO setRole); + + public List getUserRoleListByRoleId(String roleId); + + public RoleEO saveRoleMenu(RoleEO roleEO); + + public boolean isBelong(String userId, String roleId); + + public int querySectionCount(String roleId); + + public int querySectionCount1(String roleId); + + public List selectByNameAndId(String id, String name); + + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IRoleSarMenuEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IRoleSarMenuEOService.java new file mode 100644 index 00000000..b84df62a --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IRoleSarMenuEOService.java @@ -0,0 +1,23 @@ +package com.adc.da.sys.service; + +import com.adc.da.sys.entity.RoleSarMenuEO; +import com.adc.da.sys.page.RoleSarMenuEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IRoleSarMenuEOService extends IService { + + public List queryByPage(RoleSarMenuEOPage page); + + public List queryByList(RoleSarMenuEOPage page); + + public List findRoleSarMenu(String roleId); + + public String queryBusinessStandRootId(String SOR_DIVIDE); + + public List selectSarMenuRoots(); + + public int insertSubMenu (RoleSarMenuEO roleSarMenuEO); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserConfigEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserConfigEOService.java new file mode 100644 index 00000000..567b2af3 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserConfigEOService.java @@ -0,0 +1,17 @@ +package com.adc.da.sys.service; + +import com.adc.da.sys.entity.UserConfigEO; +import com.adc.da.sys.page.UserConfigEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IUserConfigEOService extends IService { + + public List queryByPage(UserConfigEOPage page); + + public List queryByList(UserConfigEOPage page); + + public int createPageConfig (String userId); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java new file mode 100644 index 00000000..1818f2d0 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java @@ -0,0 +1,73 @@ +package com.adc.da.sys.service; + +import com.adc.da.base.page.BasePage; +import com.adc.da.http.ResponseMessage; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.page.UserEOPage; +import com.adc.da.sys.vo.UserVO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IUserEOService extends IService { + + public UserEO saveBean(UserEO userEO); + + public UserEO getUserByLoginName(String userName, String usid); + + public void updatePassword(String usid, String oldPassword, String newPassword); + + public List queryUserInfoByPage(BasePage basePage); + + public void updateUserEOInfo(UserEO userEO); + + public int delete(List ids); + + public UserEO getUserWithRoles(String id); + + public UserEO getUserWithRolesAll(String id); + + public int saveUserRole(UserEO userEO); + + public UserEO saveUserOrg(UserEO userEO); + + public int updateUserOrg(UserEO userEO); + + public UserEO selectOrgByPrimaryKey(String usid); + + public UserEO selectRoleMessageByPrimaryKey(String usid); + + + public int resetPassword(String userId); + + public UserEO selectByUnameAndPwd(UserEO userEO); + + public List queryByOrg(BasePage basePage); + + public List queryByPageAndParams(UserEOPage page); + + public List findUserInfoByPage(BasePage basePage); + + public List selectThatOrgUser(String userId); + + public List queryUserEoList(UserEOPage page); + + public List queryUserInfoByWordNum(String workNum); + + public UserEO selectByPrimaryKey(String userId); + + public List getUserListByRoleName(String RoleName); + + public ResponseMessage createOrModifyIf(UserVO userVO); + + + public List getUserEOBySpecRole(String orgId, String userId); + + public List selectAllUserInfo(); + + public UserEO getOrgIdByUserId(String userId); + + public UserEO getUserByLoginNameNotDeleted(String userName); + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserInfoEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserInfoEOService.java new file mode 100644 index 00000000..3a5eb452 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserInfoEOService.java @@ -0,0 +1,21 @@ +package com.adc.da.sys.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.sys.entity.UserInfoEO; +import com.adc.da.sys.page.UserInfoEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IUserInfoEOService extends IService { + + public List queryByPage(UserInfoEOPage page); + + public List queryByList(UserInfoEOPage page); + + public UserInfoEO getUserEOAndInfoEOByUserCode(UserInfoEO userInfoEO); + + public ResponseMessage updateByUserId(UserInfoEO userInfo); + + public int updateByPrimaryKey(UserInfoEO userInfoEO); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserRoleEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserRoleEOService.java new file mode 100644 index 00000000..f9e2efac --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserRoleEOService.java @@ -0,0 +1,7 @@ +package com.adc.da.sys.service; + +import com.adc.da.sys.entity.UserRoleEO; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IUserRoleEOService extends IService { +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IWarnTimeEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IWarnTimeEOService.java new file mode 100644 index 00000000..fd16baf2 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IWarnTimeEOService.java @@ -0,0 +1,15 @@ +package com.adc.da.sys.service; + +import com.adc.da.sys.entity.WarnTimeEO; +import com.adc.da.sys.page.WarnTimeEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface IWarnTimeEOService extends IService { + + public List queryByPage(WarnTimeEOPage page); + + public List queryByList(WarnTimeEOPage page); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/FeedbackInfoEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/FeedbackInfoEOServiceImpl.java new file mode 100644 index 00000000..c7662975 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/FeedbackInfoEOServiceImpl.java @@ -0,0 +1,61 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.dao.FeedbackInfoEODao; +import com.adc.da.sys.entity.FeedbackInfoEO; +import com.adc.da.sys.page.FeedbackInfoEOPage; +import com.adc.da.sys.service.IFeedbackInfoEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + + +/** + *
    + * 功能：TS_FEEDBACK_INFO FeedbackInfoEOService
    + * 作者：code generator
    + * 日期： 2018-09-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("feedbackInfoEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +@Slf4j +public class FeedbackInfoEOServiceImpl extends ServiceImpl implements IFeedbackInfoEOService { + + + @Override + public List queryByPage(FeedbackInfoEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + @Override + public List queryByList(FeedbackInfoEOPage page) { + return this.baseMapper.queryByList(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + public ResponseMessage deleteByPrimaryKeyList(FeedbackInfoEOPage page) { + FeedbackInfoEO feedbackInfoEO = new FeedbackInfoEO(); + feedbackInfoEO.setValidFlag(1); + feedbackInfoEO.setModifyTime(new Date()); + for (String id : page.getIdlist()) { + feedbackInfoEO.setId(id); + this.baseMapper.updateById(feedbackInfoEO); + } + return Result.success("1", "删除成功", feedbackInfoEO); + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/LinkInfoEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/LinkInfoEOServiceImpl.java new file mode 100644 index 00000000..b31d6d26 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/LinkInfoEOServiceImpl.java @@ -0,0 +1,50 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.sys.dao.LinkInfoEODao; +import com.adc.da.sys.entity.LinkInfoEO; +import com.adc.da.sys.page.LinkInfoEOPage; +import com.adc.da.sys.service.ILinkInfoEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：TS_LINK_INFO LinkInfoEOService
    + * 作者：code generator
    + * 日期： 2020-01-13
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("linkInfoEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class LinkInfoEOServiceImpl extends ServiceImpl implements ILinkInfoEOService { + + + @Override + public List queryByPage(LinkInfoEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(LinkInfoEOPage page) { + return this.baseMapper.queryByList(page); + } + + public int deleteByIds(@Param("idList") List idList){ + return this.baseMapper.deleteByIds(idList); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/LoginInfoEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/LoginInfoEOServiceImpl.java new file mode 100644 index 00000000..dc03a6e3 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/LoginInfoEOServiceImpl.java @@ -0,0 +1,63 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.sys.dao.LoginInfoEODao; +import com.adc.da.sys.entity.LoginInfoEO; +import com.adc.da.sys.page.LoginInfoEOPage; +import com.adc.da.sys.service.ILoginInfoEOService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * + *
    + * 功能：TS_ROLE RoleEOService
    + * 作者：code generator
    + * 日期： 2017-11-06
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("loginInfoEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class LoginInfoEOServiceImpl extends ServiceImpl implements ILoginInfoEOService { + + @Override + public List queryByPage(LoginInfoEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(LoginInfoEOPage page) { + return this.baseMapper.queryByList(page); + } + + /** + * @Author liwenxuan + * @Description 新增 + * @Date Administrator 2018/9/26 + * @Param [sysRoleEO] + * @return int + **/ + public int saveBean(LoginInfoEO loginInfoEO) { + loginInfoEO.setId(UUIDUtils.randomUUID20()); + loginInfoEO.setCreationTime(new Date()); + loginInfoEO.setModifyTime(new Date()); + loginInfoEO.setLoginTime(new Date()); + return this.baseMapper.insert(loginInfoEO); + } + + public int count(){ + return this.baseMapper.count(); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/MenuEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/MenuEOServiceImpl.java new file mode 100644 index 00000000..0664f328 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/MenuEOServiceImpl.java @@ -0,0 +1,166 @@ +package com.adc.da.sys.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.adc.da.base.entity.TreeEntity; +import com.adc.da.base.page.BasePage; +import com.adc.da.common.ValidFlagEnum; +import com.adc.da.sys.dao.MenuEODao; +import com.adc.da.sys.entity.MenuEO; +import com.adc.da.sys.page.MenuEOPage; +import com.adc.da.sys.service.IMenuEOService; +import com.adc.da.sys.vo.MenuVO; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * + *
    + * 功能：TS_MENU MenuEOService
    + * 作者：code generator
    + * 日期： 2017-11-06
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("menuEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class MenuEOServiceImpl extends ServiceImpl implements IMenuEOService { + + + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(MenuEOPage page) { + return this.baseMapper.queryByList(page); + } + + /** + * 添加菜单 构建菜单树 + */ + public MenuEO insertMenu(MenuEO menuEO){ + menuEO.setId(UUIDUtils.randomUUID10()); + menuEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + menuEO.setCreationTime(new Date()); + menuEO.setModifyTime(new Date()); + TreeEntity parent = menuEO.getParent(); + if (parent != null) { + menuEO.setParentId(parent.getId()); + menuEO.setParentIds(parent.getParentIds() + parent.getId() + ","); + } + this.baseMapper.insert(menuEO); + return menuEO; + } + + /** + * 更新菜单 + * + * @param menuVO + * 菜单VO对象 + */ + public void updateMenu(MenuVO menuVO){ + // 处理当前节点 + // 构建菜单 + menuVO.setModifyTime(new Date()); + String oldParentId = menuVO.getParentId(); + String oldParentIds = menuVO.getParentIds(); + MenuVO parentMenu = menuVO.getParent(); + if (parentMenu != null) { + menuVO.setParentId(parentMenu.getId()); + menuVO.setParentIds(parentMenu.getParentIds() + parentMenu.getId() + ","); + } + // 处理所有的子节点 + // 1 判断父节点是否移动到其他节点 + if (oldParentId != null && !oldParentId.equals(menuVO.getParentId())) { + // 1 获取要修改的当前节点的所有子节点 + List childMenus = this.baseMapper.getChildMenus(menuVO.getId()); + // 2 修改所有子节点的ParentIds为当前节点的parentIds + parentId + for (MenuEO childMenu : childMenus) { + childMenu.setParentIds(childMenu.getParentIds().replace(oldParentIds, menuVO.getParentIds())); + // 更新到数据库 + this.baseMapper.updateById(childMenu); + } + } + // 修改当前节点 + this.baseMapper.updateById(BeanUtil.toBean(menuVO,MenuEO.class)); + + } + + /** + * 逻辑删除菜单及其子菜单，物理删除菜单及其子菜单与角色的关联 + * + * @param ids + * 待删除的所有菜单ID + */ + public void delete(String[] ids) { + this.baseMapper.deleteMenuLogic(ids); + this.baseMapper.deleteRoleMenus(ids); + } + + /** + * 获取用户的所有菜单 + * + * @param userId + * 用户ID + */ + @Transactional(readOnly = true, rollbackFor = Throwable.class) + public List listMenuEOByUserId(String userId) { + return this.baseMapper.listMenuEOByUserId(userId); + } + + /** + * 获取所有的菜单 + * + * @return 所有菜单 + */ + @Transactional(readOnly = true, rollbackFor = Throwable.class) + public List findAll() { + return this.baseMapper.findAll(); + } + + /** + * 判定菜单是否属于角色 + * + * @param roleId + * 角色ID + * @param menuId + * 菜单ID + * @return true -> 菜单属于角色 + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public boolean isBelong(String roleId, String menuId) { + int count = this.baseMapper.isBelong(roleId, menuId); + return count > 0; + } + + /** + * 获取角色对应的所有菜单 + * + * @param roleId + * 角色ID + * @return 角色对应的所有菜单 + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List listMenuEOByRoleId(String roleId) { + return this.baseMapper.listMenuEOByRoleID(roleId); + } + + public List queryByAllMenu(MenuEOPage page){ + return this.baseMapper.queryByAllMenu(page); + } + + public MenuEO creatMenu(MenuEO menuEO){ + menuEO.setId(UUIDUtils.randomUUID20()); + menuEO.setValidFlag(0); + menuEO.setCreationTime(new Date()); + menuEO.setModifyTime(new Date()); + this.baseMapper.insert(menuEO); + return menuEO; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/OrgEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/OrgEOServiceImpl.java new file mode 100644 index 00000000..d875b440 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/OrgEOServiceImpl.java @@ -0,0 +1,540 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.common.ValidFlagEnum; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.dao.OrgEODao; +import com.adc.da.sys.entity.OrgEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserOrgEO; +import com.adc.da.sys.page.UserEOPage; +import com.adc.da.sys.service.IOrgEOService; +import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.vo.UserVO; +import com.adc.da.util.UUIDUtils; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.*; + +@Service("orgEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class OrgEOServiceImpl extends ServiceImpl implements IOrgEOService { + + + List splitParentIds = null; + + + @Autowired + private IUserEOService userEOService; + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List listOrgEOByOrgName(String orgName) { + return this.baseMapper.listOrgEOByOrgName(orgName); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public OrgEO getOrgEOByNameAndPid(String orgName, String pId) { + return this.baseMapper.getOrgEOByNameAndPid(orgName, pId); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List getOrgEOByPid(String pId) { + return this.baseMapper.getOrgEOByPid(pId); + } + + /** + * @return com.adc.da.util.http.ResponseMessage + * @Author liwenxuan + * @Description + * @Date Administrator 2018/9/21 + * @Param [orgEO] + **/ + public ResponseMessage saveBean(OrgEO orgEO) { + + String orgName = orgEO.getOrgName(); + String shotName = orgEO.getShotName(); + String getpId = orgEO.getpId(); + // String id = orgEO.getId();//id在这里为空，只是为了使用getOrgEOByShotNameAndPidAndId方法填进去的，真能坑，谁让你设置值的，你设置空好不好 + String id = null; + + if (StringUtils.isEmpty(orgName)) { + return Result.error("组织机构名不能为空"); + } else if (this.baseMapper.getOrgEOByorgNameAndPidAndId(orgName, getpId, id) != null) { + return Result.error("组织机构名称不能重复"); + } + + if (StringUtils.isEmpty(shotName)) { + return Result.error("组织机构简称不能为空"); + } else if (this.baseMapper.getOrgEOByShotNameAndPidAndId(shotName, getpId, id) != null) { + return Result.error("组织机构简称不能重复"); + } +// 向ParentIds中添加用都逗号隔开的所有祖先id + if (StringUtils.isNotEmpty(orgEO.getParentIds())) { + orgEO.setParentIds(orgEO.getParentIds() + "," + orgEO.getpId()); + } else { + orgEO.setParentIds(orgEO.getpId()); + } + + orgEO.setId(UUIDUtils.randomUUID20()); + orgEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + orgEO.setIsShow(0); + orgEO.setCreationTime(new Date()); + orgEO.setModifyTime(new Date()); + int line = this.baseMapper.insert(orgEO); + if (line > 0) { + return Result.success("true", "新增成功", orgEO); + } else { + return Result.error("false", "新增失败"); + } + } + + /** + * 组织机构详情 + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public OrgEO getOrgEOById(String id) { + return this.baseMapper.getOrgEOById(id); + } + + /** + * 删除组织机构 + * + * @return + */ + public ResponseMessage delete(String id) { + List list = this.baseMapper.getOrgEOByPid(id); +// 如果该组织机构下有子机构，则不允许删除 + if (list != null && !list.isEmpty()) { + return Result.error("该组织机构下有子机构，不能删除"); + } +//根据orgId查询组织结构下面的用户并删除关联关系 + UserEOPage userEOPage = new UserEOPage(); + userEOPage.setOrgId(id); + List userEOS = userEOService.queryUserInfoByPage(userEOPage); + if(userEOS.size()>0){ + for (UserEO userEO:userEOS){ + this.baseMapper.deleteUserOrgByOrgId(userEO.getOrgId()); + } + } + int line = this.baseMapper.deleteLogic(id); + if (line > 0) { + return Result.success("true", "操作成功", ""); + } else { + return Result.error("操作失败"); + } + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public LinkedList selectOrgAllNode() { + LinkedList rootNodes = this.baseMapper.selectOrgAllNode(); + return rootNodes; + } + + public List getChildDept(String orgId) { + return this.baseMapper.getChildDept(orgId); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public LinkedList getTree() { + LinkedList rootNodes = this.baseMapper.selectRootNode(); + addNodes(rootNodes, 0); + return rootNodes; + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public void addNodes(LinkedList rootNodes, int i) { + if (i < rootNodes.size() || rootNodes.size() == 1) { + OrgEO orgEO = rootNodes.get(i); + LinkedList nodes = this.baseMapper.selectNodeByPid(orgEO.getId()); + if (nodes != null) { + rootNodes.addAll(nodes); + } + if (rootNodes.size() > 1) { + addNodes(rootNodes, ++i); + } + } + } + + /** + * @return com.adc.da.util.http.ResponseMessage + * @Author liwenxuan + * @Description 修改组织机构简称和名称不能为空也不可以重复 + * @Date Administrator 2018/9/18 + * @Param [orgEO] + **/ + public ResponseMessage updateBeanById(OrgEO orgEO) { + + String orgName = orgEO.getOrgName(); + String shotName = orgEO.getShotName(); + String getpId = orgEO.getpId(); + String id = orgEO.getId(); + + if (StringUtils.isEmpty(orgName)) { + return Result.error("组织机构名不能为空"); + } else if (this.baseMapper.getOrgEOByorgNameAndPidAndId(orgName, getpId, id) != null) { + return Result.error("组织机构名称不能重复"); + } + + if (StringUtils.isEmpty(shotName)) { + return Result.error("组织机构简称不能为空"); + } else if (this.baseMapper.getOrgEOByShotNameAndPidAndId(shotName, getpId, id) != null) { + return Result.error("组织机构简称不能重复"); + } + + //向ParentIds中添加用都逗号隔开的所有祖先id 本条pid：orgEO.getpId() 上一条ParentIds：orgEO.getParentIds() + /*if (StringUtils.isNotEmpty(orgEO.getParentIds())) { + orgEO.setParentIds(orgEO.getParentIds() + "," + + orgEO.getpId()); + } else { + orgEO.setParentIds(orgEO.getpId()); + }*/ + orgEO.setModifyTime(new Date()); + int line = this.baseMapper.updateById(orgEO); + if (line > 0) { + return Result.success("true", "操作成功", ""); + } else { + return Result.error("操作失败"); + } + } + + public ResponseMessage delOrgRelatedUser(String userId, String orgId) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(userId); + userOrgEO.setOrgId(orgId); + int i = this.baseMapper.delOrgRelatedUser(userOrgEO); + if (i > 0) { + return Result.success("", "操作成功", 1); + } + return Result.error("操作失败"); + } + + public ResponseMessage addOrgRelatedUser(String userOrgs) { + List userOrgEOs = JSON.parseArray(userOrgs, UserOrgEO.class); + + int i = this.baseMapper.addOrgRelatedUsers(userOrgEOs); + if (i > 0) { + return Result.success("", "操作成功", 1); + } + return Result.error("操作失败"); + } + + public int delOrgRelatedUserByUserId(String usId) { + return this.baseMapper.delOrgRelatedUserByUserId(usId); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List findById(String id, String orgName) { + LinkedList rootNodes = new LinkedList(); + OrgEO orgEO = new OrgEO(); + orgEO.setId(id); + orgEO.setOrgName(orgName); + rootNodes.add(orgEO); + addNodes(rootNodes, 0); + return rootNodes; + } + + public List getList() { + List orgEOList = this.baseMapper.getOrgListOfSSO(); + return orgEOList; + } + + + + + /** + * @return java.util.List + * @Author liwenxuan + * @Description //根据角色名称，查找该角色的用户（用于流程中心）+据用户查找其组织结构，筛选出唯一的组织结构 + * 把查询出来的组织结构放到了一个里面 + * @Date Administrator 2018/10/24 + * @Param [roleName] + **/ + public List getTreeByRole(String roleName) { + List treeByRole1 = this.baseMapper.getTreeByRole1(roleName); + List treeByRole2 = this.baseMapper.getTreeByRole2(roleName); + List resList = new ArrayList(); + List resultList = new ArrayList(); + if(treeByRole2!=null && !treeByRole2.isEmpty()){ + for(OrgEO orgEO : treeByRole2){ + resList.add(orgEO.getId()); + OrgEO org = this.baseMapper.getOrgEOById(orgEO.getId()); + if(org.getParentIds()!=null && !org.getParentIds().isEmpty()){ + String parentIds[] = org.getParentIds().split(","); + List parentIdList = Arrays.asList(parentIds); + resList.addAll(parentIdList); + } + } + } + HashSet h = new HashSet(resList); + resList.clear(); + resList.addAll(h); + if(resList!=null && !resList.isEmpty()){ + for(String id : resList){ + OrgEO org = this.baseMapper.getOrgEOById(id); + resultList.add(org); + } + } + treeByRole1.addAll(resultList); + return treeByRole1; + } + + public List getLeaderByUserId(String userId, String orgType, String roleName) { + List arrayListId = new ArrayList<>(); + //通过当前用户id获取用户所在组织结构的本级及上级的组织机构 + OrgEO leaderByUserId1 = this.baseMapper.getLeaderByUserId1(userId); + //如果此登录的用户组织机构为空，返回Controller此用户未分配组织机构 + if (leaderByUserId1 == null) { + return null; + } + String parentIds = leaderByUserId1.getParentIds(); + if (parentIds != null) { + this.splitParentIds = Arrays.asList(parentIds.split(",")); + arrayListId.addAll(splitParentIds); + } + String id = leaderByUserId1.getId(); + arrayListId.add(id); + //获取当前用户所在组织机构的领导id + List leaderByUserId2 = this.baseMapper.getLeaderByUserId2(orgType, arrayListId); + if(leaderByUserId2 != null && leaderByUserId2.size()>1){ + List eoList = new ArrayList<>(); + for (int i = 0;i<3;i++){ + OrgEO orgEO = new OrgEO(); + orgEO.setUsId("占位符"); + eoList.add(orgEO); + } + return eoList; + } +// 未获取当前用户所在组织机构的领导id + if (leaderByUserId2 == null || leaderByUserId2.isEmpty()) { + return null; + } + +// 返回当前组织下的负责人 + List leaderByUserId3 = this.baseMapper.getLeaderByUserId3(roleName, leaderByUserId2.get(0)); + return leaderByUserId3; + + + } + /** + * @Author liwenxuan + * @Description //根据角色名称和部门id获取组织结构用户树 + * @Date Administrator 2018/10/31 + * @Param [roleName, orgId] + * @return java.util.List + **/ + public List getTreeByRoleAndOrgId(String roleName, String orgId) { + List ids = new ArrayList<>(); + //liwenxuan:1.根据orgId查询下面的orgId集合 + List orgIds = this.baseMapper.getTreeByRoleAndOrgId1(orgId); + if(orgIds.size()!=0){ + ids.addAll(orgIds); + } + ids.add(orgId); + + //liwenxuan:2.根据下面的orgId集合查询组织机构 + //查询组织机构ids下面所对应组织机构 + List treeByRoleAndOrgId2 = this.baseMapper.getTreeByRoleAndOrgId2(ids); + //liwenxuan:根据组织机构ids查询用户 + List treeByRoleAndOrgId3 = this.baseMapper.getTreeByRoleAndOrgId3(roleName, treeByRoleAndOrgId2); + if(treeByRoleAndOrgId3.size()==0){ + return null; + } + //把两个组织机构集合和用户集合放到一起 + treeByRoleAndOrgId2.addAll(treeByRoleAndOrgId3); + return treeByRoleAndOrgId2; + } + + /** + * @Author liwenxuan + * @Description //根据roleName和orgId查询用户 + * @Date Administrator 2018/10/31 + * @Param [roleName, orgId] + * @return java.util.List + **/ + public List getTreeByRoleNameAndOrgId(String roleName, String orgId) { + List Ids = new ArrayList<>(); + //liwenxuan:根据orgId获取其所在的组织结构 + List Id1 = this.baseMapper.getTreeByRoleAndOrgId1(orgId); + if(Id1.size() !=0 ){ + Ids.addAll(Id1); + } + Ids.add(orgId); + //查询组织机构ids下面所对应的用户 + List treeByRoleAndOrgId2 = this.baseMapper.getTreeByRoleAndOrgId2(Ids); + //liwenxuan:根据组织机构ids查询用户 + return this.baseMapper.getTreeByRoleAndOrgId3(roleName, treeByRoleAndOrgId2); + } + //根据orgType查询查询部及以上组织结构 + public List getIdsByorgType(){ + return this.baseMapper.getIdsByorgType(); + } + + //根据orgId查找此组织结构(通过id 和 parentIds) + public List getAllOrgbyOrgId(String orgId){ +// 定义一个装有整个分支组织结构id集合 + List idList = new ArrayList(); +// 装入该节点id及以上parentId + OrgEO allOrgbyOrgId = this.baseMapper.getAllOrgbyOrgId(orgId); + if(allOrgbyOrgId !=null){ + idList.add(allOrgbyOrgId.getId()); + //TODO 此处可能存在返回的allOrgbyOrgId可能为null,因此在getParentIds时存在空指针异常 + List list = Arrays.asList(allOrgbyOrgId.getParentIds().split(",")); + idList.addAll(list); + } +// 装入该节点以下id + List orgIds = this.baseMapper.getTreeByRoleAndOrgId1(orgId); + idList.addAll(orgIds); + return idList; + } + // 根据orgId查找组织机构属于什么类型 + public int getOrgNamebyOrgId(UserVO userVO){ + if(StringUtils.isNotEmpty(userVO.getOrgId())){ + OrgEO allOrgbyOrgId = this.baseMapper.getAllOrgbyOrgId(userVO.getOrgId()); + String orgType = allOrgbyOrgId.getOrgType(); + if( orgType !=null && orgType.equals("FAMILY")){ + return 1; + } else if(orgType !=null && orgType.equals("DEPART")){ + return 2; + } + } + return 0; + } + + /** + * @Author liwenxuan + * @Description //流程四 获得责任部门中的项目经理 + * @Date Administrator 2018/11/8 + * @Param [roleName, orgId] + * @return java.util.List + **/ + public List getTreeByRoleAndOrgId1(String roleName, String orgId) { + List ids = new ArrayList<>(); + //liwenxuan:1.根据orgId查询下面的orgId集合 + List orgIds = this.baseMapper.getTreeByRoleAndOrgId1(orgId); + if(orgIds.size()!=0){ + ids.addAll(orgIds); + } + ids.add(orgId); + //liwenxuan:2.根据下面的orgId集合查询组织机构 + //查询组织机构ids下面所对应组织机构 + List treeByRoleAndOrgId2 = this.baseMapper.getTreeByRoleAndOrgId2(ids); + //liwenxuan:根据组织机构ids查询用户 + List treeByRoleAndOrgId3 = this.baseMapper.getTreeByRoleAndOrgId3(roleName, treeByRoleAndOrgId2); + if(treeByRoleAndOrgId3.size()==0){ + return null; + } + return treeByRoleAndOrgId3; + } + + + /** + * @Author liwenxuan + * @Description //流程三：根据角色名称和部门id获取组织结构用户树 + * @Date Administrator 2018/10/31 + * @Param [roleName, orgId] + * @return java.util.List + **/ + public List getTreeByRoleAndOrgId3(String roleName, UserEO userEO) { + List ids = new ArrayList<>(); +//取orgIds + String id = userEO.getOrgEOList().get(0).getId(); + String parentIds = userEO.getOrgEOList().get(0).getParentIds(); + if(parentIds !=null && !parentIds.isEmpty()){ + String[] split = parentIds.split(","); + List list = Arrays.asList(split); + ids.addAll(list); + ids.add(id); + } + //liwenxuan:2.根据下面的orgId集合查询组织机构 + //查询组织机构ids下面所对应组织机构 + List treeByRoleAndOrgId2 = this.baseMapper.getTreeByRoleAndOrgId2(ids); + //liwenxuan:根据组织机构ids查询用户 + List treeByRoleAndOrgId3 = this.baseMapper.getTreeByRoleAndOrgId3(roleName, treeByRoleAndOrgId2); + if(treeByRoleAndOrgId3.size()==0){ + return null; + } + //把两个组织机构集合和用户集合放到一起 + treeByRoleAndOrgId2.addAll(treeByRoleAndOrgId3); + return treeByRoleAndOrgId2; + } + + /** + * @Author liwenxuan + * @Description //判断此orgId所对应的组织结构是否为科级部门或者是部级部门 + * @Date Administrator 2018/11/11 + * @Param [orgId] + * @return java.util.List + **/ + public int getOrgbyOrgId1(String orgId){ + + OrgEO allOrgbyOrgId = this.baseMapper.getAllOrgbyOrgId(orgId); + String orgType = allOrgbyOrgId.getOrgType(); + if(orgType.equals("FAMILY")){ + return 1; + } + if(orgType.equals("DEPART")){ + return 2; + } + return 0; + } + + + + + public List getManagerByOrgId(String roleName, String orgId){ + return this.baseMapper.getManagerByOrgId(roleName,orgId); + } + + public List queryOrgByList(String orgName){ + return this.baseMapper.queryOrgByList(orgName); + } + + public List getTreeByRole2(String roleId) { + List treeByRole1 = this.baseMapper.getTreeByRole3(roleId); + List treeByRole2 = this.baseMapper.getTreeByRole4(roleId); + List resList = new ArrayList(); + List resultList = new ArrayList(); + if(treeByRole2!=null && !treeByRole2.isEmpty()){ + for(OrgEO orgEO : treeByRole2){ + resList.add(orgEO.getId()); + OrgEO org = this.baseMapper.getOrgEOById(orgEO.getId()); + if(org.getParentIds()!=null && !org.getParentIds().isEmpty()){ + String parentIds[] = org.getParentIds().split(","); + List parentIdList = Arrays.asList(parentIds); + resList.addAll(parentIdList); + } + } + } + HashSet h = new HashSet(resList); + resList.clear(); + resList.addAll(h); + if(resList!=null && !resList.isEmpty()){ + for(String id : resList){ + OrgEO org = this.baseMapper.getOrgEOById(id); + resultList.add(org); + } + } + treeByRole1.addAll(resultList); + return treeByRole1; + } + + public OrgEO getOrgInfoByOrgId(String OrgId) { + + return this.baseMapper.getOrgInfoByOrgId(OrgId); + } + + public OrgEO getOrgParentInfoOrgId(OrgEO orgEO) { + + return this.baseMapper.getOrgParentInfoOrgId(orgEO); + } + + public List getOrgRootTree(){ + return this.baseMapper.getOrgRootTree(); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/RoleEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/RoleEOServiceImpl.java new file mode 100644 index 00000000..4c545a17 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/RoleEOServiceImpl.java @@ -0,0 +1,182 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.common.ValidFlagEnum; +import com.adc.da.sys.dao.RoleEODao; +import com.adc.da.sys.entity.RoleEO; +import com.adc.da.sys.entity.UserRoleEO; +import com.adc.da.sys.page.RoleEOPage; +import com.adc.da.sys.service.IOrgEOService; +import com.adc.da.sys.service.IRoleEOService; +import com.adc.da.sys.vo.RoleVO; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * + *
    + * 功能：TS_ROLE RoleEOService
    + * 作者：code generator
    + * 日期： 2017-11-06
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("roleEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class RoleEOServiceImpl extends ServiceImpl implements IRoleEOService { + + + @Autowired + private IOrgEOService orgEOService; + + + @Override + public List queryByPage(RoleEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(RoleEOPage page) { + return this.baseMapper.queryByList(page); + } + + /** + * @Author liwenxuan + * @Description 新增 + * @Date Administrator 2018/9/26 + * @Param [sysRoleEO] + * @return int + **/ + public int saveBean(RoleEO sysRoleEO) { + sysRoleEO.setId(UUIDUtils.randomUUID20()); + sysRoleEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + sysRoleEO.setCreationTime(new Date()); + sysRoleEO.setModifyTime(new Date()); +//TODO 从session中取用户id保存到OperUser中 +// String userId= LoginUserUtil.getUserId(); +// sysRoleEO.setOperUser(userId); + //判断角色名称不能重复，返回0代表角色名称已经存在,否则进行插入操作返回1 + List roleEOS = this.baseMapper.selectByNameAndId(sysRoleEO.getId(),sysRoleEO.getName()); + if(roleEOS!=null && !roleEOS.isEmpty()){ + return 0; + } + return this.baseMapper.insert(sysRoleEO); + } + /** + * @Author liwenxuan + * @Description 修改角色名称、状态、角色描述 + * @Date Administrator 2018/9/26 + * @Param [roleEO] + * @return int + **/ + public int updateByPrimaryKeySelective(RoleEO roleEO){ + roleEO.setModifyTime(new Date()); + //判断角色名称不能重复，返回0代表角色名称已经存在,否则进行修改操作返回1 + List roleEOS = this.baseMapper.selectByNameAndId(roleEO.getId(),roleEO.getName()); + if(roleEOS!=null && !roleEOS.isEmpty()){ + return 0; + } + // TODO 从session中取用户id保存到OperUser中 +// String userId= LoginUserUtil.getUserId(); +// roleEO.setOperUser(userId);// + return this.baseMapper.updateById(roleEO); + } + + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public RoleEO getRoleWithMenus(String id) { + return this.baseMapper.getRoleWithMenus(id); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List getSysRoleListByUserId(String userId) { + return this.baseMapper.getRoleListByUserId(userId); + } + + /* + * @Transactional(readOnly = true) public PageInfo page(PageInfo + * pageInfo, String roleName) { return dao.page(pageInfo, roleName); } + */ + + /** + * 删除角色及角色菜单关联(角色有对应用户则不能被删除) + */ + public void delete(String roleId) { + this.baseMapper.deleteLogic(roleId); + this.baseMapper.deleteRoleMenuByRoleId(roleId); + + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List findAll(RoleVO setRole) { + return this.baseMapper.findAll(setRole); + } + + /** + * 查询角色所对应的用户 + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List getUserRoleListByRoleId(String roleId) { + return this.baseMapper.getUserRoleListByRoleId(roleId); + } + + /** + * 设置角色菜单关联 + */ + public RoleEO saveRoleMenu(RoleEO roleEO) { + if (roleEO.getMenuEOIdList()!=null && !roleEO.getMenuEOIdList().isEmpty()) { + this.baseMapper.deleteRoleMenuByRoleId(roleEO.getId()); + for (String menuId : roleEO.getMenuEOIdList()) { + this.baseMapper.saveRoleMenu(roleEO.getId(), menuId); + } + } + return roleEO; + } + + /** + * 判断角色是否属于相应用户 + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public boolean isBelong(String userId, String roleId) { + int count = this.baseMapper.isBelong(userId, roleId); + return count > 0; + } + + /** + * @Author liwenxuan + * @Description //查找科级负责人 + * @Date Administrator 2018/11/8 + * @Param + * @return + **/ + public int querySectionCount(String roleId){ + return this.baseMapper.querySectionCount(roleId); + } + + /** + * @Author liwenxuan + * @Description //查找部门负责人 + * @Date Administrator 2018/11/8 + * @Param + * @return + **/ + public int querySectionCount1(String roleId){ + return this.baseMapper.querySectionCount1(roleId); + } + + public List selectByNameAndId(String id, String name){ + return this.baseMapper.selectByNameAndId(id,name); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/RoleSarMenuEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/RoleSarMenuEOServiceImpl.java new file mode 100644 index 00000000..d1823cea --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/RoleSarMenuEOServiceImpl.java @@ -0,0 +1,59 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.sys.dao.RoleSarMenuEODao; +import com.adc.da.sys.entity.RoleSarMenuEO; +import com.adc.da.sys.page.RoleSarMenuEOPage; +import com.adc.da.sys.service.IRoleSarMenuEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：TS_ROLE_SAR_MENU RoleSarMenuEOService
    + * 作者：code generator
    + * 日期： 2019-02-19
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("roleSarMenuEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class RoleSarMenuEOServiceImpl extends ServiceImpl implements IRoleSarMenuEOService { + + @Override + public List queryByPage(RoleSarMenuEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(RoleSarMenuEOPage page) { + return this.baseMapper.queryByList(page); + } + + public List findRoleSarMenu(String roleId) { + return this.baseMapper.findRoleSarMenu(roleId); + } + + public String queryBusinessStandRootId(String SOR_DIVIDE) { + return this.baseMapper.queryBusinessStandRootId(SOR_DIVIDE); + } + + public List selectSarMenuRoots() { + return this.baseMapper.selectSarMenuRoots(); + } + + public int insertSubMenu (RoleSarMenuEO roleSarMenuEO){ + return this.baseMapper.insertSubMenu(roleSarMenuEO); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserConfigEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserConfigEOServiceImpl.java new file mode 100644 index 00000000..6dfa9727 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserConfigEOServiceImpl.java @@ -0,0 +1,59 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.sys.dao.UserConfigEODao; +import com.adc.da.sys.entity.UserConfigEO; +import com.adc.da.sys.page.UserConfigEOPage; +import com.adc.da.sys.service.IUserConfigEOService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + + +/** + * + *
    + * 功能：TS_USER_CONFIG UserConfigEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("userConfigEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class UserConfigEOServiceImpl extends ServiceImpl implements IUserConfigEOService { + + + @Override + public List queryByPage(UserConfigEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(UserConfigEOPage page) { + return this.baseMapper.queryByList(page); + } + + public int createPageConfig (String userId){ + UserConfigEO userConfigEO = new UserConfigEO(); + userConfigEO.setUserId(userId); + userConfigEO.setId(UUIDUtils.randomUUID20()); + userConfigEO.setValidFlag(0); + userConfigEO.setCreationTime(new Date()); + userConfigEO.setModifyTime(new Date()); + userConfigEO.setConfigType("PAGE_SIZE"); + userConfigEO.setConfigContent("10"); + return this.baseMapper.insert(userConfigEO); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java new file mode 100644 index 00000000..2008c0c1 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java @@ -0,0 +1,458 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.common.ValidFlagEnum; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.constant.UserSourceEnum; +import com.adc.da.sys.dao.OrgEODao; +import com.adc.da.sys.dao.UserEODao; +import com.adc.da.sys.dao.UserInfoEODao; +import com.adc.da.sys.entity.OrgEO; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserInfoEO; +import com.adc.da.sys.entity.UserOrgEO; +import com.adc.da.sys.page.UserEOPage; +import com.adc.da.sys.service.IOrgEOService; +import com.adc.da.sys.service.IRoleEOService; +import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.vo.UserVO; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.PasswordUtils; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * + *
    + * 功能：TS_USER UserEOService
    + * 作者：code generator
    + * 日期： 2017-11-06
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("userEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class UserEOServiceImpl extends ServiceImpl implements IUserEOService { + + @Autowired + private UserInfoEODao userInfoEODao; + @Autowired + private OrgEODao orgEODao; + @Autowired + private IRoleEOService roleEOService; + @Autowired + private IOrgEOService orgEOService; + + String usid = null; + + + @Transactional(rollbackFor = Exception.class) + public UserEO saveBean(UserEO userEO) { + userEO.setUsid(UUIDUtils.randomUUID20()); + userEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()); + userEO.setCreationTime(new Date(System.currentTimeMillis())); + userEO.setModifyTime(new Date(System.currentTimeMillis())); + userEO.setPassword(PasswordUtils.encryptPassword(userEO.getPassword())); + userEO.setUserSource(UserSourceEnum.LOCAL_USER.getValue()); + if(userEO.getExtInfo() != null){ + userEO.setExtInfo(userEO.getExtInfo()); + }else{ + userEO.setExtInfo(""); + } + this.baseMapper.insert(userEO); + //TODO 此处需要维护用户的组织机构 + if(StringUtils.isNotEmpty(userEO.getOrgId())){ + this.baseMapper.saveUserOrg(userEO.getUsid(),userEO.getOrgId()); + } + // 此处需要维护用户角色--单个用户可以拥有多个角色 +/* if(StringUtils.isNotEmpty(userEO.getRoleId())){ + String roleIds = userEO.getRoleId(); + String[] split = roleIds.split(","); + for(int i=0;i + * date: 2018/9/15 16:10 + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List queryUserInfoByPage(BasePage basePage){ + int rowCount = this.baseMapper.queryUserInfoByCount(basePage); + basePage.getPager().setRowCount(rowCount); + return this.baseMapper.queryUserInfoByPage(basePage); + } + + + @Transactional(readOnly = false, rollbackFor = Exception.class) + public void updateUserEOInfo(UserEO userEO){ + Date nowTime=new Date(); + userEO.setModifyTime(nowTime); + // 此处修复当用户点击新增后再次点击编辑时导致当前用户的密码被重置为明文的上一次新增用户的密码导致其登录失败 + userEO.setPassword(null); + int i = this.baseMapper.updateById(userEO); +// 修改用户权限 +/* if (StringUtils.isNotEmpty(userEO.getRoleId())) { + this.saveUserRole(userEO); + }*/ + this.baseMapper.deleteUserRoleByUsid(userEO.getUsid()); + if(userEO.getRoleIdList()!=null && !userEO.getRoleIdList().isEmpty()){ + for(String roleId:userEO.getRoleIdList()){ + this.baseMapper.saveUserRole(userEO.getUsid(),roleId); + } + } +// 更新组织机构 + if (!userEO.getOrgId().isEmpty()) { + updateUserOrg(userEO); + } + //此处维护用户的相关电话信息 + if(StringUtils.isNotEmpty(userEO.getOfficePhone())||StringUtils.isNotEmpty(userEO.getMobilePhone())){ + if(userEO.getUserInfoId()!=null && !userEO.getUserInfoId().isEmpty()){ + UserInfoEO userInfoEO = new UserInfoEO(); + userInfoEO.setId(userEO.getUserInfoId()); + userInfoEO.setUserId(userEO.getUsid()); + userInfoEO.setModifyTime(nowTime); + userInfoEO.setMobilePhone(userEO.getMobilePhone()); + userInfoEO.setOfficePhone(userEO.getOfficePhone()); + userInfoEODao.updateByPrimaryKey(userInfoEO); + }else{ + UserInfoEO userInfoEO=new UserInfoEO(); + userInfoEO.setId(UUIDUtils.randomUUID20()); + userInfoEO.setUserId(userEO.getUsid()); + userInfoEO.setCreationTime(nowTime); + userInfoEO.setModifyTime(nowTime); + userInfoEO.setMobilePhone(userEO.getMobilePhone()); + userInfoEO.setOfficePhone(userEO.getOfficePhone()); + userInfoEODao.insert(userInfoEO); + } + } + } + + + /** + * 删除用户及用户角色关联 + */ + public int delete(List ids) { + int i = this.baseMapper.deleteLogicInBatch(ids); +// 删除用户角色和组织机构的关系 + int i1 = this.baseMapper.deleteUserRoleByUsidInBatch(ids); + int i2 = this.baseMapper.deleteUserOrgByUsidInBatch(ids); +// + if( i>0 ){ + return 1; + } + return 0; + } + + /** + * 查询用户及用户所对应的角色 + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public UserEO getUserWithRoles(String id) { + return this.baseMapper.getUserWithRoles(id); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public UserEO getUserWithRolesAll(String id) { + return this.baseMapper.getUserWithRolesAll(id); + } + + /** + * 设置用户角色关联 + */ + public int saveUserRole(UserEO userEO) { + if (userEO.getRoleIdList() !=null && !userEO.getRoleIdList().isEmpty()) { + this.baseMapper.deleteUserRoleByUsid(userEO.getUsid()); + List roleIdList = userEO.getRoleIdList(); +// String roleIds = userEO.getRoleId(); +// String[] split = roleIds.split(","); +// for(int i=0;i0){ + return orgEODao.updateUserOrg(userOrgEO); + } + return orgEODao.addOrgRelatedUser(userOrgEO); + } + + /** + * 根据当前登录用户id查询个人信息及部门 + * @param usid + * @return + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public UserEO selectOrgByPrimaryKey(String usid){ + return this.baseMapper.selectOrgByPrimaryKey(usid); + } + + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public UserEO selectRoleMessageByPrimaryKey(String usid){ + return this.baseMapper.selectRoleMessageByPrimaryKey(usid); + } + + public int resetPassword(String userId) { + UserEO userEO = new UserEO(); + userEO.setUsid(userId); + userEO.setPassword(PasswordUtils.encryptPassword("123456a")); + return this.baseMapper.updateById(userEO); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public UserEO selectByUnameAndPwd(UserEO userEO){ + return this.baseMapper.selectByUnameAndPwd(userEO); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List queryByOrg(BasePage basePage) { + int rowCount = this.baseMapper.queryByCount(basePage); + basePage.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(basePage); + } + + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List queryByPageAndParams(UserEOPage page) { + int rowCount = this.baseMapper.queryByOrgCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByOrg(page); + } + + /** + * @Author liwenxuan + * @Description 组织机构查询未配置人员信息 + * @Date Administrator 2018/9/21 + * @Param [basePage] + * @return java.util.List + **/ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public List findUserInfoByPage(BasePage basePage){ + //liwenxuan:查找未分配组织结构的用户的行数 + int rowCount = this.baseMapper.findBySetOrgCount(basePage); + basePage.getPager().setRowCount(rowCount); + //liwenxuan：查询未分配组织机构人员信息 + return this.baseMapper.findBySetOrg(basePage); + } + + /** + * 根据用户id查找该用户所在的部门下的用户 + * @MethodName:selectThatOrgUser + * @author: DuYunbao + * @param:[userId] + * @return:java.util.List + * date: 2018/10/10 10:36 + */ + public List selectThatOrgUser(String userId) { + List orgIdList = new ArrayList<>(); + List userIdList = new ArrayList<>(); + String nowUserId = LoginUserUtil.getUserId(); +// 通过userId获取OrgId + String orgId = this.baseMapper.selectOrgByUserId(userId); +// 获取其所在的组织机构分支orgIdList + if(orgId !=null){ + List orgIdList1 = orgEODao.getTreeByRoleAndOrgId1(orgId); + orgIdList.addAll(orgIdList1); + orgIdList.add(orgId); + } +// 通过orgIdList获得其组织机构下的所有用户 + if(orgIdList.size() != 0){ + List allUser = orgEODao.getLeaderByUserId4(orgIdList); + + for (OrgEO leaderByUser:allUser) { + String usId = leaderByUser.getUsId(); + if(!nowUserId.equals(leaderByUser.getUsId())){ + userIdList.add(usId); + } + } + } + return userIdList; + } + + + public List queryUserEoList(UserEOPage page) { + page.setValidFlag("0"); + return this.baseMapper.queryUserEoList(page); + } + + /*** + * 根据工号获取用户信息 + * @MethodName:queryUserInfoByWordNum + * @author: zhangyanduan + * @param:[workNum] + * @return:java.util.List + * date: 2018/10/25 16:21 + */ + public List queryUserInfoByWordNum(String workNum){ + return this.baseMapper.selectUserByWorkNum(workNum); + } + + /*** + * 根据用户ID获取用户信息 + * @MethodName:selectByPrimaryKey + * @author: zhangyanduan + * @param:[userId] + * @return:com.adc.da.sys.entity.UserEO + * date: 2018/11/1 21:17 + */ + @Transactional(readOnly = true, rollbackFor = Exception.class) + public UserEO selectByPrimaryKey(String userId) { + return this.baseMapper.get(userId); + } + + + /** + * @Author liwenxuan + * @Description //根据roleName获取用户List + * @Date Administrator 2018/11/12 + * @Param [RoleName] + * @return com.adc.da.sys.entity.UserEO + **/ + public List getUserListByRoleName(String RoleName){ + return this.baseMapper.getUserListByRoleName(RoleName); + } + + /** + * @Author liwenxuan + * @Description //用户管理的新增和编辑 + * @Date Administrator 2018/11/13 + * @Param + * @return + **/ + public ResponseMessage createOrModifyIf(UserVO userVO) { + if(userVO.getRoleIdList()!=null && !userVO.getRoleIdList().isEmpty()){ + List roleIdList = userVO.getRoleIdList(); + if(roleIdList!=null && !roleIdList.isEmpty()) { + for (String roleId : roleIdList) { + // 判断是否为科级负责人，科级负责人角色只能在科级部门 + int i1 = roleEOService.querySectionCount(roleId); + // 判断是否为部门负责人，部门负责人角色只能在部级部门 + int i2 = roleEOService.querySectionCount1(roleId); + if (i1 == 1) { +// 所选部门角色是否为科级负责人 + int orgNamebyOrgId = orgEOService.getOrgNamebyOrgId(userVO); + if (orgNamebyOrgId != 1) { + return Result.error("科级负责任人只能创建在科级部门"); + } + } else if (i2 == 1) { +// 所选部门角色是否为部门级 + int orgNamebyOrgId = orgEOService.getOrgNamebyOrgId(userVO); + if (orgNamebyOrgId != 2) { + return Result.error("部门负责任人只能创建在部门级部门"); + } + } + } + } + } + this.usid = userVO.getUsid(); + if(this.usid==null || this.usid.equals("")){ + this.usid = null; + } + if (StringUtils.isBlank(userVO.getAccount())) { + return Result.error("登录名不能为空"); + } else if (this.getUserByLoginName(userVO.getAccount(),this.usid) != null) { + return Result.error("账号已存在"); + } + return Result.success("","",userVO); + } + + public List getUserEOBySpecRole(String orgId, String userId){ + return this.baseMapper.getUserEOBySpecRole(orgId,userId); + } + + + /** + * 获取所有用户信息进行用户信息匹配 + * @return + */ + public List selectAllUserInfo(){ + return this.baseMapper.selectAllUserInfoBySSO(); + } + + @Transactional(readOnly = true, rollbackFor = Exception.class) + public UserEO getOrgIdByUserId(String userId){ + return this.baseMapper.getOrgIdByUserId(userId); + } + + // 根据account获取未逻辑删除的UserEO + @Transactional(readOnly = true) + public UserEO getUserByLoginNameNotDeleted(String userName) { + UserEO userEO = this.baseMapper.getUserEOByAccountNotDeleted(userName); + return userEO; + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserInfoEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserInfoEOServiceImpl.java new file mode 100644 index 00000000..7ddacbc1 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserInfoEOServiceImpl.java @@ -0,0 +1,101 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.sys.dao.UserEODao; +import com.adc.da.sys.dao.UserInfoEODao; +import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserInfoEO; +import com.adc.da.sys.page.UserInfoEOPage; +import com.adc.da.sys.service.IUserInfoEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：TS_USER_INFO UserInfoEOService
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("userInfoEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class UserInfoEOServiceImpl extends ServiceImpl implements IUserInfoEOService { + + + @Autowired + private UserEODao userEODao; + + public UserEODao getUserEODao() { + return userEODao; + } + + @Override + public List queryByPage(UserInfoEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(UserInfoEOPage page) { + return this.baseMapper.queryByList(page); + } + + /** + * @Author liuyinnan + * @Description 根据用户ID获取用户信息 + * @Date 19:19 2018/9/26 + * @Param [userId] + * @return com.adc.da.person.entity.UserInfoEO + **/ + public UserInfoEO getUserEOAndInfoEOByUserCode(UserInfoEO userInfoEO){ + //TODO 此处优化代码逻辑，首先判断参数是否为空或为null，如果为null则不执行下方的查询逻辑 + if(userInfoEO != null ){ + UserInfoEO getInfo = this.baseMapper.getUserInfoByUserId(userInfoEO); + UserEO userEO= userEODao.selectOrgByPrimaryKey(userInfoEO.getUserId()); + if(userEO !=null){ + getInfo.setAccount(userEO.getAccount()); + getInfo.setEmail(userEO.getEmail()); + getInfo.setuName(userEO.getUname()); + } + return getInfo; + }else{ + return new UserInfoEO(); + } + } + + + + + public ResponseMessage updateByUserId(UserInfoEO userInfo){ + int i =this.baseMapper.updateByUserId(userInfo); + + + // 只负责修改个人邮箱 + UserEO userEO = new UserEO(); + userEO.setUsid(userInfo.getUserId()); + userEO.setEmail(userInfo.getEmail()); + int userEO1=userEODao.updateById(userEO); + return Result.success("0","修改成功"); + } + + // liwenxuan：修改用户详细信息 + public int updateByPrimaryKey(UserInfoEO userInfoEO){ + return this.baseMapper.updateByPrimaryKey(userInfoEO); + } +} + + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserRoleEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserRoleEOServiceImpl.java new file mode 100644 index 00000000..7830cb0a --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserRoleEOServiceImpl.java @@ -0,0 +1,24 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.sys.dao.UserRoleEODao; +import com.adc.da.sys.entity.UserRoleEO; +import com.adc.da.sys.service.IUserRoleEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + + +/** + * + *
    + * 功能：TR_USER_ROLE UserRoleEOService
    + * 作者：code generator
    + * 日期： 2017-11-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("userRoleEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class UserRoleEOServiceImpl extends ServiceImpl implements IUserRoleEOService { + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/WarnTimeEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/WarnTimeEOServiceImpl.java new file mode 100644 index 00000000..4ee0622d --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/WarnTimeEOServiceImpl.java @@ -0,0 +1,43 @@ +package com.adc.da.sys.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.sys.dao.WarnTimeEODao; +import com.adc.da.sys.entity.WarnTimeEO; +import com.adc.da.sys.page.WarnTimeEOPage; +import com.adc.da.sys.service.IWarnTimeEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + + +/** + * + *
    + * 功能：TS_WARN_TIME WarnTimeEOService
    + * 作者：code generator
    + * 日期： 2018-09-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Service("warnTimeEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class WarnTimeEOServiceImpl extends ServiceImpl implements IWarnTimeEOService { + + @Override + public List queryByPage(WarnTimeEOPage page) { + Integer rowCount = this.queryByCount(page); + page.getPager().setRowCount(rowCount); + return this.baseMapper.queryByPage(page); + } + + public int queryByCount(BasePage page) { + return this.baseMapper.queryByCount(page); + } + + @Override + public List queryByList(WarnTimeEOPage page) { + return this.baseMapper.queryByList(page); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java new file mode 100644 index 00000000..55a10a97 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java @@ -0,0 +1,100 @@ +package com.adc.da.sys.vo; + +import java.util.Date; + +public class MenuVO extends TreeVO { + + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private Object remarks; + private String permission; + private Integer isShow; + private String icon; + private String href; + // 扩展字段 + private String extInfo; + private boolean checked; + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public Integer getValidFlag() { + return validFlag; + } + + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public Object getRemarks() { + return remarks; + } + + public void setRemarks(Object remarks) { + this.remarks = remarks; + } + + public String getPermission() { + return permission; + } + + public void setPermission(String permission) { + this.permission = permission; + } + + public Integer getIsShow() { + return isShow; + } + + public void setIsShow(Integer isShow) { + this.isShow = isShow; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getHref() { + return href; + } + + public void setHref(String href) { + this.href = href; + } + + public String getExtInfo() { + return extInfo; + } + + public void setExtInfo(String extInfo) { + this.extInfo = extInfo; + } + + public boolean isChecked() { + return checked; + } + + public void setChecked(boolean checked) { + this.checked = checked; + } +} \ No newline at end of file diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/TreeVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/TreeVO.java new file mode 100644 index 00000000..9378087d --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/TreeVO.java @@ -0,0 +1,70 @@ +package com.adc.da.sys.vo; + +import java.util.List; + +public abstract class TreeVO { + + protected String id; + protected String name; + protected String parentId; // 所有父级编号 + protected String parentIds; // 所有父级编号 + protected T parent; // 父级编号 + protected List childList; + protected Integer delFlag; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getParentIds() { + return parentIds; + } + + public void setParentIds(String parentIds) { + this.parentIds = parentIds; + } + + public T getParent() { + return parent; + } + + public void setParent(T parent) { + this.parent = parent; + } + + public List getChildList() { + return childList; + } + + public void setChildList(List childList) { + this.childList = childList; + } + + public Integer getDelFlag() { + return delFlag; + } + + public void setDelFlag(Integer delFlag) { + this.delFlag = delFlag; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java new file mode 100644 index 00000000..702fac4d --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java @@ -0,0 +1,331 @@ +package com.adc.da.sys.vo; + +import com.adc.da.sys.entity.OrgEO; +import com.adc.da.sys.entity.RoleEO; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class UserVO { + + private Integer validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private String operUser; + private String extInfo; + private String workNum; + private String email; + private String userSource; + private String uname; + private String password; + private String account; + private String usid; + // 扩展字段 + private List rolesstr = new ArrayList<>(); + private List roles = new ArrayList<>(); + private List orgsstr = new ArrayList<>(); + private List orgs = new ArrayList<>(); + private List roleIdList = new ArrayList<>(); + private List roleNameList = new ArrayList<>(); + private String orgId; + private String orgName; + private String rname; + private String roleId; + private String roleName; + private Integer disableFlag; + private Integer unlockFlag; + private String userType; + private String mobilePhone; + private String officePhone; + private String address; + private String faxAddress; + private String userInfoId; + private List roleEOList = new ArrayList<>(); + private List orgIdList = new ArrayList<>(); + private List orgEOList = new ArrayList<>(); + private String orgType; + + public String getUserInfoId() { + return userInfoId; + } + + public void setUserInfoId(String userInfoId) { + this.userInfoId = userInfoId; + } + + public Integer getValidFlag() { + return validFlag; + } + + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public String getOperUser() { + return operUser; + } + + public void setOperUser(String operUser) { + this.operUser = operUser; + } + + public String getExtInfo() { + return extInfo; + } + + public void setExtInfo(String extInfo) { + this.extInfo = extInfo; + } + + public String getWorkNum() { + return workNum; + } + + public void setWorkNum(String workNum) { + this.workNum = workNum; + } + + public List getRolesstr() { + return rolesstr; + } + + public void setRolesstr(List rolesstr) { + this.rolesstr = rolesstr; + } + + public List getOrgsstr() { + return orgsstr; + } + + public void setOrgsstr(List orgsstr) { + this.orgsstr = orgsstr; + } + + public List getOrgs() { + return orgs; + } + + public void setOrgs(List orgs) { + this.orgs = orgs; + } + + public String getRname() { + return rname; + } + + public void setRname(String rname) { + this.rname = rname; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getUserSource() { + return userSource; + } + + public void setUserSource(String userSource) { + this.userSource = userSource; + } + + public String getUname() { + return uname; + } + + public void setUname(String uname) { + this.uname = uname; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getUsid() { + return usid; + } + + public void setUsid(String usid) { + this.usid = usid; + } + + public List getRoles() { + return roles; + } + + public void setRoles(List roles) { + this.roles = roles; + if(roles!=null &&roles.size()>0){ + List roleNameList=new ArrayList(); + for(RoleEO role:roles){ + roleNameList.add(role.getName()); + } + this.rolesstr=roleNameList; + } + } + + public void setDisableFlag(Integer disableFlag){ + this.disableFlag=disableFlag; + } + + public Integer getDisableFlag(){ + return this.disableFlag; + } + + public void setUnlockFlag(Integer unlockFlag){ + this.unlockFlag=unlockFlag; + } + + public Integer getUnlockFlag(){ + return this.unlockFlag; + } + + public void setUserType(String userType){ + this.userType=userType; + } + + public String getUserType(){ + return this.userType; + } + + public void setOrgId(String orgId){ + this.orgId=orgId; + } + + public String getOrgId(){ + return this.orgId; + } + + public void setOrgName(String orgName){ + this.orgName=orgName; + } + + public String getOrgName(){ + return this.orgName; + } + + public void setRoleId(String roleId){ this.roleId=roleId;} + + public String getRoleId(){return this.roleId;} + + public String getRoleName(){return this.roleName;} + + public void setRoleName(String roleName){this.roleName=roleName;} + + public String getMobilePhone() { + return mobilePhone; + } + + public void setMobilePhone(String mobilePhone) { + this.mobilePhone = mobilePhone; + } + + public String getOfficePhone() { + return officePhone; + } + + public void setOfficePhone(String officePhone) { + this.officePhone = officePhone; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getFaxAddress() { + return faxAddress; + } + + public void setFaxAddress(String faxAddress) { + this.faxAddress = faxAddress; + } + + public List getRoleIdList() { + return roleIdList; + } + + public void setRoleIdList(List roleIdList) { + this.roleIdList = roleIdList; + } + + public List getRoleNameList() { + return roleNameList; + } + + public void setRoleNameList(List roleNameList) { + this.roleNameList = roleNameList; + } + + + public String getOrgType() { + return orgType; + } + + public void setOrgType(String orgType) { + this.orgType = orgType; + } + + public List getRoleEOList() { + return roleEOList; + } + + public void setRoleEOList(List roleEOList) { + this.roleEOList = roleEOList; + } + + public List getOrgIdList() { + return orgIdList; + } + + public void setOrgIdList(List orgIdList) { + this.orgIdList = orgIdList; + } + + public List getOrgEOList() { + return orgEOList; + } + + public void setOrgEOList(List orgEOList) { + this.orgEOList = orgEOList; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/config/GetHttpSessionConfigurator.java b/adc-da-sys/src/main/java/com/adc/da/websocket/config/GetHttpSessionConfigurator.java new file mode 100644 index 00000000..95c82c87 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/config/GetHttpSessionConfigurator.java @@ -0,0 +1,28 @@ +package com.adc.da.websocket.config; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpSession; +import javax.websocket.HandshakeResponse; +import javax.websocket.server.HandshakeRequest; +import javax.websocket.server.ServerEndpointConfig; +import javax.websocket.server.ServerEndpointConfig.Configurator; +import java.util.Enumeration; + +public class GetHttpSessionConfigurator extends Configurator { + private static final Logger logger = LoggerFactory.getLogger(GetHttpSessionConfigurator.class); + + @Override + public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) { + HttpSession httpSession=(HttpSession) request.getHttpSession(); + Enumeration attributeNames = httpSession.getAttributeNames(); + logger.info("---------------------------GetHttpSessionConfigurator--------------------------------"); + while (attributeNames.hasMoreElements()){ + String s = attributeNames.nextElement(); + logger.info("建立session时的属性为："+s+" 参数为:"+httpSession.getAttribute(s)); + } + logger.info("---------------------------GetHttpSessionConfigurator--------------------------------"); + sec.getUserProperties().put(HttpSession.class.getName(),httpSession); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/config/SpringWebSocketConfig.java b/adc-da-sys/src/main/java/com/adc/da/websocket/config/SpringWebSocketConfig.java new file mode 100644 index 00000000..40645429 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/config/SpringWebSocketConfig.java @@ -0,0 +1,25 @@ +package com.adc.da.websocket.config; + +import com.adc.da.websocket.handler.SpringWebSocketHandler; +import com.adc.da.websocket.interceptor.SpringWebSocketHandlerInterceptor; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; +import org.springframework.web.socket.handler.TextWebSocketHandler; + + +/*@Configuration +@EnableWebSocket*/ +public class SpringWebSocketConfig extends WebMvcConfigurerAdapter implements WebSocketConfigurer { + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(webSocketHandler(),"/websocket/socketServer").addInterceptors(new SpringWebSocketHandlerInterceptor()).setAllowedOrigins("*"); + registry.addHandler(webSocketHandler(), "/sockjs/socketServer").addInterceptors(new SpringWebSocketHandlerInterceptor()).setAllowedOrigins("*").withSockJS(); + } + +// @Bean + public TextWebSocketHandler webSocketHandler(){ + return new SpringWebSocketHandler(); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/config/WebSocketConfig.java b/adc-da-sys/src/main/java/com/adc/da/websocket/config/WebSocketConfig.java new file mode 100644 index 00000000..571c580d --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/config/WebSocketConfig.java @@ -0,0 +1,15 @@ +package com.adc.da.websocket.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +@Configuration +public class WebSocketConfig { + + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/constant/SocketMesTypeEnum.java b/adc-da-sys/src/main/java/com/adc/da/websocket/constant/SocketMesTypeEnum.java new file mode 100644 index 00000000..b7d3f0cc --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/constant/SocketMesTypeEnum.java @@ -0,0 +1,26 @@ +package com.adc.da.websocket.constant; + + +public enum SocketMesTypeEnum{ + + PROCESS_MESSAGE("process", "流程消息"); + + private String value; + private String text; + + + private SocketMesTypeEnum(String value, String text) { + this.value = value; + this.text = text; + } + + public String getValue() { + return value; + } + + public String getText() { + return text; + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/controller/webSocketController.java b/adc-da-sys/src/main/java/com/adc/da/websocket/controller/webSocketController.java new file mode 100644 index 00000000..9f2b598e --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/controller/webSocketController.java @@ -0,0 +1,39 @@ +package com.adc.da.websocket.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.websocket.entity.WebSocketMessage; +import com.adc.da.websocket.service.WebSocketServer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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 java.util.ArrayList; +import java.util.List; + +@RestController +@RequestMapping("/${restPath}/webSocketCol") +@Api(description = "webSocket测试") +public class webSocketController { + + @Autowired +// public WebSocketService webSocketService; + public WebSocketServer webSocketServer; + + @ApiOperation(value = "|webSocket|发送消息给特定用户") + @GetMapping("/sendMessage") + public ResponseMessage sendMessage(String userId, WebSocketMessage message){ +// webSocketService.sendMessageToUser(userId,message); + webSocketServer.sendMessage(userId,message); + List userList =new ArrayList(); + userList.add(userId); + webSocketServer.sendMessageOfUserList(userList,message); + return Result.success("001","发送成功"); + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/entity/WebSocketBean.java b/adc-da-sys/src/main/java/com/adc/da/websocket/entity/WebSocketBean.java new file mode 100644 index 00000000..c0f3e112 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/entity/WebSocketBean.java @@ -0,0 +1,57 @@ +package com.adc.da.websocket.entity; + +import java.util.concurrent.atomic.AtomicInteger; +import javax.websocket.Session; + +/*** + *webcocketBean对象 + * date: 2018/12/6 18:26 + */ +public class WebSocketBean { + + /** + * 连接session对象 + */ + private Session session; + + /*** + * socket绑定的用户信息 + */ + private String userId; + + /** + * 连接错误次数 + */ + private AtomicInteger erroerLinkCount = new AtomicInteger(0); + + public int getErroerLinkCount() { + // 线程安全,以原子方式将当前值加1，注意：这里返回的是自增前的值 + return erroerLinkCount.getAndIncrement(); + } + + public void cleanErrorNum() + { + // 清空计数 + erroerLinkCount = new AtomicInteger(0); + } + + public Session getSession() { + return session; + } + + public void setSession(Session session) { + this.session = session; + } + + public void setErroerLinkCount(AtomicInteger erroerLinkCount) { + this.erroerLinkCount = erroerLinkCount; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/entity/WebSocketMessage.java b/adc-da-sys/src/main/java/com/adc/da/websocket/entity/WebSocketMessage.java new file mode 100644 index 00000000..19eafcfb --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/entity/WebSocketMessage.java @@ -0,0 +1,36 @@ +package com.adc.da.websocket.entity; + +import java.io.Serializable; + +public class WebSocketMessage implements Serializable{ + + private String message; + + private String type; + + private String businessId; + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getBusinessId() { + return businessId; + } + + public void setBusinessId(String businessId) { + this.businessId = businessId; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/handler/SpringWebSocketHandler.java b/adc-da-sys/src/main/java/com/adc/da/websocket/handler/SpringWebSocketHandler.java new file mode 100644 index 00000000..9c7a817f --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/handler/SpringWebSocketHandler.java @@ -0,0 +1,121 @@ +package com.adc.da.websocket.handler; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.socket.*; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class SpringWebSocketHandler extends TextWebSocketHandler { + + private static final Map users;//这个会出现性能问题，最好用Map来存储，key用userid + private static final Logger logger = LoggerFactory.getLogger(SpringWebSocketHandler.class); + + static { + users = new HashMap(); + } + + public SpringWebSocketHandler() { + super(); + } + + @Override + public void afterConnectionEstablished(WebSocketSession session) throws Exception { + // TODO Auto-generated method stub + System.out.println("connect to the websocket success......当前数量:" + users.size()); + //此处获取用户session中的userId + String userId = (String) session.getAttributes().get("WEBSOCKET_USERID"); + users.put(userId, session); + //这块会实现自己业务，比如，当用户登录后，会把离线消息推送给用户 + //TextMessage returnMessage = new TextMessage("你将收到的离线"); + //session.sendMessage(returnMessage); + + super.afterConnectionEstablished(session); + } + + @Override + public void handleMessage(WebSocketSession session, WebSocketMessage message) throws Exception { + String userId = (String) session.getAttributes().get("WEBSOCKET_USERID"); + logger.info(userId+": 发送了："+message.toString()); + super.handleMessage(session, message); + } + + @Override + protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { + super.handleTextMessage(session, message); + } + + @Override + protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception { + super.handlePongMessage(session, message); + } + + @Override + public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception { + super.handleTransportError(session, exception); + } + + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception { + logger.debug("websocket connection closed......"); + String userId = (String) session.getAttributes().get("WEBSOCKET_USERID"); + logger.info("用户" + userId + "已退出！"); + users.remove(userId); + logger.info("剩余在线用户" + users.size()); + } + + @Override + public boolean supportsPartialMessages() { + return super.supportsPartialMessages(); + } + + /** + * 给某个用户发送消息 + * + * @param userId + * @param message + */ + public void sendMessageToUser(String userId, TextMessage message) { + logger.info("----------------------------------webSocket-----------------"); + if (users.containsKey(userId)) { + WebSocketSession user = users.get(userId); + if (user.isOpen()) { + try { + user.sendMessage(message); + } catch (IOException e) { + logger.error("给"+userId+"用户推送消息时发生异常:" + e.getMessage(), e); + } + } + } + } + + /** + * 给某个用户发送消息 + * + * @param userIdList + * @param message + */ + public void sendMessageToUsers(List userIdList, TextMessage message) { + if (userIdList != null && !userIdList.isEmpty()) { + for (String userId : userIdList) { + if (users.containsKey(userId)) { + WebSocketSession user = users.get(userId); + if (user.isOpen()) { + try { + user.sendMessage(message); + } catch (IOException e) { + logger.error("给"+userId+"用户推送消息时发生异常:" + e.getMessage(), e); + } + } + } + } + } + + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/interceptor/SpringWebSocketHandlerInterceptor.java b/adc-da-sys/src/main/java/com/adc/da/websocket/interceptor/SpringWebSocketHandlerInterceptor.java new file mode 100644 index 00000000..2c3d17b4 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/interceptor/SpringWebSocketHandlerInterceptor.java @@ -0,0 +1,36 @@ +package com.adc.da.websocket.interceptor; + +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.http.server.ServletServerHttpRequest; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor; + +import javax.servlet.http.HttpSession; +import java.util.Map; + +public class SpringWebSocketHandlerInterceptor extends HttpSessionHandshakeInterceptor { + + @Override + public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) throws Exception { + // TODO Auto-generated method stub + if (request instanceof ServletServerHttpRequest) { + ServletServerHttpRequest servletRequest = (ServletServerHttpRequest) request; + HttpSession session = servletRequest.getServletRequest().getSession(false); + if (session != null) { + //使用userName区分WebSocketHandler，以便定向发送消息 + String userId = (String) session.getAttribute("LOGIN_USER_ID"); + if (userId==null) { + userId="default-system"; + } + attributes.put("WEBSOCKET_USERID",userId); + } + } + return super.beforeHandshake(request, response, wsHandler, attributes); + } + + @Override + public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception ex) { + super.afterHandshake(request, response, wsHandler, ex); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebSocketServer.java b/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebSocketServer.java new file mode 100644 index 00000000..bc03304b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebSocketServer.java @@ -0,0 +1,59 @@ +package com.adc.da.websocket.service; + +import com.adc.da.websocket.entity.WebSocketMessage; + +import javax.websocket.EndpointConfig; +import javax.websocket.Session; +import java.util.List; + + +public interface WebSocketServer { + /** + * 连接建立成功调用的方法 + * @param session session 对象 + */ + public void onOpen(Session session, EndpointConfig config); + + /** + * 断开连接方法 + */ + public void onClose(Session session); + + /** + * 收到客户端消息后调用的方法 + * @param session session 对象 + * @param message 返回客户端的消息 + */ + public void onMessage(Session session, String message); + + /** + * 发生异常时触发的方法 + * @param session session 对象 + * @param throwable 抛出的异常 + */ + public void onError(Session session,Throwable throwable); + + /** + * 向单个客户端发送消息 + * @param userId 用户ID对象 + * @param message 发送给客户端的消息 + */ + public void sendMessage(String userId, WebSocketMessage message); + + /*** + * 向多个用户发送消息 + * @MethodName:sendMessageOfUserList + * @author: zhangyanduan + * @param:[userList, message] + * @return:void + * date: 2018/12/17 15:04 + */ + public void sendMessageOfUserList(List userList,WebSocketMessage message); + + /** + * 向所有在线用户群发消息 + * @param message 发送给客户端的消息 + */ + public void batchSendMessage(String message); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebSocketService.java b/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebSocketService.java new file mode 100644 index 00000000..94b1f2c3 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebSocketService.java @@ -0,0 +1,44 @@ +package com.adc.da.websocket.service; + + +import com.adc.da.websocket.handler.SpringWebSocketHandler; +import org.springframework.web.socket.TextMessage; + +import java.util.List; + +//@Service("webSocketService") +public class WebSocketService { + +// @Bean//这个注解会从Spring容器拿出Bean + public SpringWebSocketHandler infoHandler() { + return new SpringWebSocketHandler(); + } + + + /*** + * 向某用户推送消息 + * @MethodName:sendMessageToUser + * @author: DuYunbao + * @param:[userId, messageText] + * @return:void + * date: 2018/11/30 14:49 + */ + public void sendMessageToUser(String userId,String messageText){ + +// infoHandler().sendMessageToUser(userId,new TextMessage(messageText)); + } + + /*** + * 同时向多个用户推送统一消息 + * @MethodName:sendMessageToUserList + * @author: DuYunbao + * @param:[userList, messageText] + * @return:void + * date: 2018/11/30 14:50 + */ + public void sendMessageToUserList(List userList,String messageText){ + infoHandler().sendMessageToUsers(userList,new TextMessage(messageText)); + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebsocketServerImpl.java b/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebsocketServerImpl.java new file mode 100644 index 00000000..99c9f754 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/websocket/service/WebsocketServerImpl.java @@ -0,0 +1,140 @@ +package com.adc.da.websocket.service; + +import com.adc.da.websocket.config.GetHttpSessionConfigurator; +import com.adc.da.websocket.entity.WebSocketBean; +import com.adc.da.websocket.entity.WebSocketMessage; +import com.alibaba.fastjson.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpSession; +import javax.websocket.*; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@ServerEndpoint(value = "/websocket/socketServer/{userId}",configurator= GetHttpSessionConfigurator.class) +@Component("webSocketService") +public class WebsocketServerImpl implements WebSocketServer { + + private static final Logger logger = LoggerFactory.getLogger(WebsocketServerImpl.class); + + /** + * 错误最大重试次数 + */ + private static final int MAX_ERROR_NUM = 10; + + /** + * 用来存放每个客户端对应的webSocket对象。 + */ + private static Map webSocketInfo; + + static + { + // concurrent包的线程安全map + webSocketInfo = new ConcurrentHashMap(); + } + + @OnOpen + public void onOpen(@PathParam(value = "userId") String userId, Session session, EndpointConfig config) { +// 如果是session没有激活的情况，就是没有请求获取或session，这里可能会取出空，需要实际业务处理 + HttpSession httpSession= (HttpSession) config.getUserProperties().get(HttpSession.class.getName()); + if(httpSession != null) + { + logger.info("获取到httpsession" + httpSession.getId()); +// String userId = (String) httpSession.getAttribute(RequestUtils.LOGIN_USER_ID); + Enumeration attributeNames = httpSession.getAttributeNames(); + while(attributeNames.hasMoreElements()){ + String s = attributeNames.nextElement(); + logger.info("建立session时的属性为："+s+" 参数为:"+httpSession.getAttribute(s)); + } + logger.info("--------websocket 打开链接 当前用户为:"+userId); + }else { + logger.error("未获取到httpsession"); + } + + // 连接成功当前对象放入websocket对象集合 + WebSocketBean bean = new WebSocketBean(); + bean.setSession(session); + webSocketInfo.put(userId,bean); + + logger.info("客户端连接服务器session id :"+session.getId()+"，当前连接数：" + webSocketInfo.size()); + } + + @Override + public void onOpen(Session session, EndpointConfig config) { + logger.info("-------------------------此处仅为实现其接口即可-----------------------------------"); + } + + @OnClose + @Override + public void onClose(Session session) { + // 客户端断开连接移除websocket对象 + webSocketInfo.remove(session.getId()); + logger.info("客户端断开连接，当前连接数：" + webSocketInfo.size()); + } + + @OnMessage + @Override + public void onMessage(Session session, String message) { + logger.info("客户端 session id: "+session.getId()+"，消息:" + message); + + // 此方法为客户端给服务器发送消息后进行的处理，可以根据业务自己处理，这里返回页面 +// sendMessage(session, "服务端返回" + message); + } + + @OnError + @Override + public void onError(Session session, Throwable throwable) { + logger.error("发生错误"+ throwable.getMessage(),throwable); + } + + @Override + public void sendMessage(String userId, WebSocketMessage webSocketMessage) { + String message = JSONObject.toJSONString(webSocketMessage); + try { + WebSocketBean webSocketBean = webSocketInfo.get(userId); + if(webSocketBean != null){ + webSocketBean.getSession().getBasicRemote().sendText(message); + webSocketBean.cleanErrorNum(); + }else{ + logger.info("用户:"+userId+" 当前不在线！"); + } + } catch (Exception e) { + logger.error("发送消息失败"+ e.getMessage(),e); + try { + int errorNum = webSocketInfo.get(userId).getErroerLinkCount(); + // 小于最大重试次数重发 + if (errorNum <= MAX_ERROR_NUM) { + sendMessage(userId, webSocketMessage); + } else { + logger.error("发送消息失败超过最大次数"); + // 清空错误计数 + webSocketInfo.get(userId).cleanErrorNum(); + } + }catch (Exception e1){ + logger.error(e1.getMessage(),e1); + } + } + } + + @Override + public void sendMessageOfUserList(List userList, WebSocketMessage message) { + if(userList !=null && !userList.isEmpty()){ + for(String userId:userList){ + sendMessage(userId, message); + } + } + } + + @Override + public void batchSendMessage(String message) { + // 不做操作 + } + + +} diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml new file mode 100644 index 00000000..04f4a809 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + id, file_name, old_file_name, file_suffix, file_path, valid_flag, creation_time, modify_time + + + + CREATE TABLE ${tableName} ( + "ID" VARCHAR2(100 CHAR) NOT NULL PRIMARY KEY, + "FILE_NAME" VARCHAR2(255 CHAR) NULL , + "OLD_FILE_NAME" VARCHAR2(255 CHAR) NULL , + "FILE_SUFFIX" VARCHAR2(30 CHAR) NULL , + "FILE_PATH" VARCHAR2(255 CHAR) NULL , + "VALID_FLAG" NUMBER(1) NULL , + "CREATION_TIME" DATE NULL , + "MODIFY_TIME" DATE NULL + ) + LOGGING + NOCOMPRESS + NOCACHE + + + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and file_name ${fileNameOperator} #{fileName} + + + and old_file_name ${oldFileNameOperator} #{oldFileName} + + + and file_suffix ${fileSuffixOperator} #{fileSuffix} + + + and file_path ${filePathOperator} #{filePath} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + + + + + + insert into ${tableName}() + values (#{id, jdbcType=VARCHAR}, #{fileName, jdbcType=VARCHAR}, #{oldFileName, jdbcType=VARCHAR}, #{fileSuffix, jdbcType=VARCHAR}, #{filePath, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}) + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml new file mode 100644 index 00000000..e0084ffb --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, collect_res_id, collect_info_uri, collect_title, collect_type, user_id, id + + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag = #{validFlag} + + + and collect_res_id ${collectResIdOperator} #{collectResId} + + + and collect_info_uri ${collectInfoUriOperator} #{collectInfoUri} + + + and collect_title like concat(concat('%',#{collectTitle}),'%') + + + and collect_type ${collectTypeOperator} #{collectType} + + + and collect_type IN + + #{collectTypeItem} + + + + + and user_id ${userIdOperator} #{userId} + + + and id ${idOperator} #{id} + + + + + + where 1=1 + + + and TS_PERSON_COLLECT.modify_time ${modifyTimeOperator} #{modifyTime} + + + and TS_PERSON_COLLECT.modify_time >= #{modifyTime1} + + + and TS_PERSON_COLLECT.modify_time <= #{modifyTime2} + + + and TS_PERSON_COLLECT.creation_time ${creationTimeOperator} #{creationTime} + + + and TS_PERSON_COLLECT.creation_time >= #{creationTime1} + + + and TS_PERSON_COLLECT.creation_time <= #{creationTime2} + + + and TS_PERSON_COLLECT.valid_flag = #{validFlag} + + + and TS_PERSON_COLLECT.collect_res_id ${collectResIdOperator} #{collectResId} + + + and TS_PERSON_COLLECT.collect_info_uri ${collectInfoUriOperator} #{collectInfoUri} + + + and ( + CASE TS_PERSON_COLLECT.collect_type + WHEN 'INLAND_STAND' THEN + DECODE ( + SAR_STANDARDS_INFO.STAND_YEAR, + NULL, + SAR_STANDARDS_INFO.stand_name || ' (' || td1.DIC_TYPE_NAME || ' ' || SAR_STANDARDS_INFO.stand_number || ')', + SAR_STANDARDS_INFO.stand_name || ' (' || td1.DIC_TYPE_NAME || ' ' || SAR_STANDARDS_INFO.stand_number || '-' || SAR_STANDARDS_INFO.stand_year|| ')' + ) + WHEN 'FOREIGN_STAND' THEN + DECODE ( + SAR_STANDARDS_INFO.STAND_YEAR, + NULL, + SAR_STANDARDS_INFO.stand_name || ' (' || td1.DIC_TYPE_NAME || ' ' || SAR_STANDARDS_INFO.stand_number || ')', + SAR_STANDARDS_INFO.stand_name || ' (' || td1.DIC_TYPE_NAME || ' ' || SAR_STANDARDS_INFO.stand_number || '-' || SAR_STANDARDS_INFO.stand_year|| ')' + ) + WHEN 'BUSINESS_STAND' THEN + DECODE ( + SAR_BUSSIONESS_STAND.STAND_YEAR, + NULL, + SAR_BUSSIONESS_STAND.stand_name || ' (' || td2.DIC_TYPE_NAME || ' ' || SAR_BUSSIONESS_STAND.stand_code || ')', + SAR_BUSSIONESS_STAND.stand_name || ' (' || td2.DIC_TYPE_NAME || ' ' || SAR_BUSSIONESS_STAND.stand_code || '-' || SAR_BUSSIONESS_STAND.stand_year|| ')' + ) + ELSE + TS_PERSON_COLLECT.collect_title + END + ) like concat(concat('%',#{collectTitle}),'%') + + + and TS_PERSON_COLLECT.collect_type ${collectTypeOperator} #{collectType} + + + and TS_PERSON_COLLECT.collect_type IN + + #{collectTypeItem} + + + + + and TS_PERSON_COLLECT.user_id ${userIdOperator} #{userId} + + + and TS_PERSON_COLLECT.id ${idOperator} #{id} + + + + + + + + insert into TS_PERSON_COLLECT() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, + #{collectResId, jdbcType=VARCHAR}, #{collectInfoUri, jdbcType=VARCHAR}, #{collectTitle, jdbcType=VARCHAR}, + #{collectType, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + + + + + + insert into TS_PERSON_COLLECT + + modify_time, + creation_time, + valid_flag, + collect_res_id, + collect_info_uri, + collect_title, + collect_type, + user_id, + id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{collectResId, jdbcType=VARCHAR}, + #{collectInfoUri, jdbcType=VARCHAR}, + #{collectTitle, jdbcType=VARCHAR}, + #{collectType, jdbcType=VARCHAR}, + #{userId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + + + + + update TS_PERSON_COLLECT + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + collect_res_id = #{collectResId}, + collect_info_uri = #{collectInfoUri}, + collect_title = #{collectTitle}, + collect_type = #{collectType}, + user_id = #{userId} + where id = #{id} + + + + + update TS_PERSON_COLLECT + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + collect_res_id = #{collectResId}, + + + collect_info_uri = #{collectInfoUri}, + + + collect_title = #{collectTitle}, + + + collect_type = #{collectType}, + + + user_id = #{userId}, + + + where id = #{id} + + + + + + + + delete from TS_PERSON_COLLECT + where id = #{value} + + + + + + + + + + + + + + + + + + + + + delete from TS_PERSON_COLLECT + + + "ID" IN + + #{item} + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonConfEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonConfEOMapper.xml new file mode 100644 index 00000000..98fd8926 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonConfEOMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, display_seq, module_code, module_name, user_id, id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and display_seq ${displaySeqOperator} #{displaySeq} + + + and module_code ${moduleCodeOperator} #{moduleCode} + + + and module_name ${moduleNameOperator} #{moduleName} + + + and user_id ${userIdOperator} #{userId} + + + and id ${idOperator} #{id} + + + + + + + + insert into TS_PERSON_CONF() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{displaySeq, jdbcType=INTEGER}, #{moduleCode, jdbcType=VARCHAR}, #{moduleName, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + + + + + + insert into TS_PERSON_CONF + + modify_time, + creation_time, + valid_flag, + display_seq, + module_code, + module_name, + user_id, + id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{displaySeq, jdbcType=INTEGER}, + #{moduleCode, jdbcType=VARCHAR}, + #{moduleName, jdbcType=VARCHAR}, + #{userId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + + + + + update TS_PERSON_CONF + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + display_seq = #{displaySeq}, + module_code = #{moduleCode}, + module_name = #{moduleName}, + user_id = #{userId} + where id = #{id} + + + + + update TS_PERSON_CONF + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = 1, + + + display_seq = #{displaySeq}, + + + module_code = #{moduleCode}, + + + module_name = #{moduleName}, + + + user_id = #{userId}, + + + where id = #{id} + + + + + + + + delete from TS_PERSON_CONF + where id = #{value} + + + + + + + + + + + + + + insert into TS_PERSON_CONF + + modify_time, + creation_time, + valid_flag, + display_seq, + module_code, + module_name, + user_id, + id, + where valid_flag = 0 + + + + + + + + + + + + + + + + update TS_PERSON_CONF + + + modify_time = #{modifyTime}, + + + valid_flag = #{validFlag}, + + + display_seq = #{displaySeq}, + + + where 1=1 + + and module_code = #{moduleCode} + + + and user_id = #{userId} + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCookiesEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCookiesEOMapper.xml new file mode 100644 index 00000000..3115b52d --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCookiesEOMapper.xml @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, res_uri, res_id, res_title, cookie_type, user_id, id + + + + + where 1=1 + + + and TS_PERSON_COOKIES.modify_time ${modifyTimeOperator} #{modifyTime} + + + and TS_PERSON_COOKIES.modify_time >= #{modifyTime1} + + + and TS_PERSON_COOKIES.modify_time <= #{modifyTime2} + + + and TS_PERSON_COOKIES.creation_time ${creationTimeOperator} #{creationTime} + + + and TS_PERSON_COOKIES.creation_time >= #{creationTime1} + + + and TS_PERSON_COOKIES.creation_time <= #{creationTime2} + + + and TS_PERSON_COOKIES.valid_flag ${validFlagOperator} #{validFlag} + + + and TS_PERSON_COOKIES.res_uri ${resUriOperator} #{resUri} + + + and TS_PERSON_COOKIES.res_id ${resIdOperator} #{resId} + + + and TS_PERSON_COOKIES.res_title ${resTitleOperator} #{resTitle} + + + and TS_PERSON_COOKIES.cookie_type ${cookieTypeOperator} #{cookieType} + + + and TS_PERSON_COOKIES.user_id ${userIdOperator} #{userId} + + + and TS_PERSON_COOKIES.id ${idOperator} #{id} + + + + + + + + insert into TS_PERSON_COOKIES() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, + #{resUri, jdbcType=VARCHAR}, #{resId, jdbcType=VARCHAR}, #{resTitle, jdbcType=VARCHAR}, + #{cookieType, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + + + + + + insert into TS_PERSON_COOKIES + + modify_time, + creation_time, + valid_flag, + res_uri, + res_id, + res_title, + cookie_type, + user_id, + id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{resUri, jdbcType=VARCHAR}, + #{resId, jdbcType=VARCHAR}, + #{resTitle, jdbcType=VARCHAR}, + #{cookieType, jdbcType=VARCHAR}, + #{userId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + + + + + update TS_PERSON_COOKIES + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + res_uri = #{resUri}, + res_id = #{resId}, + res_title = #{resTitle}, + cookie_type = #{cookieType}, + user_id = #{userId} + where id = #{id} + + + + + + update TS_PERSON_COOKIES + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + res_uri = #{resUri}, + + + res_id = #{resId}, + + + res_title = #{resTitle}, + + + cookie_type = #{cookieType}, + + + user_id = #{userId}, + + + where id = #{id} + + + + + + + update TS_PERSON_COOKIES + set + valid_flag = 1 where user_id = #{userId} + + + + + + + + delete from TS_PERSON_COOKIES + where id = #{value} + + + + + + + + + + + + + + + + + + + + + + + update TS_PERSON_COOKIES + set + valid_flag = 1 + where id=#{id} + + and user_id=#{userId} + + + + + + + update TS_PERSON_COOKIES + set valid_flag = 1 + where id = #{id} + + + + + + + + + + + + + + + + UPDATE TS_PERSON_COOKIES SET valid_flag = 1 + + + "ID" IN + + #{item} + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonMsgEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonMsgEOMapper.xml new file mode 100644 index 00000000..ac7ecdad --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonMsgEOMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, read_flag, msg_content, msg_title, user_id, id,processnum + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and read_flag ${readFlagOperator} #{readFlag} + + + and msg_content ${msgContentOperator} #{msgContent} + + + and msg_title ${msgTitleOperator} concat(concat('%',#{msgTitle}),'%') + + + and user_id ${userIdOperator} #{userId} + + + and id ${idOperator} #{id} + + + and processnum ${processnumOperator} #{processnum} + + + + + + + + insert into TS_PERSON_MSG() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{readFlag, jdbcType=INTEGER}, #{msgContent, jdbcType=VARCHAR}, #{msgTitle, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{processnum, jdbcType=VARCHAR}) + + + + + + insert into TS_PERSON_MSG + + modify_time, + creation_time, + valid_flag, + read_flag, + msg_content, + msg_title, + user_id, + id, + processnum, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{readFlag, jdbcType=INTEGER}, + #{msgContent, jdbcType=VARCHAR}, + #{msgTitle, jdbcType=VARCHAR}, + #{userId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + #{processnum, jdbcType=VARCHAR}, + + + + + + update TS_PERSON_MSG + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + read_flag = #{readFlag}, + msg_content = #{msgContent}, + msg_title = #{msgTitle}, + user_id = #{userId}, + processnum = #{processnum} + where id = #{id} + + + + + update TS_PERSON_MSG + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + read_flag = #{readFlag}, + + + msg_content = #{msgContent}, + + + msg_title = #{msgTitle}, + + + user_id = #{userId}, + + + processnum = #{processnum}, + + + where id = #{id} + + + + + + + + delete from TS_PERSON_MSG + where id = #{value} + + + + + + + + + + + + + + + + + + + UPDATE TS_PERSON_SHARE SET valid_flag = 1 + + + "ID" IN + + #{item} + + + + + + + UPDATE TS_PERSON_MSG SET valid_flag = 1 + + + "ID" IN + + #{item} + + + + + + + UPDATE TS_PERSON_MSG SET read_flag = 1 + + + "ID" IN + + #{item} + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonNoteEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonNoteEOMapper.xml new file mode 100644 index 00000000..a73458b9 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonNoteEOMapper.xml @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + modify_time, creartion_time, valid_flag, res_type, res_id, collect_id, user_id, id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creartion_time ${creartionTimeOperator} #{creartionTime} + + + and creartion_time >= #{creartionTime1} + + + and creartion_time <= #{creartionTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and note_content ${noteContentOperator} #{noteContent} + + + and res_type ${resTypeOperator} #{resType} + + + and res_id ${resIdOperator} #{resId} + + + and collect_id ${collectIdOperator} #{collectId} + + + and user_id ${userIdOperator} #{userId} + + + and id ${idOperator} #{id} + + + + + + + + insert into TS_PERSON_NOTE() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creartionTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, + #{noteContent, jdbcType=VARCHAR}, #{resType, jdbcType=VARCHAR}, #{resId, jdbcType=VARCHAR}, + #{collectId, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + + + + + + insert into TS_PERSON_NOTE + + modify_time, + creartion_time, + valid_flag, + note_content, + res_type, + res_id, + collect_id, + user_id, + id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creartionTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{noteContent, jdbcType=VARCHAR}, + #{resType, jdbcType=VARCHAR}, + #{resId, jdbcType=VARCHAR}, + #{collectId, jdbcType=VARCHAR}, + #{userId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + + + + + update TS_PERSON_NOTE + set modify_time = #{modifyTime}, + creartion_time = #{creartionTime}, + valid_flag = #{validFlag}, + note_content = #{noteContent}, + res_type = #{resType}, + res_id = #{resId}, + collect_id = #{collectId}, + user_id = #{userId} + where id = #{id} + + + + + + update TS_PERSON_NOTE + + + modify_time = #{modifyTime}, + + + creartion_time = #{creartionTime}, + + + valid_flag = #{validFlag}, + + + note_content = #{noteContent}, + + + res_type = #{resType}, + + + res_id = #{resId}, + + + collect_id = #{collectId}, + + + user_id = #{userId}, + + + where id = #{id} + + + + + + + + delete from TS_PERSON_NOTE + where id = #{value} + + + + + + + + + + + + + + + update TS_PERSON_NOTE set note_Content =#{noteContent} where collect_Id = #{collectId,jdbcType=VARCHAR} and id = #{id} and valid_flag = 0 + + + + + + + + + update TS_PERSON_NOTE + set + valid_flag=1 + where id = #{id} and collect_id=#{collectId,jdbcType=VARCHAR} + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonSearchEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonSearchEOMapper.xml new file mode 100644 index 00000000..97c7fead --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonSearchEOMapper.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, search_content, user_id, id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and search_content ${searchContentOperator} concat(concat('%',#{searchContent}),'%') + + + and user_id ${userIdOperator} #{userId} + + + and id ${idOperator} #{id} + + + + + + + + insert into TS_PERSON_SEARCH() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{searchContent, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + + + + + + insert into TS_PERSON_SEARCH + + modify_time, + creation_time, + valid_flag, + search_content, + user_id, + id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{searchContent, jdbcType=VARCHAR}, + #{userId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + + + + + update TS_PERSON_SEARCH + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + search_content = #{searchContent}, + user_id = #{userId} + where id = #{id} + + + + + update TS_PERSON_SEARCH + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + search_content = #{searchContent}, + + + user_id = #{userId}, + + + where id = #{id} + + + + + + + + delete from TS_PERSON_SEARCH + where id = #{value} + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonShareEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonShareEOMapper.xml new file mode 100644 index 00000000..42d27738 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonShareEOMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag,f_valid_flag, read_flag, res_title, res_uri, res_id, res_type, share_user_id, recipient_id, id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and f_valid_flag ${validFlagOperator} #{fvalidFlag} + + + and f_valid_flag ${fvalidFlagOperator} #{fvalidFlag} + + + and res_title ${resTitleOperator} concat(concat('%',#{resTitle}),'%') + + + and res_uri ${resUriOperator} #{resUri} + + + and res_id ${resIdOperator} #{resId} + + + and res_type ${resTypeOperator} #{resType} + + + and share_user_id ${shareUserIdOperator} #{shareUserId} + + + and recipient_id ${recipientIdOperator} #{recipientId} + + + and id ${idOperator} #{id} + + + + + + + + insert into TS_PERSON_SHARE() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER},#{fvalidFlag, jdbcType=INTEGER}, #{readFlag, jdbcType=INTEGER}, #{resTitle, jdbcType=VARCHAR}, #{resUri, jdbcType=VARCHAR}, #{resId, jdbcType=VARCHAR}, #{resType, jdbcType=VARCHAR}, #{shareUserId, jdbcType=VARCHAR}, #{recipientId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) + + + + + + insert into TS_PERSON_SHARE + + modify_time, + creation_time, + valid_flag, + f_valid_flag, + read_flag, + res_title, + res_uri, + res_id, + res_type, + share_user_id, + recipient_id, + id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{fvalidFlag, jdbcType=INTEGER}, + #{readFlag, jdbcType=INTEGER}, + #{resTitle, jdbcType=VARCHAR}, + #{resUri, jdbcType=VARCHAR}, + #{resId, jdbcType=VARCHAR}, + #{resType, jdbcType=VARCHAR}, + #{shareUserId, jdbcType=VARCHAR}, + #{recipientId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + + + + + update TS_PERSON_SHARE + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + read_flag = #{readFlag}, + res_title = #{resTitle}, + res_uri = #{resUri}, + res_id = #{resId}, + res_type = #{resType}, + share_user_id = #{shareUserId}, + recipient_id = #{recipientId} + where id = #{id} + + + + + update TS_PERSON_SHARE + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + read_flag = #{readFlag}, + + + res_title = #{resTitle}, + + + res_uri = #{resUri}, + + + res_id = #{resId}, + + + res_type = #{resType}, + + + share_user_id = #{shareUserId}, + + + recipient_id = #{recipientId}, + + + where id = #{id} + + + + + + + + delete from TS_PERSON_SHARE + where id = #{value} + + + + + + + + + + + + UPDATE TS_PERSON_SHARE SET valid_flag = 1 + + + "ID" IN + + #{item} + + + + + + + UPDATE TS_PERSON_SHARE SET f_valid_flag = 1 + + + "ID" IN + + #{item} + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/FeedbackInfoEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/FeedbackInfoEOMapper.xml new file mode 100644 index 00000000..6087eee7 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/FeedbackInfoEOMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + TFI.id, TFI.user_id, TFI.feedback_info, TFI.read_flag, TFI.valid_flag, TFI.creation_time, TFI.modify_time,TFI.content_text + ,TUI.duty AS duty,TUI.office_phone AS officePhone,TUI.mobile_phone AS mobilePhone,TU.uname AS uname,tor.ORG_NAME AS orgName + + + + id, user_id, feedback_info, read_flag, valid_flag, creation_time, modify_time + + + + + where 1=1 and TFI.valid_flag =0 + + + and id ${idOperator} #{id} + + + and TFI.user_id = #{selfId} + + + and feedback_info ${feedbackInfoOperator} #{feedbackInfo} + + + and read_flag ${readFlagOperator} #{readFlag} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and UNAME like '%${uname}%' + + + and ORG_TYPE = #{orgType} + + + + + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/LinkInfoEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/LinkInfoEOMapper.xml new file mode 100644 index 00000000..b6fc2999 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/LinkInfoEOMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + id, web_name, old_web_site, new_web_site, display_seq, is_show, valid_flag, creation_time, modify_time + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and web_name ${webNameOperator} #{webName} + + + and old_web_site ${oldWebSiteOperator} #{oldWebSite} + + + and new_web_site ${newWebSiteOperator} #{newWebSite} + + + and display_seq ${displaySeqOperator} #{displaySeq} + + + and is_show ${isShowOperator} #{isShow} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + + + + + + + + + + + + + delete from TS_LINK_INFO + where id in + + #{item} + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/LoginInfoEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/LoginInfoEOMapper.xml new file mode 100644 index 00000000..a9b93b08 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/LoginInfoEOMapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + modify_time, creation_time, login_address, login_time, user_id, id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and login_address ${loginAddressOperator} #{loginAddress} + + + and login_time ${loginTimeOperator} #{loginTime} + + + and login_time >= #{loginTime1} + + + and login_time <= #{loginTime2} + + + and user_id ${userIdOperator} #{userId} + + + and id ${idOperator} #{id} + + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/MenuEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/MenuEOMapper.xml new file mode 100644 index 00000000..41e1c2d7 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/MenuEOMapper.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + id, valid_flag, name, parent_id, parent_ids, href, icon, is_show, permission, remarks,modify_time, creation_time + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and name ${nameOperator} #{name} + + + and parent_id ${parentIdOperator} #{parentId} + + + and parent_ids ${parentIdsOperator} #{parentIds} + + + and href ${hrefOperator} #{href} + + + and icon ${iconOperator} #{icon} + + + and is_show ${isShowOperator} #{isShow} + + + and permission ${permissionOperator} #{permission} + + + and remarks ${remarksOperator} #{remarks} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + + + + UPDATE TS_MENU set valid_flag = ${@com.adc.da.util.constant.DeleteFlagEnum@DELETE.getValue()} + WHERE id in + + #{id} + + + + + + DELETE FROM TS_ROLE_MENU where MENU_ID in + + #{id} + + or MENU_ID in ( + select ID from TS_MENU where + + PARENT_IDS like '%'||#{id}||'%' + + ) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/OrgEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/OrgEOMapper.xml new file mode 100644 index 00000000..07470641 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/OrgEOMapper.xml @@ -0,0 +1,733 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, valid_flag, org_name, org_desc,org_code,parent_id, parent_ids, is_show, remarks,shot_name,sso_id,sso_org_id,creation_time,modify_time + + + + + TS_ORG.id, TS_ORG.valid_flag, TS_ORG.org_name, TS_ORG.org_desc,TS_ORG.org_code,TS_ORG.parent_id, TS_ORG.parent_ids, TS_ORG.is_show, TS_ORG.remarks,TS_ORG.shot_name + + + + TS_ORG.id, TS_ORG.valid_flag, TS_ORG.org_name, TS_ORG.org_desc,TS_ORG.org_code,TS_ORG.parent_id, TS_ORG.parent_ids, TS_ORG.is_show, TS_ORG.remarks,TS_ORG.shot_name,TS_ORG.org_type + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and org_name ${nameOperator} #{orgName} + + + and org_desc ${orgDescOperator} #{orgDesc} + + + and org_code ${orgCodeOperator} #{orgCode} + + + and org_type ${orgTypeOperator} #{orgType} + + + and parent_id ${parentIdOperator} #{pId} + + + and parent_ids ${parentIdsOperator} #{parentIds} + + + and is_show ${isShowOperator} #{isShow} + + + and remarks ${remarksOperator} #{remarks} + + + + + + update TS_ORG + set valid_flag = 1 + where id = #{id} + + + + + update TS_ORG + + + valid_flag = #{validFlag}, + + + org_name = #{orgName}, + + + parent_id = #{pId}, + + + parent_ids = #{parentIds}, + + + org_desc = #{orgDesc}, + + + org_code = #{orgCode}, + + + org_type = #{orgType}, + + + is_show = #{isShow}, + + + remarks = #{remarks}, + + + shot_name = #{shotName}, + + + sso_id = #{ssoId} + + + sso_org_id = #{ssoOrgId} + + + where id = #{id} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DELETE FROM TS_USER_ORG WHERE USER_ID = #{userId} AND ORG_ID = #{orgId} + + + DELETE FROM TS_USER_ORG WHERE USER_ID = #{usId} + + + + insert into TS_USER_ORG + ( + user_id, + org_id + ) SELECT A.* + FROM ( + + SELECT + #{item.userId,jdbcType=VARCHAR}, + #{item.orgId,jdbcType=VARCHAR} + FROM DUAL + + )A + + + insert into TS_USER_ORG + (user_id,org_id) + values + (#{userId,jdbcType=VARCHAR}, + #{orgId,jdbcType=VARCHAR}) + + + update TS_USER_ORG + set org_id = #{orgId} + where user_id = #{userId} + + + + DELETE FROM TS_USER_ORG WHERE ORG_ID = #{orgId} + + + + + + + + + insert into TS_ORG + + id, + valid_flag, + org_name, + org_desc, + org_code, + org_type, + parent_id, + parent_ids, + is_show, + remarks, + creation_time, + modify_time, + shot_name, + sso_id, + sso_org_id + + + #{id}, + #{validFlag}, + #{orgName}, + #{orgDesc}, + #{orgCode}, + #{orgType}, + #{pId}, + #{parentIds}, + #{isShow}, + #{remarks}, + #{creationTime}, + #{modifyTime}, + #{shotName}, + #{ssoOrgId} + + + + + + update TS_ORG + + + valid_flag = #{validFlag}, + + + org_name = #{orgName}, + + + parent_id = #{pId}, + + + parent_ids = #{parentIds}, + + + org_desc = #{orgDesc}, + + + org_code = #{orgCode}, + + + org_type = #{orgType}, + + + is_show = #{isShow}, + + + remarks = #{remarks}, + + + shot_name = #{shotName}, + + + modify_time = #{modifyTime}, + + + sso_id = #{ssoId}, + + + sso_org_id = #{ssoOrgId}, + + + where id = #{id} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/RoleEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/RoleEOMapper.xml new file mode 100644 index 00000000..2cd5931f --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/RoleEOMapper.xml @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, valid_flag,role_type, is_default, name, remarks, ext_info,use_flag,oper_user,creation_time,modify_time + + + + r.*, m.id as m_id, + m.valid_flag as m_validFlag, + m.name as m_name, + m.parent_id as m_parentId, + m.parent_ids as m_parentIds, + m.href as m_href, + m.icon as m_icon, + m.is_show as m_isShow, + m.permission as m_permission, + m.remarks as m_remarks + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and role_type ${roleTypeOperator} #{roleType} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and is_default ${isDefaultOperator} #{isDefault} + + + and name ${nameOperator} #{name} + + + and remarks ${remarksOperator} #{remarks} + + + and use_flag = #{useFlag} + + + + + + + select SEQ_TS_ROLE.nextval as idfrom dual + + update TS_ROLE + set `valid_flag`= 0 + where `id` = #{id} + + + + + + + + + + update TS_ROLE + set valid_flag = 1 + where id = #{roleId} + + + + delete from TS_ROLE_MENU rm + where rm.role_id = #{roleId} + + + + + + + + + + + + + + + insert into TS_ROLE_MENU(role_id,menu_id) values (#{roleId}, #{menuId}) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/RoleSarMenuEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/RoleSarMenuEOMapper.xml new file mode 100644 index 00000000..182e0203 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/RoleSarMenuEOMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + role_id, sar_menu_id + + + + + where 1=1 + + + and role_id ${roleIdOperator} #{roleId} + + + and sar_menu_id ${sarMenuIdOperator} #{sarMenuId} + + + + + + + insert into TS_ROLE_SAR_SUB_MENU() + values (#{roleId, jdbcType=VARCHAR}, #{sarMenuId, jdbcType=VARCHAR}) + + + + + + + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserConfigEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserConfigEOMapper.xml new file mode 100644 index 00000000..14032a40 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserConfigEOMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, config_content, config_type, user_id, id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and config_content ${configContentOperator} #{configContent} + + + and config_type ${configTypeOperator} #{configType} + + + and user_id ${userIdOperator} #{userId} + + + and id ${idOperator} #{id} + + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml new file mode 100644 index 00000000..faea55b4 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -0,0 +1,615 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type + + + + usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type,sso_id + + + + + + u.*, r.id as id, + r.valid_flag as r_validFlag, + r.is_default as isDefault, + r.name as name, + r.remarks as remarks, + r.ext_info as r_extInfo, + r.is_default as isDefault, + ORG.id AS org_id, + ORG.ORG_NAME AS org_name, + ORG.ORG_DESC AS org_desc, + ORG.ORG_CODE AS org_code, + ORG.ORG_TYPE AS org_type, + ORG.PARENT_ID AS org_parent_id, + ORG.REMARKS AS org_remarks, + ORG.IS_SHOW AS org_isshow, + ORG.valid_flag AS org_validFlag, + ORG.PARENT_IDS AS org_parentIds + + + + where 1=1 + + + and usid ${usidOperator} #{usid} + + + and account ${accountOperator} #{account} + + + and password ${passwordOperator} #{password} + + + and uname ${unameOperator} #{uname} + + + and work_num ${workNumOperator} #{workNum} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and disable_flag ${disableFlagOperator} #{disableFlag} + + + and unlock_flag ${unlockFlagOperator} #{unlockFlag} + + + and user_type ${userTypeOperator} #{userType} + + + + + + where 1=1 AND TU.valid_flag=0 + + + and TU.usid ${usidOperator} #{usid} + + + and TU.account like concat(concat('%',#{account}),'%') + + + and TU.password ${passwordOperator} #{password} + + + and TU.uname ${unameOperator} concat(concat('%',#{uname}),'%') + + + and TU.work_num ${workNumOperator} ${workNum} + + + and TU.valid_flag ${validFlagOperator} #{validFlag} + + + and TU.disable_flag ${disableFlagOperator} #{disableFlag} + + + and TU.unlock_flag ${unlockFlagOperator} #{unlockFlag} + + + and TU.user_type ${userTypeOperator} #{userType} + + + and TUO.ORG_ID ${orgIdOperator} #{orgId} + + + and TUR.role_ID ${roleIdOperator} #{roleId} + + + and tr.name ${roleNameOperator} #{roleName} + + + and TU.usid != 'WY8J26MH23' + + + + + + update TS_USER + + password = #{newPassword} + + where usid = #{usid} + + + + update TS_USER + + uname = #{uname} + + where usid = #{usid} + + + + + + insert into TS_USER_ROLE(user_id,role_id) values (#{usid}, #{roleId}) + + + + insert into TS_USER_ORG(user_id,org_id) values (#{usid}, #{orgId}) + + + + delete from + TS_USER_ROLE + where user_id = #{usid} + + + + delete from + TS_USER_ORG + where user_id = #{usid} + + + + update TS_USER + set valid_flag = 1 + where usid in + + #{usid} + + + + + delete from TS_USER_ROLE + where user_id in + + #{usid} + + + + + delete from TS_USER_ORG + where user_id in + + #{usid} + + + + + + + + + + + + + + + update TS_USER + set + password = #{password} + where usid = #{usid} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into TS_USER + + usid, + account, + valid_flag, + password, + uname, + ext_info, + email, + work_num, + creation_time, + modify_time, + oper_user, + user_source, + disable_flag, + unlock_flag, + user_type, + sso_id + + + #{usid}, + #{account}, + #{validFlag}, + #{password}, + #{uname}, + #{extInfo}, + #{email}, + #{workNum}, + #{creationTime}, + #{modifyTime}, + #{operUser}, + #{userSource}, + #{disableFlag}, + #{unlockFlag}, + #{userType}, + #{ssoId}, + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserInfoEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserInfoEOMapper.xml new file mode 100644 index 00000000..20bb217a --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserInfoEOMapper.xml @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, signature, fax_address, address, gender, part_post, assistant_post, main_post, mobile_phone, + office_phone, user_pic, duty, user_id, id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and signature ${signatureOperator} #{signature} + + + and fax_address ${faxAddressOperator} #{faxAddress} + + + and address ${addressOperator} #{address} + + + and gender ${genderOperator} #{gender} + + + and part_post ${partPostOperator} #{partPost} + + + and assistant_post ${assistantPostOperator} #{assistantPost} + + + and main_post ${mainPostOperator} #{mainPost} + + + and mobile_phone ${mobilePhoneOperator} #{mobilePhone} + + + and office_phone ${officePhoneOperator} #{officePhone} + + + and user_pic ${userPicOperator} #{userPic} + + + and duty ${dutyOperator} #{duty} + + + and user_id ${userIdOperator} #{userId} + + + and id ${idOperator} #{id} + + + + + + + update TS_USER_INFO + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + signature = #{signature}, + + + fax_address = #{faxAddress}, + + + address = #{address}, + + + gender = #{gender}, + + + part_post = #{partPost}, + + + assistant_post = #{assistantPost}, + + + main_post = #{mainPost}, + + + mobile_phone = #{mobilePhone}, + + + office_phone = #{officePhone}, + + + user_pic = #{userPic}, + + + duty = #{duty}, + + + user_id = #{userId}, + + + where id = #{id} + + + + + + + + + + + + + + + + + update TS_USER_INFO + set + + fax_address = '', + + + office_phone = '', + + + fax_address=#{faxAddress}, + + + office_phone=#{officePhone}, + + mobile_phone=#{mobilePhone}, + signature=#{signature,jdbcType=VARCHAR}, + user_pic=#{userPic,jdbcType=VARCHAR}, + valid_flag=0 + where user_id=#{userId} + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserRoleEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserRoleEOMapper.xml new file mode 100644 index 00000000..fc45f2d1 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserRoleEOMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + user_id, role_id + + + + + where 1=1 + + + and `user_id` ${userIdOperator} #{userId} + + + and `role_id` ${roleIdOperator} #{roleId} + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/WarnTimeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/WarnTimeEOMapper.xml new file mode 100644 index 00000000..fda14542 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/WarnTimeEOMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + id, warn_type + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and warn_type ${warnTypeOperator} #{warnType} + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..393390d0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,302 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.3.0.RELEASE + + + + com.adc + foton-slrs-system-rest + 3.0.0 + pom + + + UTF-8 + UTF-8 + 1.8 + 1.8 + 1.8 + 2.3.2.RELEASE + 4.1.2 + 2.10.0 + 1.1.20 + 3.2.0 + 1.4.2 + 3.8.3 + 2.3.0 + 1.2.73 + + + + adc-da-main + adc-da-base + adc-da-sys + adc-da-jwtLogin + + + + + adc + http://60.247.58.121:8182/nexus/content/groups/public + + true + + + true + + + + maven-ali + http://maven.aliyun.com/nexus/content/groups/public// + + true + + + true + always + fail + + + + + + + + + + + + + org.springframework.boot + spring-boot-starter-amqp + + + org.springframework.boot + spring-boot-starter-data-redis + + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-mail + + + org.springframework.boot + spring-boot-starter-aop + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-websocket + + + org.apache.commons + commons-lang3 + 3.10 + + + commons-io + commons-io + 2.6 + + + com.google.guava + guava + 28.1-jre + + + com.google.guava + failureaccess + 1.0.1 + + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.2 + + + javassist + org.javassist + + + guava + com.google.guava + + + + + + + org.apache.shiro + shiro-spring + ${shiro.version} + + + org.apache.shiro + shiro-ehcache + ${shiro.version} + + + slf4j-api + org.slf4j + + + + + + + com.auth0 + java-jwt + ${jwt.version} + + + + + com.baomidou + mybatis-plus-generator + ${mybatisPlus_version} + + + org.freemarker + freemarker + 2.3.30 + + + com.baomidou + mybatis-plus-boot-starter + ${mybatisPlus_version} + + + + com.oracle.database.jdbc + ojdbc8 + 19.6.0.0 + + + mysql + mysql-connector-java + 8.0.16 + + + org.projectlombok + lombok + 1.18.12 + + + + com.alibaba + druid + ${druid_version} + + + + com.alibaba + druid-spring-boot-starter + ${druid_version} + + + + + cn.hutool + hutool-all + 5.3.10 + + + + + com.alibaba + fastjson + ${fastJson.version} + + + + + joda-time + joda-time + 2.10.1 + + + + + cn.afterturn + easypoi-spring-boot-starter + ${easypoi_version} + + + cn.afterturn + easypoi-base + ${easypoi_version} + + + guava + com.google.guava + + + + + cn.afterturn + easypoi-web + ${easypoi_version} + + + cn.afterturn + easypoi-annotation + ${easypoi_version} + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + org.springframework.amqp + spring-rabbit-test + test + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${java.version} + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + + + \ No newline at end of file