children) {
+ this.children = children;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ /**
+ * Returns a hash code value for the object. This method is
+ * supported for the benefit of hash tables such as those provided by
+ * {@linString HashMap}.
+ *
+ * The general contract of {@code hashCode} is:
+ *
+ * - Whenever it is invoStringed on the same object more than once during
+ * an execution of a Java application, the {@code hashCode} method
+ * must consistently return the same integer, provided no information
+ * used in {@code equals} comparisons on the object is modified.
+ * This integer need not remain consistent from one execution of an
+ * application to another execution of the same application.
+ *
- If two objects are equal according to the {@code equals(Object)}
+ * method, then calling the {@code hashCode} method on each of
+ * the two objects must produce the same integer result.
+ *
- It is not required that if two objects are unequal
+ * according to the {@linString Object#equals(Object)}
+ * method, then calling the {@code hashCode} method on each of the
+ * two objects must produce distinct integer results. However, the
+ * programmer should be aware that producing distinct integer results
+ * for unequal objects may improve the performance of hash tables.
+ *
+ *
+ * As much as is reasonably practical, the hashCode method defined by
+ * class {@code Object} does return distinct integers for distinct
+ * objects. (This is typically implemented by converting the internal
+ * address of the object into an integer, but this implementation
+ * technique is not required by the
+ * Java™ programming language.)
+ *
+ * @return a hash code value for this object.
+ * @see Object#equals(Object)
+ * @see System#identityHashCode
+ */
+ @Override
+ public int hashCode() {
+ return this.key.hashCode();
+ }
+
+ /**
+ * Indicates whether some other object is "equal to" this one.
+ *
+ * The {@code equals} method implements an equivalence relation
+ * on non-null object references:
+ *
+ * - It is reflexive: for any non-null reference value
+ * {@code x}, {@code x.equals(x)} should return
+ * {@code true}.
+ *
- It is symmetric: for any non-null reference values
+ * {@code x} and {@code y}, {@code x.equals(y)}
+ * should return {@code true} if and only if
+ * {@code y.equals(x)} returns {@code true}.
+ *
- It is transitive: for any non-null reference values
+ * {@code x}, {@code y}, and {@code z}, if
+ * {@code x.equals(y)} returns {@code true} and
+ * {@code y.equals(z)} returns {@code true}, then
+ * {@code x.equals(z)} should return {@code true}.
+ *
- It is consistent: for any non-null reference values
+ * {@code x} and {@code y}, multiple invocations of
+ * {@code x.equals(y)} consistently return {@code true}
+ * or consistently return {@code false}, provided no
+ * information used in {@code equals} comparisons on the
+ * objects is modified.
+ *
- For any non-null reference value {@code x},
+ * {@code x.equals(null)} should return {@code false}.
+ *
+ *
+ * The {@code equals} method for class {@code Object} implements
+ * the most discriminating possible equivalence relation on objects;
+ * that is, for any non-null reference values {@code x} and
+ * {@code y}, this method returns {@code true} if and only
+ * if {@code x} and {@code y} refer to the same object
+ * ({@code x == y} has the value {@code true}).
+ *
+ * Note that it is generally necessary to override the {@code hashCode}
+ * method whenever this method is overridden, so as to maintain the
+ * general contract for the {@code hashCode} method, which states
+ * that equal objects must have equal hash codes.
+ *
+ * @param obj the reference object with which to compare.
+ * @return {@code true} if this object is the same as the obj
+ * argument; {@code false} otherwise.
+ * @see #hashCode()
+ * @see HashMap
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if(null == obj)
+ return false;
+ if(obj instanceof TreeData)
+ return this.key.equals(((TreeData) obj).getKey());
+ return false;
+ }
+
+ /**
+ * Returns a string representation of the object. In general, the
+ * {@code toString} method returns a string that
+ * "textually represents" this object. The result should
+ * be a concise but informative representation that is easy for a
+ * person to read.
+ * It is recommended that all subclasses override this method.
+ *
+ * The {@code toString} method for class {@code Object}
+ * returns a string consisting of the name of the class of which the
+ * object is an instance, the at-sign character `{@code @}', and
+ * the unsigned hexadecimal representation of the hash code of the
+ * object. In other words, this method returns a string equal to the
+ * value of:
+ *
+ *
+ * getClass().getName() + '@' + Integer.toHexString(hashCode())
+ *
+ *
+ * @return a string representation of the object.
+ */
+ @Override
+ public String toString() {
+ return JSONObject.toJSONString(this);
+ }
+
+ @Override
+ public String getParentKey() {
+ return parentKey;
+ }
+
+ public void setParentKey(String parentKey){
+ this.parentKey =parentKey;
+ }
+}
+
diff --git a/src/main/java/com/cetc32/dh/common/TreeNode.java b/src/main/java/com/cetc32/dh/common/TreeNode.java
new file mode 100644
index 0000000000000000000000000000000000000000..4c5a47c0679c1cfde8b414e0fe538b0edef6c76b
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/common/TreeNode.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/15 下午3:26
+ ******************************************************************************/
+package com.cetc32.dh.common;
+
+public interface TreeNode {
+ String getKey();
+ String getValue();
+ String getTitle();
+ String getParentKey();
+}
diff --git a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java b/src/main/java/com/cetc32/dh/common/filter/FormFilter.java
deleted file mode 100644
index 162c938c9628071467fc7a96a7c3201205a23e28..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright(C): CETC-32
- * 文件描述：过滤认证格式类
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.common.filter;
-
-
-import com.cetc32.dh.entity.BaseAdminUser;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-/**
- * @Title: FormFilter
- * @Description: 过滤认证格式类
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：2020/9/13加上 subject.isRemembered()，让它同时也兼容remember这种情况。
- */
-public class FormFilter extends FormAuthenticationFilter {
-
- /**
- * 指定缓存失效时间
- * @param request servlet请求
- * @param response servlet响应
- * @param mappedValue 之前传输数据使用的对象，现在废弃了
- * @return 返回布尔值true，说明登陆用户为已登陆的且使用记住我功能登陆的用户，反之亦然。
- * 修改信息：
- */
- @Override
- protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
- Subject subject = getSubject(request, response);
-
- // 如果 isAuthenticated 为 false 证明不是登录过的，同时 isRememberd 为true
- // 证明是没登陆直接通过记住我功能进来的
- if (!subject.isAuthenticated() && subject.isRemembered()) {
-
- // 获取session看看是不是空的
- Session session = subject.getSession(true);
-
- // 查看session属性当前是否是空的
- if (session.getAttribute("userName") == null) {
- // 如果是空的才初始化
- BaseAdminUser user = (BaseAdminUser)subject.getPrincipal();
- //存入用户数据
- session.setAttribute("userName", user.getSysUserName());
- }
- }
-
- // 这个方法本来只返回 subject.isAuthenticated() 现在我们加上 subject.isRemembered()
- // 让它同时也兼容remember这种情况
- return subject.isAuthenticated() || subject.isRemembered();
-// return true;
- }
-
-}
diff --git a/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java b/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java
deleted file mode 100644
index da983d8aaff581babff423adfc2743455bcdf823..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * 文件描述： Token检查类
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.common.filter;
-
-import com.auth0.jwt.exceptions.TokenExpiredException;
-import com.cetc32.dh.common.utils.JWTUtil;
-import com.cetc32.dh.config.JWTToken;
-import com.cetc32.dh.config.RedisUtil;
-import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-
-/**
- * Token检查类
- * @Title: FormFilter
- * @version: 1.0
- * @date: 2020/9/11 10:55
- */
-public class JWTFilter extends BasicHttpAuthenticationFilter {
- /**
- * 指定缓存失效时间
- * @param request servlet请求
- * @param response servlet响应
- * @param mappedValue 之前传输数据使用的对象，现在废弃了
- * @return 返回布尔值true或false，true说明toker校验通过
- * 修改信息：
- */
- //是否允许访问，如果带有 token，则对 token 进行检查，否则直接通过
- @Override
- protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
- //判断请求的请求头是否带上 "Token"
- System.out.println("isAccessAllowed");
- if (isLoginAttempt(request, response)){
- //如果存在，则进入 executeLogin 方法执行登入，检查 token 是否正确
- try {
- executeLogin(request, response);
- return true;
-
- }catch (Exception e){
- /*
- * 注意这里捕获的异常其实是在Realm抛出的，但是由于executeLogin（）方法抛出的异常是从login（）来的，
- * login抛出的异常类型是AuthenticationException，所以要去获取它的子类异常才能获取到我们在Realm抛出的异常类型。
- */
- System.out.println("刷新token");
- String msg=e.getMessage();
- Throwable cause = e.getCause();
- if (cause!=null&&cause instanceof TokenExpiredException){
- //AccessToken过期，尝试去刷新token
- String result=refreshToken(request, response);
- if (result.equals("success")){
- System.out.println("request.equals(\"success\")");
- return true;
- }
- msg=result;
- }
- responseError(response,msg);
- }
- }
- //如果请求头不存在 Token，则可能是执行登陆操作或者是游客状态访问，无需检查 token，直接返回 true
- return true;
- }
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Override
- protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) {
- HttpServletRequest req= (HttpServletRequest) request;
- String token=req.getHeader("Authorization");
- return token !=null;
- }
- /**
- * executeLogin实际上就是先调用createToken来获取token，这里我们重写了这个方法，就不会自动去调用createToken来获取token
- * 然后调用getSubject方法来获取当前用户再调用login方法来实现登录
- * 这也解释了我们为什么要自定义jwtToken，因为我们不再使用Shiro默认的UsernamePasswordToken了。
- * */
- @Override
- protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
- System.out.println("executeLogin");
- HttpServletRequest req= (HttpServletRequest) request;
- String token=req.getHeader("Authorization");
- JWTToken jwt=new JWTToken(token);
- //交给自定义的realm对象去登录，如果错误他会抛出异常并被捕获
- getSubject(request, response).login(jwt);
- return true;
- }
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Override
- protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception {
- System.out.println("preHandle");
- HttpServletRequest req= (HttpServletRequest) request;
- HttpServletResponse res= (HttpServletResponse) response;
- res.setHeader("Access-control-Allow-Origin",req.getHeader("Origin"));
- res.setHeader("Access-control-Allow-Methods","GET,POST,OPTIONS,PUT,DELETE");
- res.setHeader("Access-control-Allow-Headers",req.getHeader("Access-Control-Request-Headers"));
- // 跨域时会首先发送一个option请求，这里我们给option请求直接返回正常状态
- if (req.getMethod().equals(RequestMethod.OPTIONS.name())) {
- res.setStatus(HttpStatus.OK.value());
- return false;
- }
- return super.preHandle(request, response);
- }
-
- /**
- * 将非法请求跳转到 /unauthorized/**
- */
- private void responseError(ServletResponse response, String message) {
- System.out.println("responseError");
-
- try {
- HttpServletResponse httpServletResponse = (HttpServletResponse) response;
- //设置编码，否则中文字符在重定向时会变为空字符串
- message = URLEncoder.encode(message, "UTF-8");
- httpServletResponse.sendRedirect("/unauthorized/" + message);
- } catch (IOException e) {
- System.out.println(e.getMessage());
- }
- }
-
-
- /**
- * 这里的getBean是因为使用@Autowired无法把RedisUtil注入进来
- * 这样自动去注入当使用的时候是未NULL，是注入不进去了。通俗的来讲是因为拦截器在spring扫描bean之前加载所以注入不进去。
- * 解决的方法：
- * 可以通过已经初始化之后applicationContext容器中去获取需要的bean.
- * */
- public T getBean(Class clazz,HttpServletRequest request){
- WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext());
- return applicationContext.getBean(clazz);
- }
-
- //刷新token
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- private String refreshToken(ServletRequest request,ServletResponse response) {
- System.out.println("refreshToken");
-
- HttpServletRequest req= (HttpServletRequest) request;
- RedisUtil redisUtil=getBean(RedisUtil.class,req);
- //获取传递过来的accessToken
- String accessToken=req.getHeader("Authorization");
- //获取token里面的用户名
- String username= JWTUtil.getUsername(accessToken);
- System.out.println("username"+username);
- //判断refreshToken是否过期了，过期了那么所含的username的键不存在
- System.out.println("redisUtil.hasKey(username)"+redisUtil.hasKey(username));
- if (redisUtil.hasKey(username)){
- //判断refresh的时间节点和传递过来的accessToken的时间节点是否一致，不一致校验失败
- long current= (long) redisUtil.get(username);
- if (current== JWTUtil.getExpire(accessToken)){
- //获取当前时间节点
- long currentTimeMillis = System.currentTimeMillis();
- //生成刷新的token
- String token=JWTUtil.createToken(username,currentTimeMillis);
- //刷新redis里面的refreshToken,过期时间是30min
- redisUtil.set(username,currentTimeMillis,30*60);
- //再次交给shiro进行认证
- JWTToken jwtToken=new JWTToken(token);
- try {
- getSubject(request, response).login(jwtToken);
- // 最后将刷新的AccessToken存放在Response的Header中的Authorization字段返回
- HttpServletResponse httpServletResponse = (HttpServletResponse) response;
- httpServletResponse.setHeader("Authorization", token);
- httpServletResponse.setHeader("Access-Control-Expose-Headers", "Authorization");
- return "success";
- }catch (Exception e){
- return e.getMessage();
- }
- }
- }
- return "token认证失效，token过期，重新登陆";
- }
-}
diff --git a/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java b/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java
deleted file mode 100644
index 5b9122ca4ee98d3fc9c5a8c910f63a36d3ab0d45..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * @Title: KickouSessionFilter
- * @Description: 进行用户访问控制
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.common.filter;
-
-import com.cetc32.dh.common.IStatusMessage;
-import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.common.utils.ShiroFilterUtils;
-import com.cetc32.dh.entity.BaseAdminUser;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.shiro.cache.Cache;
-import org.apache.shiro.cache.CacheManager;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.session.mgt.DefaultSessionKey;
-import org.apache.shiro.session.mgt.SessionManager;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.web.filter.AccessControlFilter;
-import org.apache.shiro.web.util.WebUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.util.ArrayDeque;
-import java.util.Deque;
-
-/**
- * Token检查类
- * @Title: FormFilter
- * @version: 1.0
- * @date: 2020/9/11 10:55
- */
-public class KickoutSessionFilter extends AccessControlFilter {
-
- private static final Logger logger = LoggerFactory.getLogger(KickoutSessionFilter.class);
-
- private final static ObjectMapper objectMapper = new ObjectMapper();
-
- private String kickoutUrl; // 踢出后到的地址
- private boolean kickoutAfter = false; // 踢出之前登录的/之后登录的用户 默认false踢出之前登录的用户
- private int maxSession = 1; // 同一个帐号最大会话数 默认1
- private SessionManager sessionManager;
- private Cache> cache;
-
- public void setKickoutUrl(String kickoutUrl) {
- this.kickoutUrl = kickoutUrl;
- }
-
- public void setKickoutAfter(boolean kickoutAfter) {
- this.kickoutAfter = kickoutAfter;
- }
-
- public void setMaxSession(int maxSession) {
- this.maxSession = maxSession;
- }
-
- public void setSessionManager(SessionManager sessionManager) {
- this.sessionManager = sessionManager;
- }
-
- // 设置Cache的key的前缀
- public void setCacheManager(CacheManager cacheManager) {
- //必须和ehcache缓存配置中的缓存name一致
- this.cache = cacheManager.getCache("shiro-activeSessionCache");
- }
-
-
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Override
- protected boolean isAccessAllowed(ServletRequest servletRequest, ServletResponse servletResponse, Object o) throws Exception {
-// return false;
- return true;
- }
-
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Override
- protected boolean onAccessDenied(ServletRequest request, ServletResponse response)throws Exception {
- Subject subject = getSubject(request,response);
- // 没有登录授权 且没有记住我
- if(!subject.isAuthenticated() && !subject.isRemembered()){
- // 如果没有登录，直接进行之后的流程
- return true;
- }
- // 获得用户请求的URI
- HttpServletRequest req=(HttpServletRequest) request;
- String path = req.getRequestURI();
- logger.info("===当前请求的uri:" + path);
-
- if(path.equals("/login")){
- return true;
- }
- Session session = subject.getSession();
- logger.info("session时间设置：" + String.valueOf(session.getTimeout()));
-
-
- try{
- // 当前用户
- BaseAdminUser user = (BaseAdminUser) subject.getPrincipal();
- String username = user.getSysUserName();
- logger.info("===当前用户username:" + username);
- Serializable sessionId = session.getId();
- logger.info("===当前用户sessionId:" + sessionId);
- // 读取缓存用户 没有就存入
- Deque deque = cache.get(username);
- logger.debug("===当前deque:" + deque);
- if (deque == null) {
- // 初始化队列
- deque = new ArrayDeque();
- }
- // 如果队列里没有此sessionId，且用户没有被踢出；放入队列
- if (!deque.contains(sessionId) && session.getAttribute("kickout") == null) {
- // 将sessionId存入队列
- deque.push(sessionId);
- // 将用户的sessionId队列缓存
- cache.put(username, deque);
- }
- // 如果队列里的sessionId数超出最大会话数，开始踢人
- while (deque.size() > maxSession) {
- logger.debug("===deque队列长度:" + deque.size());
- Serializable kickoutSessionId = null;
- // 是否踢出后来登录的，默认是false；即后者登录的用户踢出前者登录的用户；
- if (kickoutAfter) { // 如果踢出后者
- kickoutSessionId = deque.removeFirst();
- } else { // 否则踢出前者
- kickoutSessionId = deque.removeLast();
- }
- // 踢出后再更新下缓存队列
- cache.put(username, deque);
- try{
- // 获取被踢出的sessionId的session对象
- Session kickoutSession = sessionManager
- .getSession(new DefaultSessionKey(kickoutSessionId));
- if (kickoutSession != null) {
- // 设置会话的kickout属性表示踢出了
- kickoutSession.setAttribute("kickout", true);
- }
- }catch (Exception e){
-
- }
- }
-
- // 如果被踢出了，(前者或后者)直接退出，重定向到踢出后的地址
- if ((Boolean) session.getAttribute("kickout") != null
- && (Boolean) session.getAttribute("kickout") == true){
- // 会话被踢出了
- try {
- // 退出登录
- subject.logout();
- } catch (Exception e) { // ignore
- }
- saveRequest(request);
- logger.debug("===踢出后用户重定向的路径kickoutUrl:" + kickoutUrl);
- return isAjaxResponse(request,response);
- }
- return true;
- }catch (Exception e){
- logger.error("控制用户在线数量【KickoutSessionFilter.onAccessDenied】异常！", e);
- return isAjaxResponse(request,response);
- }
- }
-
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- public static void out(ServletResponse response, ResponseResult result){
- PrintWriter out = null;
- try {
- response.setCharacterEncoding("UTF-8");//设置编码
- response.setContentType("application/json");//设置返回类型
- out = response.getWriter();
- out.println(objectMapper.writeValueAsString(result));//输出
- logger.info("用户在线数量限制【KickoutSessionFilter.out】响应json信息成功");
- } catch (Exception e) {
- logger.error("用户在线数量限制【KickoutSessionFilter.out】响应json信息出错", e);
- }finally{
- if(null != out){
- out.flush();
- out.close();
- }
- }
- }
-
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- private boolean isAjaxResponse(ServletRequest request,
- ServletResponse response) throws IOException {
- // ajax请求
- /**
- * 判断是否已经踢出
- * 1.如果是Ajax 访问，那么给予json返回值提示。
- * 2.如果是普通请求，直接跳转到登录页
- */
- //判断是不是Ajax请求
- ResponseResult responseResult = new ResponseResult();
- if (ShiroFilterUtils.isAjax(request) ) {
- logger.info(getClass().getName()+ "当前用户已经在其他地方登录，并且是Ajax请求！");
- responseResult.setCode(IStatusMessage.SystemStatus.MANY_LOGINS.getCode());
- responseResult.setMessage("您已在别处登录，请您修改密码或重新登录");
- out(response, responseResult);
- }else{
- // 重定向
- WebUtils.issueRedirect(request, response, kickoutUrl);
- }
- return false;
-// return true;
- }
-
-
-}
diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index 0b4fcad2ee2a214c76ac413f8837eb41bca3d741..1b93f10ecb43b0815aef6b7ca1e409f5117d614d 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -24,7 +24,7 @@ public class PageDataResult {
private Integer code=200;
//总记录数量
- private Integer totals;
+ private Long totals;
private List list;
@@ -38,18 +38,18 @@ public class PageDataResult {
private List list_new;
- public PageDataResult(int totals,List list){
+ public PageDataResult(long totals,List list){
this.totals=totals;
this.list=list;
}
- public PageDataResult(List list_new,int totals,int code){
+ public PageDataResult(List list_new,long totals,int code){
this.code=code;
this.totals=totals;
this.list_new=list_new;
}
- public PageDataResult(int totals,List list,Integer offset){
+ public PageDataResult(long totals,List list,Integer offset){
this.totals=totals;
this.list=list;
for(int i=0;i getList() {
return list;
diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java
deleted file mode 100644
index 0ea702d41a794cea5f6f4b741292dadf7357a989..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * @Title: CenterAuthRealm
- * @Description: 根据token判断此Authenticator是否使用该realm
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.common.shiro;
-
-import com.auth0.jwt.exceptions.TokenExpiredException;
-import com.cetc32.dh.common.utils.JWTUtil;
-import com.cetc32.dh.config.JWTToken;
-import com.cetc32.dh.config.RedisUtil;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.SimpleAuthenticationInfo;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.authz.SimpleAuthorizationInfo;
-import org.apache.shiro.realm.AuthorizingRealm;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-/**
- * Token检查类
- * @Title: FormFilter
- * @version: 1.0
- * @date: 2020/9/11 10:55
- */
-@Component
-public class CenterAuthRealm extends AuthorizingRealm {
- /* @Autowired
- private UserService userService;*/
- @Autowired
- private RedisUtil redisUtil;
-
- //根据token判断此Authenticator是否使用该realm
- //必须重写不然shiro会报错
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Override
- public boolean supports(AuthenticationToken token) {
- return token instanceof JWTToken;
- }
-
- /**
- * 只有当需要检测用户权限的时候才会调用此方法，例如@RequiresRoles,@RequiresPermissions之类的
- */
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Override
- protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
- System.out.println("授权~~~~~");
- String token=principals.toString();
- String username= JWTUtil.getUsername(token);
- /*User user=userService.getUser(username);*/
- SimpleAuthorizationInfo info=new SimpleAuthorizationInfo();
- //查询数据库来获取用户的角色
- /*info.addRole(user.getRoles());
- //查询数据库来获取用户的权限
- info.addStringPermission(user.getPermission());*/
- return info;
- }
-
-
- /**
- * 默认使用此方法进行用户名正确与否验证，错误抛出异常即可，在需要用户认证和鉴权的时候才会调用
- */
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Override
- protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
- System.out.println("认证~~~~~~~");
- String jwt= (String) token.getCredentials();
- String username= null;
- try {
- username= JWTUtil.getUsername(jwt);
- }catch (Exception e){
- throw new AuthenticationException("token非法，不是规范的token，可能被篡改了，或者过期了");
- }
- if (username==null){
- throw new AuthenticationException("token中无用户名");
- }
- /*User user=userService.getUser(username);*/
- /*if (user==null){
- throw new AuthenticationException("该用户不存在");
- }*/
- //开始认证，只要AccessToken没有过期，或者refreshToken的时间节点和AccessToken一致即可
- if (redisUtil.hasKey(username)){
- //判断AccessToken有无过期
- if (!JWTUtil.verify(jwt)){
- throw new TokenExpiredException("token认证失效，token过期，重新登陆");
- }else {
- //判断AccessToken和refreshToken的时间节点是否一致
- long current= (long) redisUtil.get(username);
- if (current==JWTUtil.getExpire(jwt)){
- return new SimpleAuthenticationInfo(jwt,jwt,"MyRealm");
- }else{
- throw new AuthenticationException("token已经失效，请重新登录！");
- }
- }
- }else{
- throw new AuthenticationException("token过期或者Token错误！！");
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java
deleted file mode 100644
index d06c8ae12fcfdbbeab0aa760852bd47a5f4dd401..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/**
- * @Title: CenterAuthShiroConfig
- * @Description: Shiro安全认证
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.common.shiro;
-
-import com.cetc32.dh.common.filter.JWTFilter;
-import org.apache.shiro.cas.CasFilter;
-import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
-import org.apache.shiro.mgt.DefaultSubjectDAO;
-import org.apache.shiro.spring.LifecycleBeanPostProcessor;
-import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
-import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
-import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-import org.jasig.cas.client.session.SingleSignOutFilter;
-import org.jasig.cas.client.session.SingleSignOutHttpSessionListener;
-import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.web.filter.DelegatingFilterProxy;
-
-import javax.servlet.Filter;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Token检查类
- * @Title: FormFilter
- * @version: 1.0
- * @date: 2020/9/11 10:55
- */
-@Configuration
-public class CenterAuthShiroConfig {
-
-// //cas server地址
-// public static final String casServerUrlPrefix="http://www.cetc.daohang.com:9100/cas";
-//
-// //cas登录页面地址
-// public static final String casLoginUrl = casServerUrlPrefix + "/login";
-//
-// //cas登出页面地址
-// public static final String casLogoutUrl = casServerUrlPrefix + "/logout";
-//
-// //当前工程对外提供的服务地址
-// public static final String shiroServerUrlPrefix = "http://localhost:9100";
-//
-// //casFilter UrlPattern
-// public static final String casFilterUrlPattern = "/cas";
-//
-// //登录地址
-// public static final String loginUrl = casLoginUrl + "?service=" + shiroServerUrlPrefix + casFilterUrlPattern;
-//
-// // 登出地址（casserver启用service跳转功能，需在webapps\cas\WEB-INF\cas.properties文件中启用cas.logout.followServiceRedirects=true）
-// public static final String logoutUrl = casLogoutUrl + "?service=" + shiroServerUrlPrefix;
-//
-// //登录成功地址
-// public static final String loginSuccessUrl = "/user";
-//
-// //限认证失败跳转地址
-// public static final String unauthorizedUrl = "/403.html";
-//
-// @Value("${jedis.pool.host}")
-// private String host;
-//
-// @Value("${jedis.pool.port}")
-// private int port;
-
-
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Bean(name = "securityManager")
- public DefaultWebSecurityManager securityManager(CenterAuthRealm centerAuthRealm){
- DefaultWebSecurityManager securityManager=new DefaultWebSecurityManager();
- // 设置自定义 realm.
- securityManager.setRealm(centerAuthRealm);
-
- //关闭session
- DefaultSubjectDAO subjectDAO=new DefaultSubjectDAO();
- DefaultSessionStorageEvaluator sessionStorageEvaluator=new DefaultSessionStorageEvaluator();
- sessionStorageEvaluator.setSessionStorageEnabled(false);
- subjectDAO.setSessionStorageEvaluator(sessionStorageEvaluator);
- securityManager.setSubjectDAO(subjectDAO);
- return securityManager;
- }
-
-// /**
-// * 注册单点登出listener
-// *
-// * @return
-// */
-// @Bean
-// @Order(Ordered.HIGHEST_PRECEDENCE)
-// public ServletListenerRegistrationBean singleSignOutHttpSessionListener() {
-// ServletListenerRegistrationBean bean = new ServletListenerRegistrationBean();
-// bean.setListener(new SingleSignOutHttpSessionListener());
-// bean.setEnabled(true);
-// return bean;
-// }
-//
-// /**
-// * 注册单点登出filter
-// *
-// * @return
-// */
-// @Bean
-// public FilterRegistrationBean singleSignOutFilter() {
-// FilterRegistrationBean bean = new FilterRegistrationBean();
-// bean.setName("singleSignOutFilter");
-// bean.setFilter(new SingleSignOutFilter());
-// bean.addUrlPatterns("/*");
-// bean.setEnabled(true);
-// return bean;
-// }
-//
-// /**
-// * 注册DelegatingFilterProxy（Shiro）
-// *
-// * @return
-// */
-// @Bean
-// public FilterRegistrationBean delegatingFilterProxy() {
-// FilterRegistrationBean filterRegistration = new FilterRegistrationBean();
-// filterRegistration.setFilter(new DelegatingFilterProxy("shiroFilter"));
-// // 该值缺省为false,表示生命周期由SpringApplicationContext管理,设置为true则表示由ServletContainer管理
-// filterRegistration.addInitParameter("targetFilterLifecycle", "true");
-// filterRegistration.setEnabled(true);
-// filterRegistration.addUrlPatterns("/*");
-// return filterRegistration;
-// }
-
-// /**
-// * CAS过滤器
-// *
-// * @return
-// */
-// @Bean(name = "casFilter")
-// public CasFilter getCasFilter() {
-// CasFilter casFilter = new CasFilter();
-// casFilter.setName("casFilter");
-// casFilter.setEnabled(true);
-// // 登录失败后跳转的URL，也就是 Shiro 执行 CasRealm 的 doGetAuthenticationInfo 方法向CasServer验证tiket
-// casFilter.setFailureUrl(loginUrl);// 我们选择认证失败后再打开登录页面
-// casFilter.setSuccessUrl(loginSuccessUrl);
-// return casFilter;
-// }
-
-
-
- /**
- * 先走 filter ，然后 filter 如果检测到请求头存在 token，则用 token 去 login，走 Realm 去验证
- */
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Bean
- public ShiroFilterFactoryBean factory(@Qualifier("securityManager")DefaultWebSecurityManager securityManager){
- ShiroFilterFactoryBean factoryBean=new ShiroFilterFactoryBean();
- factoryBean.setSecurityManager(securityManager);
- // 添加自己的过滤器并且取名为jwt
- Map filterMap=new LinkedHashMap<>();
- //设置我们自定义的JWT过滤器
- filterMap.put("jwt",new JWTFilter());
- factoryBean.setFilters(filterMap);
-
- // 设置无权限时跳转的 url;
- factoryBean.setUnauthorizedUrl("/unauthorized/无权限");
- Map filterRuleMap=new HashMap<>();
- // 所有请求通过我们自己的JWT Filter
- filterRuleMap.put("/**","jwt");
- // 访问 /unauthorized/** 不通过JWTFilter
- filterRuleMap.put("/unauthorized/**","anon");
- filterRuleMap.put("/open/**","anon");
- //filterRuleMap.put("/rest/**","anon");
- factoryBean.setFilterChainDefinitionMap(filterRuleMap);
- return factoryBean;
- }
-
-
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Bean
- public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
- return new LifecycleBeanPostProcessor();
- }
-
-
-
- /**
- * 添加注解支持，如果不加的话很有可能注解失效
- */
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Bean
- // @DependsOn({"lifecycleBeanPostProcessor"})
- public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator(){
-
- DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator=new DefaultAdvisorAutoProxyCreator();
- defaultAdvisorAutoProxyCreator.setProxyTargetClass(true);
- return defaultAdvisorAutoProxyCreator;
- }
-
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- @Bean
- public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(@Qualifier("securityManager") DefaultWebSecurityManager securityManager){
-
- AuthorizationAttributeSourceAdvisor advisor=new AuthorizationAttributeSourceAdvisor();
- advisor.setSecurityManager(securityManager);
- return advisor;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java b/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java
deleted file mode 100644
index 4ba5fad142d014cfb769f14d1613662a041d3b0a..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * @Title: CenterAuthShiroConfig
- * @Description: 自定义Realm
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.common.shiro;
-
-import com.cetc32.dh.beans.ResultUserRole;
-import com.cetc32.dh.entity.BaseAdminRole;
-import com.cetc32.dh.dto.PermissionDTO;
-import com.cetc32.dh.entity.BaseAdminPermission;
-import com.cetc32.dh.entity.BaseAdminUser;
-import com.cetc32.dh.mybatis.BaseAdminPermissionMapper;
-import com.cetc32.dh.mybatis.BaseAdminRoleMapper;
-import com.cetc32.dh.service.AdminRoleService;
-import com.cetc32.dh.service.AdminUserService;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.shiro.authc.*;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.authz.SimpleAuthorizationInfo;
-import org.apache.shiro.cas.CasRealm;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.apache.shiro.util.ByteSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Token检查类
- * @Title: FormFilter
- * @version: 1.0
- * @date: 2020/9/11 10:55
- */
-public class CustomRealm extends CasRealm {
-
- private Logger log = LoggerFactory.getLogger(this.getClass());
-
- @Autowired
- private AdminUserService userService;
- @Autowired
- private BaseAdminUser baseAdminUser;
- @Autowired
- private AdminRoleService roleService;
- @Autowired
- private BaseAdminPermissionMapper permissionMapper;
- @Autowired
- private BaseAdminRoleMapper roleMapper;
- //模拟数据库的数据
- Map map=new HashMap();
- {
- map.put("jarWorker","123");
- super.setName("customRealm");
- }
- /**
- * 授权使用
- * @param principals
- * @return
- */
- @Override
- protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
- BaseAdminUser userName=(BaseAdminUser) principals.getPrimaryPrincipal();
- Set roles=getRolesByUserName(userName.getSysUserName());
- Set permissions=getPermissionsByUserName(userName.getSysUserName());
- SimpleAuthorizationInfo simpleAuthorizationInfo=new SimpleAuthorizationInfo();
- log.info("开始授权");
- simpleAuthorizationInfo.setRoles(roles);
- simpleAuthorizationInfo.setStringPermissions(permissions);
- return simpleAuthorizationInfo;
- }
-
-
- /**
- * 认证使用
- * @param
- * @return
- */
- protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException {
-// //从主体传过来的认证信息中获取用户名
-// String userName=(String) token.getPrincipal();//获取用户名
-// String passWord=getPassword(userName);
-// if(passWord==null){
-// return null;
-// }
-// SimpleAuthenticationInfo simpleAuthenticationInfo=new SimpleAuthenticationInfo("",passWord,"customRealm");
-// return simpleAuthenticationInfo;
- //UsernamePasswordToken用于存放提交的登录信息
- UsernamePasswordToken token = (UsernamePasswordToken) authenticationToken;
- log.info("用户登录认证：验证当前Subject时获取到token为：" + ReflectionToStringBuilder
- .toString(token, ToStringStyle.MULTI_LINE_STYLE));
- String username = token.getUsername();
- // 调用数据层
- BaseAdminUser sysUser = userService.findByUserName(username);
- log.debug("用户登录认证！用户信息user：" + sysUser);
- if (sysUser == null) {
- // 用户不存在
- return null;
- }
- // 返回密码
- return new SimpleAuthenticationInfo(sysUser, sysUser.getSysUserPwd(), ByteSource.Util.bytes(username), getName());
-
- }
-
- /**
- * 数据库信息获取用户密码
- * @param userName
- * @return
- */
- private String getPassword(String userName) {
- if(null==userName){
- return null;
- }
- BaseAdminUser adminUser = new BaseAdminUser();
- adminUser = userService.findByUserName(userName);
- String pwd = adminUser.getSysUserPwd();
- return pwd;
- }
-
- /**
- * 数据库获取用户角色
- * @param userName
- * @return
- */
- private Set getRolesByUserName(String userName) {
-// Set roles=new HashSet();
-// roles.add("admin");
-// roles.add("tourist");
-// return roles;
-
- Set roles = new HashSet();
-
- BaseAdminUser user = userService.findByUserName(userName);
- List roleId = Stream.of(user.getRoleId().split(",")).map(Integer::parseInt).collect(Collectors.toList());
- for(Integer rid:roleId)
- {
- BaseAdminRole baseAdminRole = roleMapper.selectByPrimaryKey(rid);
- roles.add(baseAdminRole.getRoleName());
- }
- return roles;
-
- }
-
- /**
- * 模拟数据库获取用户权限
- * @param userName
- * @return
- */
- private Set getPermissionsByUserName(String userName) {
- /*Set permissions=new HashSet();
- permissions.add("user:update");
- permissions.add("user:query");
- return permissions;*/
- Set per = new HashSet();
- BaseAdminUser user = userService.findByUserName(userName);
- List roleId = Stream.of(user.getRoleId().split(",")).map(Integer::parseInt).collect(Collectors.toList());
- List rids=new ArrayList<>();
- for(Integer rid:roleId)
- {
- ResultUserRole baseAdminRole = roleService.findRoleById(rid);
-// String permissions = role.getPermissions();
-// rids.addAll(Arrays.asList(permissions.split(",")));
- }
- rids=rids.stream().distinct().collect(Collectors.toList());
- if (rids.size()>0) {
- List permissionList = new ArrayList <>();
- for (String id : rids) {
- // 角色对应的权限数据
- BaseAdminPermission perm = permissionMapper.selectByPrimaryKey(id);
- if (null != perm ) {
- // 授权角色下所有权限
- PermissionDTO permissionDTO = new PermissionDTO();
- BeanUtils.copyProperties(perm,permissionDTO);
- //获取子权限
- List childrens = permissionMapper.getPermissionListByPId(perm.getId());
- permissionDTO.setChildrens(childrens);
-
- permissionList.add(permissionDTO);
- }
- }
-
- for(PermissionDTO permissionDTO:permissionList){
- per.add(permissionDTO.getName());
- }
-
-
- }
- return per;
-
- }
-}
diff --git a/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java b/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java
deleted file mode 100644
index 9ab25776d1640b36f5777dce23b1423788dee3fd..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * @Title: CenterAuthShiroConfig
- * @Description: 自定义Realm
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.common.utils;
-
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.JWTVerifier;
-import com.auth0.jwt.algorithms.Algorithm;
-import com.auth0.jwt.exceptions.JWTDecodeException;
-import com.auth0.jwt.interfaces.DecodedJWT;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-/**
- * 响应状态信息接口
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-public class JWTUtil {
- //token有效时长
- private static final long EXPIRE=2*60*60*1000;
- //token的密钥
- private static final String SECRET="jwt+shiro+32s";
-
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- public static String createToken(String username,long current){
- Date date= new Date(current+EXPIRE);
- //JWT的header部分
- Map map =new HashMap<>();
- map.put("alg","HS256");
- map.put("typ","JWT");
-
- //使用JWT生成 token
- String token=null;
- try{
- token= JWT.create()
- .withHeader(map)
- .withClaim("username",username)
- .withClaim("current",current)
- .withIssuedAt(new Date())
- .withExpiresAt(date)
- .sign(Algorithm.HMAC256(SECRET));
- }catch (UnsupportedEncodingException e){
- e.printStackTrace();
- }
- return token;
- }
-
- ////校验token的有效性，1、token的header和payload是否没改过；2、没有过期
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- public static boolean verify(String token){
- try{
- JWTVerifier verifier=JWT.require(Algorithm.HMAC256(SECRET)).build();
- verifier.verify(token);
- return true;
- }catch ( Exception e){
-
- }
- return false;
- }
- //无需解密也可以获取token的信息
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- public static String getUsername(String token){
- try {
- DecodedJWT jwt = JWT.decode(token);
- return jwt.getClaim("username").asString();
- } catch (JWTDecodeException e) {
- return null;
- }
- }
-
- //获取过期时间
- /**
- * 指定缓存失效时间
- * @param key 键
- * @param time 时间(秒)
- * @return
- * 修改信息：
- */
- public static long getExpire(String token){
- try {
- DecodedJWT jwt = JWT.decode(token);
- return jwt.getClaim("exp").asLong();
- }catch (Exception e){
- return System.currentTimeMillis()/1000;
- }
- }
-}
diff --git a/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java b/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java
deleted file mode 100644
index 25344e3448a5c81c2b19e1b1deb1b6e3bc7504cf..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * @Title: CenterAuthShiroConfig
- * @Description: 自定义Realm
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.common.utils;
-
-import com.cetc32.dh.common.response.ResponseResult;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
-
-/**
- * @Title: ShiroFilterUtils
- * @Description: shiro工具类
- * @author: youqing
- * @version: 1.0
- * @date: 2018/11/23 9:54
- */
-public class ShiroFilterUtils {
-
- private static final Logger logger = LoggerFactory.getLogger(ShiroFilterUtils.class);
-
- private final static ObjectMapper objectMapper = new ObjectMapper();
-
- /**
- *
- * 功能描述: 判断请求是否是ajax
- *
- * @param:
- * @return:
- * @auther: youqing
- * @date: 2018/11/23 9:57
- */
- public static boolean isAjax(ServletRequest request){
- String header = ((HttpServletRequest) request).getHeader("X-Requested-With");
- if("XMLHttpRequest".equalsIgnoreCase(header)){
- logger.info("shiro工具类【ShiroFilterUtils.isAjax】当前请求,为Ajax请求");
- return Boolean.TRUE;
- }
- logger.debug("shiro工具类【ShiroFilterUtils.isAjax】当前请求,非Ajax请求");
- return Boolean.FALSE;
- }
-
- /**
- *
- * 功能描述: response输出json
- *
- * @param:
- * @return:
- * @auther: youqing
- * @date: 2018/11/23 9:58
- */
- public static void out(HttpServletResponse response, ResponseResult result){
- PrintWriter out = null;
- try {
- response.setCharacterEncoding("UTF-8");//设置编码
- response.setContentType("application/json");//设置返回类型
- out = response.getWriter();
- out.println(objectMapper.writeValueAsString(result));//输出
- logger.info("用户在线数量限制【ShiroFilterUtils.out】响应json信息成功");
- } catch (Exception e) {
- logger.error("用户在线数量限制【ShiroFilterUtils.out】响应json信息出错", e);
- }finally{
- if(null != out){
- out.flush();
- out.close();
- }
- }
- }
-}
diff --git a/src/main/java/com/cetc32/dh/config/JWTToken.java b/src/main/java/com/cetc32/dh/config/JWTToken.java
deleted file mode 100644
index 0a52f62df54d9af8a9eed64eb152f1b953839945..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/config/JWTToken.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @Description: 数据管理配置
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.config;
-
-import org.apache.shiro.authc.AuthenticationToken;
-
-/**
- * 数据管理配置
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * @Description: MVC配置信息
- * 更改描述：
- */
-public class JWTToken implements AuthenticationToken {
- private String token;
- public JWTToken(String token){
- this.token =token;
- }
- @Override
- public Object getPrincipal() {
- return token;
- }
-
- @Override
- public Object getCredentials() {
- return token;
- }
-}
diff --git a/src/main/java/com/cetc32/dh/config/RedisConfig.java b/src/main/java/com/cetc32/dh/config/RedisConfig.java
index 3d9e851c1b88addb5010647457794f175747c839..2f67f4eb0edbee3077d7ae98ea3284b80f1eebf9 100644
--- a/src/main/java/com/cetc32/dh/config/RedisConfig.java
+++ b/src/main/java/com/cetc32/dh/config/RedisConfig.java
@@ -25,7 +25,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
* @Description: MVC配置信息
* 更改描述：
*/
-@Configuration
+//@Configuration
public class RedisConfig {
@Bean
@SuppressWarnings("all")
@@ -49,4 +49,4 @@ public class RedisConfig {
template.afterPropertiesSet();
return template;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/cetc32/dh/config/RedisUtil.java b/src/main/java/com/cetc32/dh/config/RedisUtil.java
index d4f570fc589ecb0adcd427f1d01a118b51e905af..2947cc19d9e488d6ec6fd9b76eba21a116254c7d 100644
--- a/src/main/java/com/cetc32/dh/config/RedisUtil.java
+++ b/src/main/java/com/cetc32/dh/config/RedisUtil.java
@@ -24,9 +24,9 @@ import org.springframework.util.CollectionUtils;
* @Description: MVC配置信息
* 更改描述：
*/
-@Component
+//@Component
public final class RedisUtil {
- @Autowired
+ //@Autowired
private RedisTemplate redisTemplate;
/**
@@ -506,4 +506,4 @@ public final class RedisUtil {
return 0;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java b/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java
deleted file mode 100644
index 3de6a773b68f2ffe8d054c14106b31275a8a5f89..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * @Description：
- * @Author ：黄子君
- * @version：1.0
- * @date ： 2021/1/21 下午4:45
- ******************************************************************************/
-package com.cetc32.dh.controller.rest;
-
-import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.entity.AreaCommon;
-import com.cetc32.dh.service.AreaCommonService;
-import com.cetc32.webutil.common.annotations.LoginSkipped;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import java.util.Arrays;
-import java.util.List;
-
-@Slf4j
-@LoginSkipped
-@RestController
-@RequestMapping("/rest/area")
-/**
- * 地理范围接口操作类
- * @author: 黄子君
- * @version: 1.0
- * @date: 2020/10/14
- * 备注:无
- */
-public class AreaCommonController {
-
- @Autowired
- private AreaCommonService areaCommonService;
-
-
- @ApiOperation(value = "查询地理范围树结构")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "查询ID（key值）下的范围树,非必填，默认查询全国", dataType = "String"),
- })
- @RequestMapping(value = "/all", method = RequestMethod.GET)
- public ResponseResult areaCommonTree(String id) {
- if (id == null) {
- id = "100000";
- }
-// List areaCommonDTO = areaCommonService.getAreaTreeList(id);
- return ResponseResult.success(areaCommonService.getAreaTreeList(id));
- }
-
- @ApiOperation(value = "根据ID查询区域范围")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "全国统一编码ID值", dataType = "String"),
- })
- @RequestMapping(value = "/get", method = RequestMethod.GET)
- public ResponseResult getAreaById(String id) {
-
- AreaCommon areaCommon = areaCommonService.getById(id);
- if (areaCommon == null) {
- return ResponseResult.error("无该ID所属区域。");
- }
- return ResponseResult.success(areaCommon);
- }
-
- @RequestMapping(value = "/ids", method = RequestMethod.GET)
- public ResponseResult getByIDs(@RequestBody String[] ids) {
-
- List tbList = Arrays.asList(ids);
- List areaCommon = areaCommonService.getAreasByIdList(tbList);
- if (areaCommon == null) {
- return ResponseResult.error("无该ID所属区域。");
- }
- return ResponseResult.success(areaCommon);
- }
-
-}
diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java
deleted file mode 100644
index 6428a28ee787ca79303de0ff9bda2a709ae8b1a3..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/**
- * @Description: 权限管理
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.controller.rest;
-
-import com.cetc32.dh.beans.LoginParameter;
-import com.cetc32.dh.beans.LoginResult;
-import com.cetc32.dh.beans.ResultUserInfo;
-import com.cetc32.dh.common.response.PageDataResult;
-import com.cetc32.dh.beans.*;
-import com.cetc32.dh.common.response.PageDataResult;
-import com.cetc32.dh.common.response.ResponseData;
-import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.common.utils.JWTUtil;
-import com.cetc32.dh.config.RedisUtil;
-import com.cetc32.dh.entity.AreaCommon;
-import com.cetc32.dh.entity.BaseAdminUser;
-import com.cetc32.dh.entity.NumberS;
-import com.cetc32.dh.mybatis.AreaCommonMapper;
-import com.cetc32.dh.mybatis.BaseAdminUserMapper;
-import com.cetc32.dh.service.AdminUserService;
-import com.cetc32.dh.service.AreaCommonService;
-import com.cetc32.dh.service.impl.AdminRoleServiceImpl;
-import com.cetc32.dh.service.impl.AdminUserServiceImpl;
-import com.cetc32.dh.service.impl.AreaCommonServiceImpl;
-import com.google.inject.internal.util.$FinalizableWeakReference;
-import com.google.inject.internal.util.$ObjectArrays;
-import com.google.inject.internal.util.$ToStringBuilder;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.crypto.interfaces.PBEKey;
-import javax.servlet.http.HttpServletRequest;
-import java.awt.*;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Type;
-import java.util.*;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import com.cetc32.dh.common.utils.DigestUtils;
-
-import static com.cetc32.dh.common.utils.Tools.*;
-
-/**
- * 数据管理配置
- * @author: 徐文远
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * @Description: MVC配置信息
- * 更改描述：
- */
-@RestController
-@RequestMapping("/rest/auth/")
-public class AuthController {
-
- @Autowired
- RedisUtil redisUtil;
-
- @Autowired
- AdminUserServiceImpl userService;
-
- @Autowired
- AreaCommonMapper areaCommonMapper;
-
- /**
- * 用户登陆
- * @param loginParameter "包含username和password的json字符串"
- * @return ResponseData
- * 备注:无
- */
- @ApiOperation(value = "用户登录验证，并返回用户相应角色", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"),
- @ApiImplicitParam(name = "password", value = "密码", paramType = "String")
- })
- @PostMapping("/login")
- public ResponseData login2(@RequestBody LoginParameter loginParameter){
- String username=loginParameter.getUsername();
- String password=loginParameter.getPassword();
- if(username==null || password==null || password.length()==0)
- {
- return ResponseData.error("用户名和密码不能为空！");
- }
- BaseAdminUser user= userService.findByUserName(username);
- if(user==null || !user.getSysUserPwd().equals(DigestUtils.Md5(username,password)))
- {
- return ResponseData.error("账户信息有误或未审核！");
- }
- long currentTimeMillis = System.currentTimeMillis();
- String token= JWTUtil.createToken(username,currentTimeMillis);
- redisUtil.set(username,currentTimeMillis,60*30);
- LoginResult data=new LoginResult(token,
- user.getDepartment(),
- username,
- user.getId(),
- user.getRoleId(),
- user.getSecurity(),
- user.getAreacode(),
- JWTUtil.getExpire(token));
- return ResponseData.success(200,"success",data);
- }
-
-
- @ApiOperation(value = "移动终端用户注册（固定角色、固定为非M权限)", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"),
- @ApiImplicitParam(name = "password", value = "密码", paramType = "String")
- })
- @PostMapping(value="/register",produces = "application/json;charset=UTF-8")
- public ResponseData register(@RequestBody Map loginParameter){
- Map reg=new HashMap<>();
- reg.put("username",loginParameter.getOrDefault("username",null));
- reg.put("password",loginParameter.getOrDefault("password",null));
- BaseAdminUser userInfo=CreateUser(reg);
- String username=userInfo.getSysUserName();
- if(StringUtils.isBlank(username))
- {
- return ResponseData.error("用户名不能为空！");
- }
- if(userService.findByUserNameAll(username)!=null)
- {
- return ResponseData.error("用户名已存在！");
- }
- if(StringUtils.isBlank(userInfo.getSysUserPwd())){
- return ResponseData.error("密码不能为空！");
- }
- //默认用户有效
- userInfo.setUserStatus(-1);
- userInfo.setRegTime(new Date());
- // TODO 默认安全等级
- if(userInfo.getSecurity()==null)
- {
- userInfo.setSecurity(3);
- }
- if(userService.insertUser(userInfo)>0)
- {
- return ResponseData.success("添加成功");
- }
- else {
- return ResponseData.error("添加失败");
- }
- }
-
- @ApiOperation(value = "用户添加", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"),
- @ApiImplicitParam(name = "password", value = "密码", paramType = "String"),
- @ApiImplicitParam(name = "role", value = "角色id列表", paramType = "List"),
- @ApiImplicitParam(name = "security", value = "密级(1:JM，2：MM，3：FM)", paramType = "Integer"),
- @ApiImplicitParam(name = "department", value = "部门id列表", paramType = "List"),
- @ApiImplicitParam(name = "areacode", value = "区域id列表", paramType = "List")
- })
- @PostMapping("/user")
- public ResponseData AddUser(@RequestBody Map userMap){
- BaseAdminUser userInfo=CreateUser(userMap);
- String username=userInfo.getSysUserName();
- if(StringUtils.isBlank(username))
- {
- return ResponseData.error("用户名不能为空！");
- }
- if(userService.findByUserName(username)!=null)
- {
- return ResponseData.error("用户名已存在！");
- }
- if(StringUtils.isBlank(userInfo.getSysUserPwd())){
- userInfo.setSysUserPwd(DigestUtils.Md5(username,"123456"));
- }
- //默认用户有效
- userInfo.setUserStatus(1);
- long currentTimeMillis = System.currentTimeMillis();
- userInfo.setRegTime(new Date());
- // TODO 默认安全等级
- if(userInfo.getSecurity()==null)
- {
- userInfo.setSecurity(3);
- }
- if(userService.insertUser(userInfo)>0)
- {
- return ResponseData.success("添加成功");
- }
- else {
- return ResponseData.error("添加失败");
- }
- }
-
- @ApiOperation(value = "用户删除（仅标记不从数据库删除）", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "用户id", paramType = "Integer"),
- })
- @PostMapping(value = "/deleteUser")
- public ResponseData deleteUser(@RequestBody Map did){
- Integer id=did.getOrDefault("id",0);
- if(userService.delUser(id,0)>0)
- {
- return ResponseData.success("删除成功！");
- }
- else
- {
- return ResponseData.error("删除失败！");
- }
- }
- @PostMapping(value = "/reject")
- public ResponseData rejectUser(@RequestBody Map did){
- Integer id=did.getOrDefault("id",0);
- if(userService.delUser(id,0)>0)
- {
- return ResponseData.success("删除成功！");
- }
- else
- {
- return ResponseData.error("删除失败！");
- }
- }
- @ApiOperation(value = "用户删除（从数据库中删除不可恢复）", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "用户id", paramType = "Integer"),
- })
- @PostMapping(value = "/deleteInfo")
- public ResponseData deleteUser1(@RequestBody Map did){
- Integer id=did.getOrDefault("id",0);
- if(userService.deleteInfo(id)>0)
- {
- return ResponseData.success("删除成功！");
- }
- else
- {
- return ResponseData.error("删除失败！");
- }
- }
-
- @ApiOperation(value = "条件用户查找", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"),
- @ApiImplicitParam(name = "role", value = "单个角色id", paramType = "Integer"),
- @ApiImplicitParam(name = "security", value = "密级", paramType = "Integer"),
- @ApiImplicitParam(name = "department", value = "单个部门id", paramType = "Integer"),
- @ApiImplicitParam(name = "areacode", value = "单个区域id", paramType = "Integer"),
- @ApiImplicitParam(name = "page", value = "页码",dataType = "Integer",defaultValue = "1"),
- @ApiImplicitParam(name = "results", value = "每页数据条数",dataType = "Integer",defaultValue = "10"),
- @ApiImplicitParam(name = "userStatus", value = "用户状态（-1：待审核，0：已删除，1：正常）",dataType = "Integer",defaultValue = "1")
- })
- @PostMapping(value = "/users")
- //@GetMapping(value = "/users")
- // public PageDataResult getUserList(@RequestBody UserInfo user_info){
- public PageDataResult getUserList(@RequestBody Map userInfo){
- BaseAdminUser user_info=CreateUser(userInfo);
- return new PageDataResult(userService.countUserByCondition(user_info),
- userService.findUserByCondition(user_info),
- user_info.getOffset());
- }
-
-
- @ApiOperation(value = "注册用户激活及信息修改", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"),
- @ApiImplicitParam(name = "password", value = "密码", paramType = "String"),
- @ApiImplicitParam(name = "role", value = "角色id列表", paramType = "List"),
- @ApiImplicitParam(name = "security", value = "密级", paramType = "Integer"),
- @ApiImplicitParam(name = "department", value = "部门id列表", paramType = "List"),
- @ApiImplicitParam(name = "areacode", value = "区域id列表", paramType = "List")
- })
- @PutMapping({"/activeUser"})
- public ResponseData activeUser(@RequestBody Map postPara){
- postPara.put("userStatus",1);
- return updateUser(postPara);
- }
-
- @ApiOperation(value = "用户修改", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"),
- @ApiImplicitParam(name = "password", value = "密码", paramType = "String"),
- @ApiImplicitParam(name = "role", value = "角色id列表", paramType = "List"),
- @ApiImplicitParam(name = "security", value = "密级", paramType = "Integer"),
- @ApiImplicitParam(name = "department", value = "部门id列表", paramType = "List"),
- @ApiImplicitParam(name = "areacode", value = "区域id列表", paramType = "List")
- })
- @PutMapping({"/user"})
- public ResponseData updateUser(@RequestBody Map postPara){
-
- BaseAdminUser userInfo=CreateUser(postPara);
- String username=userInfo.getSysUserName();
- if(StringUtils.isEmpty(username))
- {
- return ResponseData.error("用户名不能为空！");
- }
- BaseAdminUser user= userService.findByUserNameAll(username);
- if(user==null)
- {
- return ResponseData.error("用户不存在！");
- }
- userInfo.setId(user.getId());
- if(userService.updateUserInfo(userInfo)>0)
- {
- return ResponseData.success("更新成功！");
- }
- else{
- return ResponseData.error("更新失败！");
- }
-
- }
-
- /**
- * Map到实体的转化,同时兼容区域传id或区域名
- * @param userInfo
- * @return
- */
- private BaseAdminUser CreateUser(Map userInfo)
- {
- BaseAdminUser user_info=new BaseAdminUser();
- if(userInfo != null && userInfo.size()>0)
- {
- user_info=new BaseAdminUser();
- Object areaCodeName=userInfo.getOrDefault("areaCodeName",null);
- if(areaCodeName==null)
- {
- areaCodeName=userInfo.getOrDefault("areacode",null);
- }
- if(areaCodeName!=null)
- {
- user_info.setAreacode(areaCodeName);
- if(isContainChinese(user_info.getAreacode()))
- {
- List areaCommons = areaCommonMapper.selectAll();
- List areaCode=new ArrayList<>();
- Map areaCommonsMap =
- areaCommons.stream().collect(Collectors.toMap(AreaCommon::getName, AreaCommon::getId));
- for(String i:user_info.getAreaCodeList())
- {
- if(areaCommonsMap.getOrDefault(i, null)!=null)
- {
- areaCode.add(areaCommonsMap.getOrDefault(i, null));
- }
- }
- user_info.setAreacode(areaCode);
- }
- }
- user_info.setId(getMapValueInt(userInfo,"id"));
- // 用户名需要在密码之前赋值
- // 用户名去除两端空格
- user_info.setSysUserName(StringUtils.trim(getMapValueStr(userInfo,"username")));
- String password=getMapValueStr(userInfo,"password");
- if(password!=null && user_info.getSysUserName()!=null && password.trim().length()>0)
- {
- user_info.setSysUserPwd(DigestUtils.Md5(user_info.getSysUserName(),password));
- }
- else
- {
- user_info.setSysUserPwd(null);
- }
- user_info.setRoleId(userInfo.getOrDefault("role",null));
- user_info.setDepartment(userInfo.getOrDefault("department",null));
- user_info.setSecurity(getMapValueInt(userInfo,"security"));
- user_info.setPage(getMapValueInt(userInfo,"page"));
- user_info.setResults(getMapValueInt(userInfo,"results"));
- user_info.setUserStatus(getMapValueInt(userInfo,"userStatus"));
- }
- return user_info;
-
- }
-
- /**
- * 注销
- * @param token
- * @return ResponseData
- * 备注:无
- */
- @ApiOperation(value = "用户登出", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "登陆成功返回的token", paramType = "String"),
- })
- @PostMapping("/logout")
- public ResponseData logout(String token){
- if(token!=null)
- {
- String username=JWTUtil.getUsername(token);
- redisUtil.del(username);
- }
- return ResponseData.success();
- }
-
-
- /**
- * 注销
- * @param token
- * @return ResponseData
- * 备注:无
- */
- @ApiOperation(value = "token校验", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "登陆成功返回的token", paramType = "String"),
- })
- @GetMapping("/token")
- public ResponseData token(String token){
- if(token!=null )
- {
- String username=JWTUtil.getUsername(token);
- if(username!=null && JWTUtil.verify(token))
- {
- BaseAdminUser user= userService.findByUserName(username);
- if(user!=null)
- {
- long currentTimeMillis = System.currentTimeMillis()/1000;
- long exp=JWTUtil.getExpire(token);
- if(exp>currentTimeMillis)
- {
- ResultUserInfo data=new ResultUserInfo();
- data.setSecurity(user.getSecurity());
- data.setAreacode(user.getAreacode());
- data.setDepartment(user.getDepartment());
- data.setRole(user.getRoleId());
- data.setUsername(username);
- return ResponseData.success(200,"success",data);
- }
- else
- {
- return ResponseData.error("token 已过期！");
- }
- }
- }
- return ResponseData.error("token 认证失败！");
- }
- return ResponseData.error("缺少参数token！");
- }
-
- /**
- * 非授权用户登陆
- * @param message
- * @return ResponseResult
- * 备注:无
- */
- @PostMapping(path = "/unauthorized/{message}")
- public ResponseResult unauthorized(@PathVariable String message) throws UnsupportedEncodingException {
- return ResponseResult.fail(message);
- }
-}
diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java
deleted file mode 100644
index 19b7107db479997a9a7f3aa9288144bf44c31b67..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.cetc32.dh.controller.rest;
-
-import com.cetc32.dh.beans.ResultUserRole;
-import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.common.utils.Tools;
-import com.cetc32.dh.entity.BaseAdminRole;
-import com.cetc32.dh.common.response.PageDataResult;
-import com.cetc32.dh.common.response.ResponseData;
-import com.cetc32.dh.entity.BaseAdminUser;
-import com.cetc32.dh.entity.NumberS;
-import com.cetc32.dh.service.impl.AdminRoleServiceImpl;
-import com.cetc32.dh.service.impl.AdminUserServiceImpl;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/rest/role/")
-public class AuthRoleController {
- @Autowired
- AdminRoleServiceImpl adminRoleService;
-
- @Autowired
- AdminUserServiceImpl userService;
-
- @ApiOperation(value = "获取角色列表（分页）", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name="page",value = "页码",dataType = "Integer",defaultValue = "0"),
- @ApiImplicitParam(name="results",value = "每页数据条数",dataType = "Integer",defaultValue = "10"),
- })
- @PostMapping(value = "/getAll")
- public PageDataResult getRoles(@RequestBody NumberS number){
- return new PageDataResult(adminRoleService.countRoles(), adminRoleService.getAllRoles(number),number.getOffset());
- }
-
- @ApiOperation(value = "获取角色列表(不分页)", notes = "")
- @GetMapping(value = "/list")
- public ResponseData getRolesList(){
- return ResponseData.success(adminRoleService.getRoleList());
- }
-
- /**
- *角色新增
- * @param newRole
- */
- @ApiOperation(value = "角色新增", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name="id",value = "id(不用传入)",dataType = "Integer",defaultValue = ""),
- @ApiImplicitParam(name="roleName",value = "角色名称",dataType = "String"),
- })
- @PostMapping("/add")
- @ResponseBody
- public ResponseData addRole(@RequestBody ResultUserRole newRole) {
- String roleName= newRole.getRoleName().trim();
- if(roleName.isEmpty())
- {
- return ResponseData.error("角色名不能为空！");
- }
- ResultUserRole role = adminRoleService.findRoleByName(roleName);
- if(role !=null)
- {
- return ResponseData.error("角色名已存在！");
- }
- if(newRole.getId() == null){
- BaseAdminRole br=new BaseAdminRole();
- BeanUtils.copyProperties(newRole, br);
- //新增角色
- if(adminRoleService.addRole(br)>0)
- {
- return ResponseData.success("添加成功！");
- }
- }
- return ResponseData.error("添加失败！");
- }
-
-
- @ApiOperation(value = "更新角色", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name="id",value = "要更新的角色id",dataType = "Integer",defaultValue = ""),
- @ApiImplicitParam(name="roleName",value = "角色名称",dataType = "String"),
- })
- @PostMapping("/update")
- @ResponseBody
- public ResponseData updateRole(@RequestBody ResultUserRole role) {
- String roleName= role.getRoleName().trim();
- if(roleName.isEmpty() || role.getId() == null)
- {
- return ResponseData.error("角色名或角色id不能为空！");
- }
- ResultUserRole rr=adminRoleService.findRoleById(role.getId());
- if(rr==null)
- {
- return ResponseData.error("角色不存在!");
- }
- if(rr.getIsDefault() == 1)
- {
- if(!Tools.isListEqual(rr.getSystemMenu(),role.getSystemMenu()))
- {
- return ResponseData.error("内置角色不能修改权限！");
- }
- }
- BaseAdminRole br=new BaseAdminRole();
- BeanUtils.copyProperties(role, br);
- if(adminRoleService.updateRole(br)>0)
- {
- return ResponseData.success("修改成功！");
- };
- return ResponseData.error("修改失败！");
- }
-
- @ApiOperation(value = "删除角色", notes = "")
- @ApiImplicitParams({
- @ApiImplicitParam(name="id",value = "要删除的角色id",dataType = "Integer",defaultValue = "")
- })
- @PostMapping("/delete")
- @ResponseBody
- public ResponseData deleteRole(@RequestBody Map mapId) {
- Integer id=mapId.getOrDefault("id",null);
- if(id == null)
- {
- return ResponseData.error("角色id不能为空！");
- }
- ResultUserRole rr=adminRoleService.findRoleById(id);
- if(rr != null && rr.getIsDefault() == 1)
- {
- return ResponseData.error("内置角色不能删除！");
- }
- BaseAdminUser user_info=new BaseAdminUser();
- user_info.setRoleId(id);
- if(userService.findUserByCondition(user_info).size()>0)
- {
- return ResponseData.error("请先删除具有该角色的人员！");
- }
- if(adminRoleService.delRoleByID(id)>0)
- {
- return ResponseData.success("删除成功！");
- };
-
- return ResponseData.error("删除失败！");
- }
-}
diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityController.java b/src/main/java/com/cetc32/dh/controller/rest/CityController.java
index d3608bb3cc916cecd929e1ea4bcf9a37b2ffde1f..3ad4c636133ce4dd3b9f5b18ba3fde51e07fc228 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/CityController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/CityController.java
@@ -1,3 +1,11 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/13 下午3:22
+ ******************************************************************************/
+
/*******************************************************************************
* @Description：
* @Author ：肖小霞
@@ -7,9 +15,6 @@
package com.cetc32.dh.controller.rest;
import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.entity.AreaCommon;
-import com.cetc32.dh.entity.City;
-import com.cetc32.dh.service.AreaCommonService;
import com.cetc32.dh.service.CityService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,14 +36,14 @@ import java.util.*;
public class CityController {
@Autowired
CityService cityService;
- @Autowired
+/* @Autowired
AreaCommonService areaCommonService;
- /**
+ *//**
* 计算根据点集得出各城市的地理区域
* @return 返回区域面结果
* 备注:无
- */
+ *//*
@ApiOperation(value = "北京城市的点")
@PostMapping("/polygon")
public ResponseResult polygon() {
@@ -91,7 +96,7 @@ public class CityController {
}
- }
+ }*/
/**
* 判断某个点是否在一个面中
diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java
new file mode 100644
index 0000000000000000000000000000000000000000..a7ec5522cf96c62712aec098f65c7cb55003559c
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/15 下午3:40
+ ******************************************************************************/
+package com.cetc32.dh.controller.rest;
+
+import com.cetc32.dh.common.response.ResponseData;
+import com.cetc32.dh.service.CityGeomService;
+import com.cetc32.webutil.common.annotations.LoginSkipped;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+
+@RequestMapping("/rest/city/")
+@LoginSkipped
+public class CityGeomController {
+ @Autowired
+ CityGeomService cityGeomService;
+ @LoginSkipped
+ @GetMapping("/tree")
+ public ResponseData tree(){
+ return ResponseData.success(cityGeomService.selectTreeData(null));
+ }
+}
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
index 325796200a50d8cf3f9050306ab9bf1130478dd7..aadb4f7eea42c09d82f347c233defcb139bcaa14 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
@@ -30,6 +30,8 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -53,8 +55,6 @@ public class DataFileController {
@Autowired
DataMenuService dataMenuService;
@Autowired
- AdminUserService adminUserService;
- @Autowired
ZipFileService zipFileService;
@Value("${upLoadPath}")
String upLoadPath;
@@ -62,6 +62,10 @@ public class DataFileController {
String upDatePath;
@Value("${downPath}")
String downPath;
+ @Value("${storePath}")
+ String storePath;
+ @Value("${server.port}")
+ private String port;
// /**
// * 批量文件夹上传服务器
@@ -292,7 +296,13 @@ public class DataFileController {
})
@PostMapping("/approvecommon")
public PageDataResult queryFilesByObj(@RequestBody DataFile dataFile) {
- System.out.println(dataFile.getMenuId());
+ InetAddress address = null;//获取的是本地的IP地址 //PC-20140317PXKX/192.168.0.121
+ try {
+ address = InetAddress.getLocalHost();
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ String hostAddress = address.getHostAddress();//192.168.0.121
Integer page = dataFile.getPage();
Integer results = dataFile.getResults();
if (dataFile.getTimeRange() != null && dataFile.getTimeRange().length == 2) {
@@ -316,10 +326,12 @@ public class DataFileController {
List regionList = Arrays.asList(dataFileList.get(i).getRegion().split(","));
dataFileList.get(i).setRegionList(new ArrayList(regionList));
}
- }
+ if(dataFileList.get(i).getImgExample()!=null){
+ dataFileList.get(i).setImgExample("http://"+hostAddress+":"+port+"/pic"+dataFileList.get(i).getImgExample());
+ }
+ }
return new PageDataResult(dataFileService.countFilesByObj(dataFile), dataFileList, offset);
-
}
/**
@@ -384,10 +396,9 @@ public class DataFileController {
@ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"),
})
@PostMapping("/subcommon")
- public ResponseResult DataSub(@RequestBody DataFile dataFile) {
+ public ResponseResult DataSub(@RequestBody DataFile dataFile) throws Exception {
if(null == dataFile)
return ResponseResult.error("无效的参数");
- System.out.println(dataFile.getRegionList());
if (dataFile.getRegionList() != null) {
String region = dataFile.getRegionList().toString();
region = region.replace("[", "");
@@ -398,38 +409,46 @@ public class DataFileController {
String fileName = null;
Integer count = 0;
dataFile.setStatus("未审批");
- /*if ((adminUserService.getUserById(userId)) != null) {
- dataFile.setSubmitor(adminUserService.getUserById(userId).getSysUserName());
- }*/
dataFile.setSubmitor(SecurityUserUtil.getUser().getUsername());
DataFile dataFile_new = dataFile;
DataFile dataFile_new2 = dataFile;
- String path_move = dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl();
+ String path_move = storePath + File.separator+dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl();
FileUtil.makeDir(path_move);
-// dataSubmit.setPath(path);
File baseFile = new File(upCachePath);
if (baseFile == null) {
return ResponseResult.error("未上传文件");
}
File[] files = baseFile.listFiles();
File file = null;
-// List pathListNew = new ArrayList<>();
for (int i = 0; i < files.length; i++) {
+ dataFile.setImgExample(null);
file = files[i];
+ String oldFileName=file.getName();
if (file.isDirectory()) {
- dataFile.setFileNumbers(FileUtil.getAllFile(upCachePath + File.separator + file.getName()).size());
+ List allFiles = FileUtil.getAllFile(upCachePath + File.separator + oldFileName);
+ dataFile.setFileNumbers(allFiles.size());
dataFile.setFileSize(FileUtils.sizeOfDirectory(file));
- fileName = FileUtil.nameAddTime(file.getName());
+ fileName = FileUtil.nameAddTime(oldFileName);
+ for (int j = 0; j = 0) {
count++;
@@ -447,12 +466,68 @@ public class DataFileController {
return ResponseResult.error("表单信息提交失败！");
}
+ /**
+ * 记录数据详情展示
+ *
+ * @param fileId 件id
+ * @return 返回记录数据详情结果
+ */
+ @ApiOperation(value = "查看记录详情")
+ @RequestMapping(value = "/comdetail", method = RequestMethod.GET)
+ public ResponseResult comDetail(Long fileId) {
+ DataFile dataFile = dataFileService.queryById(fileId);
+ if(dataFile!=null){
+ return ResponseResult.success(200,"详情",dataFile);
+ }else{
+ return ResponseResult.error("未查找到相关信息，请输入正确的参数！");
+ }
+ }
+
+ /**
+ * 展示记录图片详情
+ *
+ * @param fileId 件id
+ * @return 返回记录数据详情结果
+ */
+ @ApiOperation(value = "查看记录详情")
+ @RequestMapping(value = "/imgdetail", method = RequestMethod.GET)
+ public ResponseResult imgDetail(Long fileId) {
+
+ String img_url = null;
+ InetAddress address = null;//获取的是本地的IP地址 //PC-20140317PXKX/192.168.0.121
+ try {
+ address = InetAddress.getLocalHost();
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ String hostAddress = address.getHostAddress();//192.168.0.121
+ DataFile dataFile = dataFileService.queryById(fileId);
+ if(dataFile==null){
+ return ResponseResult.error("未查找到相关信息，请输入正确的参数！");
+ }else{
+ String filePath = dataFile.getFilePath();
+ List filePathList = FileUtil.getAllFile(filePath);
+ List result_list = new ArrayList<>();
+ for (int i = 0; i map) {
Long fileId = Long.parseLong((String) map.get("fileId"));
- String upCachePath = "/root/update" + "file" + fileId;
+ String upCachePath = upDatePath + "file" + fileId;
System.out.println(upCachePath);
FileUtil.deleteDir(upCachePath);
File file = new File(upCachePath);
@@ -802,6 +880,7 @@ public class DataFileController {
String fileConfig = (String) map.get("fileConfig");
String scale = (String) map.get("scale");
String region = null;
+ String new_path = null;
if ((List) map.get("regionList") != null) {
region = ((List) map.get("regionList")).toString();
region = region.replace("[", "");
@@ -857,6 +936,7 @@ public class DataFileController {
String path_whole = dataFile.getFilePath();
String path = path_whole.substring(0, path_whole.lastIndexOf("/"));
if (files[0].getName().contains(".")) {
+ new_path = path + File.separator + files[0].getName();
flag = files[0].renameTo(new File(path + File.separator + files[0].getName()));
} else {
//文件加上时间戳
@@ -874,7 +954,8 @@ public class DataFileController {
}
dataFile.setFilePath(path + File.separator + dataFile.getFileName());
if (files[0].getName().contains(".")) {
- dataFile.setFileSize(files[0].length());
+ File f = new File(path + File.separator + files[0].getName());
+ dataFile.setFileSize(f.length());
dataFile.setFileNumbers(1);
} else {
dataFile.setFileSize(FileUtils.sizeOfDirectory(new File(dataFile.getFilePath())));
@@ -882,7 +963,9 @@ public class DataFileController {
}
}
- FileUtil.deleteDir(old_filePath);
+ if(!old_filePath.equals(new_path)){
+ FileUtil.deleteDir(old_filePath);
+ }
FileUtil.deleteDir(updateCachePath);
}
}
@@ -893,7 +976,6 @@ public class DataFileController {
}
-
/**
* 统计编目menuId下的所有文件数据的大小
*
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
index 096a2637cf647f44596d6cb060b4d94b480b1c33..0f3855c467c5fc19c4ab80f1eb7a580b292408b9 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
@@ -18,10 +18,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.io.File;
import java.util.*;
@@ -69,22 +66,6 @@ public class DataMenuController {
return ResponseResult.success(count);
}
- /**
- * 根据编目id查询目录节点
- *
- * @param id
- * @return 返回查询结果
- * 备注:无
- */
- //@PostMapping(value = "/select")
- public ResponseResult select(Long id) {
-
- DataMenu dataMenu = dataMenuService.queryById(id);
- if (dataMenu == null) {
- return ResponseResult.error("没有id=" + id + "的datamenu！");
- }
- return ResponseResult.success(dataMenu);
- }
/**
* 根据编目id删除目录节点(单个)
@@ -179,19 +160,29 @@ public class DataMenuController {
}
/**
- * 根据编目节点id，更新编目节点
+ * 根据编目节点id，更新编目节点，只更新编目的描述信息
*
- * @param dataMenu
+ * @param menuId 编目节点id
* @return 返回更新结果
* 备注:无
*/
- //@PostMapping(value = "/updateDataMenu")
- public ResponseResult updateDataMenu(DataMenu dataMenu) {
-// dataMenu=new DataMenu(5L,"test5",1L,"test5","test5555");
- Integer count = dataMenuService.updatebyId(dataMenu);
- return ResponseResult.success(count);
+ @PostMapping(value = "/updateMenu")
+ public ResponseResult updateDataMenu(@RequestBody DataMenu dataMenu) {
+// DataMenu dataMenu = dataMenuService.queryById(menuId);
+// dataMenu.setDiscription(discription);
+ System.out.println(dataMenu.getDiscription());
+ if(dataMenu!=null&&dataMenu.getId()!=null){
+ if(dataMenuService.updatebyId(dataMenu)>0){
+ return ResponseResult.success(200,"更新成功","编目"+dataMenuService.queryById(dataMenu.getId()).getMenuName()+"更新成功！");
+ }else{
+ return ResponseResult.error("更新失败！");
+ }
+ }else{
+ return ResponseResult.error("未找到对应的编目，请输入正确的参数！");
+ }
}
+
/**
* 根据目录节点id，删除目录树(包括子树)
*
@@ -259,8 +250,6 @@ public class DataMenuController {
return ResponseResult.success(id);
}
return ResponseResult.error("请输入正确的key！");
-
-
}
/**
@@ -294,6 +283,28 @@ public class DataMenuController {
return ResponseResult.success(dataMenuDTO.getChildren());
}
+ /**
+ * 显示单个目录信息
+ *
+ * @param menuId
+ * @return 返回展示结果
+ * 备注:无
+ */
+ @ApiOperation(value = "显示单个目录信息")
+ @GetMapping(value = "/showMenu")
+ public ResponseResult showMenu(Long menuId) {
+ Map map = new HashMap<>();
+ DataMenu dataMenu = dataMenuService.queryById(menuId);
+ if(dataMenu!=null){
+ map.put("目录名称",dataMenu.getMenuName());
+ map.put("目录描述信息",dataMenu.getDiscription());
+ return ResponseResult.success(map);
+ }else {
+ return ResponseResult.error("未找到对应的目录，请传入正确的参数！");
+ }
+
+ }
+
/**
* (目录名称)编目名称和编目id
*
@@ -310,6 +321,8 @@ public class DataMenuController {
}
return ResponseResult.success(hashMapList);
}
+
+
}
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java b/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java
index 92cf50b9e598875cfd8ca427c74107c666010ed8..7c255b566c3491f976a68bd7d416c5fae8c1c69b 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java
@@ -10,17 +10,13 @@ import com.cetc32.dh.common.response.PageDataResult;
import com.cetc32.dh.common.response.ResponseResult;
import com.cetc32.dh.entity.DataFile;
import com.cetc32.dh.entity.DataPlp;
-import com.cetc32.dh.service.AdminUserService;
import com.cetc32.dh.service.DataPlpService;
import com.cetc32.webutil.common.util.SecurityUserUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -39,9 +35,6 @@ public class DataPlpController {
@Autowired
DataPlpService dataPlpService;
- @Autowired
- AdminUserService adminUserService;
-
/**
* 提交点线面数据
*
@@ -73,6 +66,24 @@ public class DataPlpController {
}
+ /**
+ * 记录数据详情展示
+ *
+ * @param id 文件id
+ * @return 返回记录数据详情结果
+ */
+ @ApiOperation(value = "查看记录详情")
+ @RequestMapping(value = "/plpdetail", method = RequestMethod.GET)
+ public ResponseResult plpDetail(Integer id) {
+ DataPlp dataPlp = dataPlpService.queryById(id);
+ if(dataPlp!=null){
+ return ResponseResult.success(200,"详情",dataPlp);
+ }else{
+ return ResponseResult.error("未查找到相关信息，请输入正确的参数！");
+ }
+ }
+
+
/**
* 根据编目节点id查询通过的点线面数据
*
@@ -237,10 +248,7 @@ public class DataPlpController {
int sum = 0;
ids = (List) map.get("ids");
Integer userId = SecurityUserUtil.getUser().getId();
- String userName = null;
- if ((adminUserService.getUserById(userId)) != null) {
- userName = adminUserService.getUserById(userId).getSysUserName();
- }
+ String userName = SecurityUserUtil.getUser().getUsername();
for (int i = 0; i < ids.size(); i++) {
Integer id = ids.get(i);
if (dataPlpService.deleteById(id) > 0) {
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java b/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java
index e5080469d1aaf608048b0b3eaa5608ffcb133c13..b62477fef4ac24be7802a3b4241732cea9504537 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java
@@ -10,7 +10,6 @@ import com.cetc32.dh.common.response.PageDataResult;
import com.cetc32.dh.common.response.ResponseResult;
import com.cetc32.dh.entity.DataPlp;
import com.cetc32.dh.entity.DataTrace;
-import com.cetc32.dh.service.AdminUserService;
import com.cetc32.dh.service.DataTraceService;
import com.cetc32.dh.utils.FileUtil;
import com.cetc32.webutil.common.util.SecurityUserUtil;
@@ -43,9 +42,6 @@ public class DataTraceController {
@Autowired
DataTraceService dataTraceService;
- @Autowired
- AdminUserService adminUserService;
-
/**
* 提交轨迹数据
@@ -151,6 +147,23 @@ public class DataTraceController {
}
+ /**
+ * 记录数据详情展示
+ *
+ * @param id 文件id
+ * @return 返回记录数据详情结果
+ */
+ @ApiOperation(value = "查看记录详情")
+ @RequestMapping(value = "/tracedetail", method = RequestMethod.GET)
+ public ResponseResult traceDetail(Integer id) {
+ DataTrace dataTrace = dataTraceService.queryById(id);
+ if(dataTrace!=null){
+ return ResponseResult.success(200,"详情",dataTrace);
+ }else{
+ return ResponseResult.error("未查找到相关信息，请输入正确的参数！");
+ }
+ }
+
/**
* 审批通过已导入的轨迹数据
*
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java
index 2faa636394e8bda5b8c87534abdae1f336dff0c2..7dc3df0912c6b2ea6206149361442bb0f0af705a 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java
@@ -5,10 +5,8 @@ import com.cetc32.dh.common.response.ResponseResult;
import com.cetc32.dh.common.utils.DateUtils;
import com.cetc32.dh.dto.DemandDTO;
import com.cetc32.dh.dto.DemandSubmitDTO;
-import com.cetc32.dh.entity.BaseAdminUser;
import com.cetc32.dh.entity.DemandSubmit;
import com.cetc32.dh.entity.vDemand;
-import com.cetc32.dh.service.AdminUserService;
import com.cetc32.dh.service.DemandSubmitService;
import com.cetc32.dh.utils.FileUtil;
import com.cetc32.webutil.common.util.SecurityUserUtil;
@@ -48,9 +46,6 @@ public class DemanSubmitController {
@Autowired
DemandSubmitService demandSubmitService;
- @Autowired
- AdminUserService adminUserService;
-
@Value("${myPath}")
String myPath;
@@ -74,12 +69,17 @@ public class DemanSubmitController {
if(StringUtils.isBlank(vdemand.classify)&&StringUtils.isBlank(vdemand.name)&&StringUtils.isBlank(vdemand.people)
&&StringUtils.isBlank(vdemand.starttime)&&StringUtils.isBlank(vdemand.endtime)&&StringUtils.isBlank(vdemand.status)
&& StringUtils.isBlank(vdemand.getTd_end() )&& StringUtils.isBlank(vdemand.getTd_start())){
+
List demandlist = new ArrayList<>();
- Integer count = 0;
- demandlist = demandSubmitService.findAll();
- count = demandSubmitService.countDemand();
- return new PageDataResult(count,demandlist,page * results);
- }else{
+ Long count = 0L;
+ demandlist = demandSubmitService.queryFilesByObj(vdemand);
+ count = demandSubmitService.countFilesByObj(vdemand);
+ return new PageDataResult(count,demandlist,vdemand.getOffset());
+ }else if(StringUtils.isNotBlank(vdemand.name)&&(vdemand.name.contains("%"))){
+ List demandlist = new ArrayList<>();
+ return new PageDataResult(0,demandlist,0);
+ }
+ else{
String frontfirst = vdemand.getStarttime();
String endTime = vdemand.getEndtime();
Date firstdate =null,secondDate = null;
@@ -114,10 +114,13 @@ public class DemanSubmitController {
}
}
List demandlist = new ArrayList<>();
- Integer count = 0;
+ Long count = 0L;
+ if((vdemand.getName()!=null&&vdemand.getName().contains("%"))||(vdemand.getPeople()!=null&&vdemand.getPeople().contains("%"))){
+ return new PageDataResult(count,demandlist,vdemand.getOffset());
+ }
demandlist = demandSubmitService.queryFilesByObj(vdemand);
- count = demandSubmitService.queryFilesByObj(vdemand).size();
- return new PageDataResult(count,demandlist,page * results);
+ count = demandSubmitService.countFilesByObj(vdemand);
+ return new PageDataResult(count,demandlist,vdemand.getOffset());
}
}
@@ -148,7 +151,7 @@ public class DemanSubmitController {
DemandSubmit demandSubmit = new DemandSubmit();
BeanUtils.copyProperties(demandDTO,demandSubmit);
Integer userid = SecurityUserUtil.getUser().getId();
- if(demandSubmit.getProjectName() == null || demandSubmit.getDemandName()==null||demandSubmit.getDemandClassify()==null
+ if(demandSubmit.getDemandName()==null||demandSubmit.getDemandClassify()==null
||demandSubmit.getGetEndtimeFront()==null){
return ResponseResult.error("传入空值！");
}
@@ -163,10 +166,7 @@ public class DemanSubmitController {
demandSubmit.setEndtime(date);
String upCachePath=myPath+"_user"+userid;
//BaseAdminUser adminUser=getCurrentUserId();
- String userName =null;
- if((adminUserService.getUserById(userid))!=null){
- userName = adminUserService.getUserById(userid).getSysUserName();
- }
+ String userName =SecurityUserUtil.getUser().getUsername();
demandSubmit.setReporter(userName);
String status="未审批";
Date d= new Date();
@@ -360,8 +360,8 @@ public class DemanSubmitController {
*/
@PostMapping("/getdemand")
public PageDataResult getUserAll(){
- BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId());
- String name = adminUser.getSysUserName();
+ //BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId());
+ String name = SecurityUserUtil.getUser().getUsername();
PageDataResult pdr = new PageDataResult();
pdr.setTotals(demandSubmitService.countMineSubmit(name));
pdr.setList(demandSubmitService.selectMySubmit(name));
@@ -412,6 +412,7 @@ public class DemanSubmitController {
List ids = new ArrayList<>();
ids = (List) map.get("ids");
DemandSubmit demandSubmit = new DemandSubmit();
+ String reason=(String) map.get("reason");
String staus = "审批通过";
String userName = SecurityUserUtil.getUser().getUsername();
int sum = 0;
@@ -419,6 +420,7 @@ public class DemanSubmitController {
Integer id = ids.get(i);
demandSubmit = demandSubmitService.selectByPrimaryKey(id);
demandSubmit.setApprover(userName);
+ demandSubmit.setReason(reason);
Date appt = new Date();
demandSubmit.setApproceTime(appt);
demandSubmit.setStatus(staus);
@@ -445,6 +447,7 @@ public class DemanSubmitController {
List ids = new ArrayList<>();
ids = (List) map.get("ids");
DemandSubmit demandSubmit = new DemandSubmit();
+ String reason=(String) map.get("reason");
String userName = SecurityUserUtil.getUser().getUsername();
String staus = "审批拒绝";
int sum = 0;
@@ -452,6 +455,7 @@ public class DemanSubmitController {
Integer id = ids.get(i);
demandSubmit = demandSubmitService.selectByPrimaryKey(id);
demandSubmit.setApprover(userName);
+ demandSubmit.setReason(reason);
Date appt = new Date();
demandSubmit.setApproceTime(appt);
demandSubmit.setStatus(staus);
@@ -516,4 +520,16 @@ public class DemanSubmitController {
return new PageDataResult(count,demandSubmitDTOS,page * results);
}
}
+
+ @ApiOperation(value = "获取所有的分类")
+ @PostMapping("/getclassify")
+ public List getAllclassify(){
+ List results = new ArrayList<>();
+ results.add("全部分类");
+ List getclassify = demandSubmitService.alldemandclassify();
+ for (int i = 0;i list=departmentService.findAll(number);
- Integer count = departmentService.countDepartment();
- return new PageDataResult(count,list,number.getOffset());
- }
-
- @ApiOperation(value="组织机构树结构")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "查询ID（key值）下的范围树,非必填，默认查询全部", dataType = "Integer"),
- })
- @RequestMapping(value = "/tree", method = RequestMethod.GET)
- public ResponseResult departmentTree(Integer id) {
- if (id ==null ){
- id = 1;
- }
- List commonTreeDTO = departmentService.getTreeList(id);
- return ResponseResult.success(commonTreeDTO);
- }
-
- /**
- * 新增部门
- * @param department
- * @return ResponseResult
- */
- @ApiOperation(value = "新增部门")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id",defaultValue = "记录id号（不传参）", paramType = "body", dataType = "Integer", required = false),
- @ApiImplicitParam(name = "name",defaultValue = "部门名称", paramType = "body", dataType = "String"),
- @ApiImplicitParam(name = "description",defaultValue = "部门描述", paramType = "body", dataType = "String"),
- @ApiImplicitParam(name = "organizationid",defaultValue = "组织id", paramType = "body", dataType = "Integer"),
- })
- @PostMapping("/add")
- public ResponseResult insertselect(@RequestBody Department department){
- if(department == null || StringUtils.isBlank(department.getName())){
- return ResponseResult.error("传入值不能为空！");
- }
- if(departmentService.findByID(department.getOrganizationid())==null)
- {
- return ResponseResult.error("上级部门不存在！");
- }
- department.setName(department.getName().trim());
- List dp=departmentService.findByParentID(department.getOrganizationid());
- List result1 = dp.stream()
- .filter(item -> item.getName().equals(department.getName()))
- .collect(Collectors.toList());
- if(result1.size()>0)
- {
- return ResponseResult.error("同级已存在重复名字！");
- }
- if(departmentService.insert(department)>0){
- return ResponseResult.success("新增成功！");
- }
- return ResponseResult.error("新增失败");
- }
-
- @ApiOperation(value = "删除部门")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id",defaultValue = "组织id", dataType = "Integer")
- })
- @PostMapping("/delete")
- public ResponseResult deleteById(@RequestBody Map delId){
- Integer id= delId.getOrDefault("id",null);
- if(id==null){
- return ResponseResult.error("缺少参数：id");
- }
- List dp=departmentService.findByParentID(id);
- if(dp.size()>0)
- {
- return ResponseResult.error("请先删除子部门！");
- }
- BaseAdminUser user_info=new BaseAdminUser();
- user_info.setDepartment(id);
- if(userService.findUserByCondition(user_info).size()>0)
- {
- return ResponseResult.error("请先删除部门内人员！");
- }
- if(departmentService.deleteById(id)>0){
- return ResponseResult.success("删除成功！");
- }
- return ResponseResult.error("删除失败");
- }
- @ApiOperation(value = "更新部门")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id",defaultValue = "记录id号", paramType = "body", dataType = "Integer"),
- @ApiImplicitParam(name = "name",defaultValue = "部门名称", paramType = "body", dataType = "String"),
- @ApiImplicitParam(name = "description",defaultValue = "部门描述", paramType = "body", dataType = "String"),
- @ApiImplicitParam(name = "organizationid",defaultValue = "组织id", paramType = "body", dataType = "Integer"),
- })
- @PostMapping("/update")
- public ResponseResult updateselect(@RequestBody Department department){
- if(department == null || StringUtils.isBlank(department.getName())){
- return ResponseResult.error("name 不能为空！");
- }
- departmentService.updateByPrimaryKeySelective(department);
- return new ResponseResult("更新成功");
- }
-
-// @ApiOperation(value = "部门搜索")
- @PostMapping("/search")
- @ApiImplicitParams({
- @ApiImplicitParam(name="pageNum",value = "页码",dataType = "Integer",defaultValue = "1"),
- @ApiImplicitParam(name="pageSize",value = "每页数据条数",dataType = "Integer",defaultValue = "10"),
- @ApiImplicitParam(name="keyword",value = "搜索的内容",dataType = "String",defaultValue = ""),
- })
- public PageDataResult search(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String keyword) {
-// BaseAdminUser user_info=CreateUser(userInfo);
-// return new PageDataResult(userService.countUserByCondition(user_info),
-// userService.findUserByCondition(user_info),
-// user_info.getOffset());
-
- if (pageNum == null || pageNum == 0) {
- pageNum = 1;
- }
- if (pageSize == null || pageSize == 0)
- pageSize = 10;
- int count=0;
- if(keyword==null || keyword.isEmpty())
- {
- count=departmentService.countDepartment();
- }
- else {
- count=departmentService.findByKeyWord(keyword).size();
- }
- List list=new ArrayList<>();
- PageHelper.startPage(pageNum, pageSize);
- if(keyword==null || keyword.isEmpty())
- {
- list=departmentService.getDepartmentList();
- }
- else {
- list=departmentService.findByKeyWord(keyword);
- }
- PageDataResult pdr = new PageDataResult();
- pdr.setTotals(count);
- pdr.setList(list);
- return pdr;
- }
-
-
- @RequestMapping("/selectbylimit")
- public PageDataResult selectbylimit(@RequestParam("pageSize") Integer pagesize, @RequestParam("pageNum") Integer pagenum){
- PageDataResult pdr = new PageDataResult();
- if(pagenum == null || pagenum == 0){
- pagenum =1;
- }
- if (pagesize == null || pagesize == 0)
- pagesize = 10;
- pdr.setList(departmentService.selectByLimit((pagenum - 1) * pagesize, pagesize));
- pdr.setTotals(departmentService.countDepartment());
- return pdr;
- }
-
- @RequestMapping("/selectbykey")
- public ResponseResult selsectbykey(Integer id){
- if(id == null){
- return ResponseResult.error("id为空！");
- }
- ResponseResult pdr = new ResponseResult();
- pdr.setObj(this.departmentService.selectByPrimaryKey(id));
- return pdr;
- }
-
- @RequestMapping("/deletebykey")
- public ResponseResult deletebyprimarykey(Integer id){
- if(id == null)
- return ResponseResult.error("传入值为空！");
- departmentService.deleteByPrimaryKey(id);
- return new ResponseResult("Success");
- }
-
-
-}
diff --git a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java
index ae6ffeae1b5dd9468e0ec6325fb40a5f1e75dcb2..6936ed06a4b03d363ff3224392263aa527041132 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java
@@ -1,12 +1,12 @@
package com.cetc32.dh.controller.rest;
+import com.alibaba.fastjson.JSONObject;
import com.cetc32.dh.common.response.PageDataResult;
+import com.cetc32.dh.common.response.ResponseData;
import com.cetc32.dh.common.response.ResponseResult;
import com.cetc32.dh.dto.EstimateDTO;
-import com.cetc32.dh.entity.BaseAdminUser;
import com.cetc32.dh.entity.EstimateTask;
import com.cetc32.dh.entity.vEstimate;
-import com.cetc32.dh.service.AdminUserService;
import com.cetc32.dh.service.EstimateTaskService;
import com.cetc32.dh.utils.FileUtil;
import com.cetc32.webutil.common.util.SecurityUserUtil;
@@ -38,9 +38,6 @@ public class EstimateTaskController {
@Autowired
EstimateTaskService estimateTaskService;
- @Autowired
- AdminUserService adminUserService;
-
@Value("${myPath}")
String myPath;
@@ -59,11 +56,18 @@ public class EstimateTaskController {
})
@PostMapping("/options")
public PageDataResult organizationAll(@RequestBody vEstimate vEstimate,@RequestParam(defaultValue = "0",required = false) Integer page, @RequestParam(defaultValue = "10",required = false) Integer results){
+ if(vEstimate.getName()!=null&&vEstimate.getName().contains("%")){
+ return new PageDataResult(0,new ArrayList<>(),page * results);
+ }
if((StringUtils.isBlank(vEstimate.classify)||vEstimate.classify.equals("全部分类"))&&StringUtils.isBlank(vEstimate.name)&&StringUtils.isBlank(vEstimate.astatus)&&StringUtils.isBlank(vEstimate.creator)){
List estimateTasks = estimateTaskService.findAll();
Integer count = estimateTaskService.countEstimate();
return new PageDataResult(count,estimateTasks,page * results);
- }else {
+ }else if(StringUtils.isNotBlank(vEstimate.name)&&(vEstimate.name.contains("%"))){
+ List demandlist = new ArrayList<>();
+ return new PageDataResult(0,demandlist,0);
+ }
+ else {
if(StringUtils.isNotBlank(vEstimate.getName()))
vEstimate.setName("%"+vEstimate.getName()+"%");
if(vEstimate.classify.equals("全部分类")){
@@ -93,7 +97,7 @@ public class EstimateTaskController {
@ApiImplicitParam(name="creattimefront",value = "前端传来的创建时间",paramType = "body",dataType = "String",defaultValue = ""),
@ApiImplicitParam(name="status",value = "状态",paramType = "body",dataType = "String",defaultValue = ""),
@ApiImplicitParam(name="approver",value = "审批人",paramType = "body",dataType = "String",defaultValue = ""),
- @ApiImplicitParam(name="demandid",value = "对应的需求id",paramType = "body",dataType = "Integer",defaultValue = ""),
+ @ApiImplicitParam(name="demandId",value = "对应的需求id",paramType = "body",dataType = "Integer",defaultValue = ""),
@ApiImplicitParam(name = "frontyear",value = "前端传来的时间数组",paramType = "body" ,dataType = "List",defaultValue = ""),
@ApiImplicitParam(name = "approvtime",value = "时间",paramType = "body" ,dataType = "Timestamp",defaultValue = ""),
@ApiImplicitParam(name="useid",value = "对应的用户id",paramType = "body",dataType = "Integer",defaultValue = ""),
@@ -165,9 +169,28 @@ public class EstimateTaskController {
if(id == null){
return ResponseResult.error("id为空！");
}
- ResponseResult pdr = new ResponseResult();
- pdr.setObj(this.estimateTaskService.selectByPrimaryKey(id));
- return pdr;
+ return ResponseResult.success(this.estimateTaskService.selectByPrimaryKey(id));
+ }
+
+ /***
+ * @Author xuwenyuan
+ * @Date 2021.9.7 added
+ * @Description 获取当前评估任务的反馈报告
+ * @param id 评估任务ID
+ * @return ResponseData结构的对应信息
+ * **/
+ @GetMapping("/report")
+ public ResponseData checkCurrentReprot(Integer id){
+ if(null == id || id<=0)
+ return ResponseData.error("无效的任务ID");
+ try{
+ return ResponseData.success(JSONObject.parseObject(estimateTaskService.selectByPrimaryKey(id).getReport()));
+ }catch ( NullPointerException e){
+ return ResponseData.error("指定ID： " +id +" 不存在对应评估任务");
+ }catch ( Exception e){
+ e.printStackTrace();
+ }
+ return ResponseData.error();
}
@PostMapping("/deletebykey")
@@ -205,8 +228,8 @@ public class EstimateTaskController {
@PostMapping("/gettask")
public PageDataResult getUserTask(){
- BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId());
- String name = adminUser.getSysUserName();
+ //BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId());
+ String name = SecurityUserUtil.getUser().getUsername();
PageDataResult pdr = new PageDataResult();
pdr.setTotals(estimateTaskService.countMineSubmit(name));
pdr.setList(estimateTaskService.selectMySubmit(name));
diff --git a/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java b/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java
deleted file mode 100644
index 4553915e0288c470bada071a13fd56f5fa064e1f..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.cetc32.dh.controller.rest;
-
-import com.cetc32.dh.common.response.PageDataResult;
-import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.entity.Organization;
-import com.cetc32.dh.service.OrganizationService;
-import com.github.pagehelper.PageHelper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/organization/")
-public class OrganizationController {
- @Autowired
- OrganizationService organizationService;
-
- @RequestMapping("/options")
- public PageDataResult organizationAll(){
- PageDataResult pdr = new PageDataResult();
- pdr.setTotals(organizationService.countOrganization());
- pdr.setList(organizationService.findAll());
- return pdr;
- }
-
- @RequestMapping("/insertselect")
- public ResponseResult insertselect(Organization organization){
- if(organization == null){
- return ResponseResult.error("传入值为空！");
- }
- if(organizationService.insertSelectie(organization)>0){
- return new ResponseResult("Success");
- }
- return ResponseResult.error("wrong");
- }
-
- @RequestMapping("/selectbylimit")
- public PageDataResult selectbylimit(@RequestParam("pageSize") Integer pagesize, @RequestParam("pageNum") Integer pagenum){
- PageDataResult pdr = new PageDataResult();
- if(pagenum == null || pagenum == 0){
- pagenum =1;
- }
- if (pagesize == null || pagesize == 0)
- pagesize = 10;
- pdr.setList(organizationService.selectByLimit((pagenum - 1) * pagesize, pagesize));
- pdr.setTotals(organizationService.countOrganization());
- return pdr;
- }
-
- @RequestMapping("/selectbykey")
- public ResponseResult selsectbykey(Integer id){
- if(id == null){
- return ResponseResult.error("id为空！");
- }
- ResponseResult pdr = new ResponseResult();
- pdr.setObj(this.organizationService.selectByPrimaryKey(id));
- return pdr;
- }
-
- @RequestMapping("/deletebykey")
- public ResponseResult deletebyprimarykey(Integer id){
- if(id == null)
- return ResponseResult.error("传入值为空！");
- organizationService.deleteByPrimaryKey(id);
- return new ResponseResult("Success");
- }
-
- @RequestMapping("/updateselect")
- public ResponseResult updateselect(Organization record){
- if(record == null){
- return ResponseResult.error("传入值为空！");
- }
- organizationService.updateByPrimaryKeySelective(record);
- return new ResponseResult("Success");
- }
-
- @RequestMapping("/search")
- public PageDataResult CircuitSearch(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String keyword) {
-
- PageDataResult pdr = new PageDataResult();
- if (pageNum == null || pageNum == 0) {
- pageNum = 1;
- }
- if (pageSize == null || pageSize == 0)
- pageSize = 10;
-
- pdr.setTotals(organizationService.findByKeyWord(keyword).size());
- PageHelper.startPage(pageNum, pageSize);
- pdr.setList(organizationService.findByKeyWord(keyword));
- return pdr;
- }
-}
diff --git a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java
index 23810b8023a02a2828328633ffd3f59bf2136b4b..e8db23b73ddc09f54730707d344a5c9612179e9b 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java
@@ -1,6 +1,6 @@
package com.cetc32.dh.controller.rest;
-import com.cetc32.dh.beans.DataCollected;
+import com.alibaba.fastjson.JSONObject;
import com.cetc32.dh.beans.DhOflineData;
import com.cetc32.dh.beans.ReqSubmit;
import com.cetc32.dh.beans.TraceUpload;
@@ -8,18 +8,26 @@ import com.cetc32.dh.common.response.ResponseData;
import com.cetc32.dh.common.response.ResponseResult;
import com.cetc32.dh.entity.*;
import com.cetc32.dh.service.*;
-import com.cetc32.dh.service.AdminUserService;
+import com.cetc32.dh.utils.FileUtil;
+import com.cetc32.webutil.common.annotations.LoginSkipped;
import com.cetc32.webutil.common.util.SecurityUserUtil;
+/*import com.mysql.cj.util.Base64Decoder;*/
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.lang.reflect.Method;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Base64;
import java.util.Date;
import java.util.Map;
@@ -47,18 +55,15 @@ public class OtherInterfaceController {
@Autowired
DataPlpService dataPlpService;
- @Autowired
- AdminUserService adminUserService;
-
@Value("${upLoadPath}")
String upLoadPath;
@ApiOperation(value = "生产业务需求上报")
@PostMapping("/req/submit")
- public ResponseData reqSubmit(ReqSubmit req)
+ public ResponseData reqSubmit(ReqSubmit req, MultipartFile[] file)
{
DemandSubmit submit=new DemandSubmit();
- submit.setProjectName(req.getProject());
+ //submit.setProjectName(req.getProject());
submit.setArea(req.getArea());
submit.setDepartmentid(req.getDepartment());
submit.setDemandDes(req.getDescription());
@@ -68,25 +73,14 @@ public class OtherInterfaceController {
submit.setDemandAttachment(null);
Date create = new Date();
submit.setCreattime(create);
- /*String file=req.getFile();
-
- if(!file.isEmpty())
- {
- String upCachePath=upLoadPath+"_req_submit_"+req.getUsername();
- String randomStr = UUID.randomUUID().toString();
- String oldFileName = file.getOriginalFilename();
- String newFileName = randomStr + oldFileName.substring(oldFileName.lastIndexOf("."));
- File nfile = new File(upCachePath,newFileName);
- if(!nfile.getParentFile().exists()){
- nfile.getParentFile().mkdirs();
- }
- try {
- file.transferTo(nfile);
- submit.setDemandAttachment(nfile.getAbsolutePath());
- } catch (IOException e) {
- return ResponseData.error("上报失败");
- }
- }*/
+ if(null != file){
+ String upCachePath = upLoadPath + "_"+SecurityUserUtil.getUser().getId()+"_"+System.currentTimeMillis();
+ String filepath = upCachePath;
+ String result = FileUtil.uploadFile(file, filepath);
+ if (result.contains("上传失败"))
+ return ResponseData.error(result);
+ submit.setDemandAttachment(filepath);
+ }
if(demandSubmitService.insertSelective(submit)>0)
{
return ResponseData.success("上报成功");
@@ -114,6 +108,7 @@ public class OtherInterfaceController {
}
+ @LoginSkipped
@ApiOperation(value = "生产任务状态反馈")
@PostMapping("/callback/product")
public ResponseData callbackProduct(@RequestBody Map req)
@@ -153,18 +148,30 @@ public class OtherInterfaceController {
}
@ApiOperation(value = "评估任务状态反馈")
@PostMapping("/callback/evaluation")
- public ResponseData callbackEvaluation(@RequestBody Map req)
+ public ResponseData callbackEvaluation(@RequestBody JSONObject req)
{
try {
- Integer taskid=req.get("taskid")==null?null:Integer.parseInt(req.get("taskid")) ;
- String status=req.get("status");
+ Integer taskid=req.getInteger("taskid") ;
+ String status=req.getString("status");
+ JSONObject report =req.getJSONObject("report");
if(taskid!=null && status!=null)
{
EstimateTask submit=estimateTaskService.selectByPrimaryKey(taskid);
if(submit!=null)
{
+ /*if(null !=report){
+ if(StringUtils.isBlank(submit.getTaskPath())){
+ submit.setTaskPath(upLoadPath + "_"+SecurityUserUtil.getUser().getId()+"_"+System.currentTimeMillis());
+ }
+ saveBase64File(submit.getTaskPath(),0,0,report.split("base64,"),"EstimateReports",null,null);*//*
+
+ submit.setTaskPath(filepath);
+ }*/
+
submit.setStatus(status);
+ if(null != report)
+ submit.setReport(report.toJSONString());
if(estimateTaskService.updateByPrimaryKeySelective(submit)>0)
{
return ResponseData.success("状态反馈成功");
@@ -193,6 +200,7 @@ public class OtherInterfaceController {
@ApiOperation(value = "数据获取",notes = "数据获取获取指定时间空间数据")
@GetMapping(value = "/export/ploygon")
public ResponseData DataPloygon(@RequestBody Map map) {
+ String status = "审批通过";
SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd" );
Date startTime;
Date endTime;
@@ -208,7 +216,7 @@ public class OtherInterfaceController {
{
return ResponseData.error("缺少参数 polygon ");
}
- return ResponseData.success(dataPlpService.selectPloygon(startTime,endTime,polygon));
+ return ResponseData.success(dataPlpService.selectPloygon(status,startTime,endTime,polygon));
}
@@ -236,6 +244,7 @@ public class OtherInterfaceController {
}
+ @LoginSkipped
@ApiOperation(value = "成果数据上报")
@PostMapping("/import/gain")
public ResponseData DataGain(@RequestBody DataFile dataFile) {
@@ -250,37 +259,140 @@ public class OtherInterfaceController {
@ApiOperation(value = "采集数据上报")
@PostMapping("/import/collection")
- public ResponseData DataCollection(@RequestBody DataCollected data) {
- if(data.getEventtype()==null)
- {
-
- String p=data.getPoints();
- if(null == p){
+ @LoginSkipped
+ public ResponseData DataCollection(@RequestBody DataPlpCollect data) {
+ if(data.getEventType()==null
+ && verifyEnventType(data)) {
return ResponseData.error("无法识别的数据类型");
+ }
+ if(data.getType() !=null){
+ switch ( data.getType()){
+ case "120400":case "120500":case "120600":case "120700":
+ case "130200":case "140200":case "260100":case "270100":
+ case "140502":case "270201":case "140508":case "140510":
+ case "140513": /// poionts
+ case "120800":case "140100":case "140300":case "140516":
+ case "140523":case "160200":// lines
+ case "160400":case "161103":case "220100":case "220200"://ployons
+ break;
+ default:return ResponseData.error("数据类型不在已知范围内");
}
- p= p.toUpperCase();
- if(p.startsWith("POINT"))
- {
- data.setEventtype("POINT".toLowerCase());
- }
- if(p.startsWith("LINESTRING"))
- {
- data.setEventtype("LINESTRING".toLowerCase());
+ }
+ //data.setSubmitor(SecurityUserUtil.getUser().getUsername());
+ String msg="操作成功!";
+ String filePath = upLoadPath + File.separator+"collect"//+File.separator+SecurityUserUtil.getUser().getId()
+ +File.separator+System.currentTimeMillis() ;
+ if(null != data.getPhoto()){
+ String[] base64Data = data.getPhoto();
+
+ int errFiles=0;
+ for(int i =0;i 0)
+ msg += errFiles +" 个图片文件出错！";
+ data.setFileName(filePath);
+ }
+ if(null != data.getScreenshot()){
+ String[] base64Data = data.getScreenshot();
+ int errFiles=0;
+ for(int i =0;i 0)
+ msg += errFiles +" 个截图文件出错！";
+ data.setFileName(filePath);
}
- data.setSubmitor(SecurityUserUtil.getUser().getUsername());
-
- if(dataPlpService.insertCollected(data)>0)
+ data.setStatus("未审批");
+ if(dataPlpService.insertOne(data)>0)
{
- return ResponseData.success();
+ return ResponseData.success(msg);
}
return ResponseData.error("上报失败！");
}
+
+ private int saveBase64File(String filePath, int errFiles, int i, String[] d, String inffix, Method method,DataPlpCollect obj) {
+ String dataPrix;
+ String datab;
+ if(d != null && d.length == 2){
+ dataPrix = d[0];
+ datab = d[1];
+ }else{
+ errFiles++;
+ return errFiles;
+ // return ResponseData.error("数据不合法");
+ }
+
+ String suffix = "";
+ if("data:image/jpeg;".equalsIgnoreCase(dataPrix)){//data:image/jpeg;base64,base64编码的jpeg图片数据
+ suffix = ".jpg";
+ } else if("data:image/x-icon;".equalsIgnoreCase(dataPrix)){//data:image/x-icon;base64,base64编码的icon图片数据
+ suffix = ".ico";
+ } else if("data:image/gif;".equalsIgnoreCase(dataPrix)){//data:image/gif;base64,base64编码的gif图片数据
+ suffix = ".gif";
+ } else if("data:image/png;".equalsIgnoreCase(dataPrix)){//data:image/png;base64,base64编码的png图片数据
+ suffix = ".png";
+ } else if("data:file/zip;".equalsIgnoreCase(dataPrix)){//data:image/png;base64,base64编码的png图片数据
+ suffix = ".zip";
+ }else{
+ errFiles++;
+ return errFiles;
+ //return ResponseData.error("上传图片格式不合法");
+ }
+ //获取解码器
+ Base64.Decoder decoder = Base64.getDecoder();
+ byte[] bytes = decoder.decode(datab.getBytes()); //将base64转换成字节流
+ try{
+ //使用apache提供的工具类操作流
+ if(method !=null && obj !=null)
+ method.invoke(obj,bytes);
+ if(StringUtils.isNotBlank(filePath)){
+ String tempFileName = filePath + File.separator+inffix+"_" +i+ suffix;
+ FileUtils.writeByteArrayToFile(new File(tempFileName), bytes);
+ }
+ }catch(Exception ee){
+ errFiles++;
+ //return ResponseData.error("上传失败，写入文件失败，"+ee.getMessage());
+ }
+ return errFiles;
+ }
+
+ private boolean verifyEnventType( DataPlpCollect data) {
+ String p=data.getPoints();
+ if(null == p){
+ return true;
+ }
+ p= p.toUpperCase();
+ if(p.startsWith("POINT"))
+ {
+ data.setEventType("8");
+ }
+ if(p.startsWith("LINESTRING"))
+ {
+ data.setEventType("64");;
+ }
+ if(p.startsWith("POLYGON"))
+ {
+ data.setEventType("128");
+ }
+ return false;
+ }
+
@ApiOperation(value = "离线数据上报")
@PostMapping("/import/offlinedata")
public ResponseData offlineData(@RequestBody DhOflineData data) {
diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java b/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java
index fa757575e0bbcd749f32c4ef62156740e0855597..892dfe50f518d07a32403d269240bd6d571c774e 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java
@@ -5,7 +5,6 @@ import com.cetc32.dh.common.response.ResponseResult;
import com.cetc32.dh.dto.EditJsonDTO;
import com.cetc32.dh.dto.ProductDTO;
import com.cetc32.dh.entity.*;
-import com.cetc32.dh.service.AdminUserService;
import com.cetc32.dh.service.ProductdemandService;
import com.cetc32.dh.utils.FileUtil;
import com.cetc32.webutil.common.util.SecurityUserUtil;
@@ -44,8 +43,6 @@ import java.util.*;
public class ProductDemandController {
@Autowired
ProductdemandService productdemandService;
- @Autowired
- AdminUserService adminUserService;
@Value("${myPath}")
String myPath;
@@ -67,11 +64,18 @@ public class ProductDemandController {
})
@PostMapping("/options")
public PageDataResult productsubmitAll(@RequestBody vProduct vProduct,@RequestParam(defaultValue = "0",required = false) Integer page, @RequestParam(defaultValue = "10",required = false) Integer results) {
+ if(vProduct.getName()!=null&&vProduct.getName().contains("%")){
+ return new PageDataResult(0,new ArrayList<>(),page * results);
+ }
if(StringUtils.isBlank(vProduct.classify)&&StringUtils.isBlank(vProduct.name)&&StringUtils.isBlank(vProduct.astatus)&&StringUtils.isBlank(vProduct.creator)){
List productdemands = productdemandService.findAll();
Integer count = productdemandService.countProduct();
return new PageDataResult(count,productdemands,page * results);
- }else {
+ }else if(StringUtils.isNotBlank(vProduct.name)&&(vProduct.name.contains("%"))){
+ List demandlist = new ArrayList<>();
+ return new PageDataResult(0,demandlist,0);
+ }
+ else {
if(StringUtils.isNotBlank(vProduct.getName()))
vProduct.setName("%"+vProduct.getName()+"%");
List productdemands = productdemandService.queryFilesByObj(vProduct);
@@ -111,9 +115,12 @@ public class ProductDemandController {
BeanUtils.copyProperties(productDTO,productdemand);
Integer userid = SecurityUserUtil.getUser().getId();
List regions = productDTO.getTaskdocuments();
- String region = String.join(",",regions);
- productdemand.setTaskdocument(region);
+ if(regions!=null){
+ String region = String.join(",",regions);
+ productdemand.setTaskdocument(region);
+ }
JSONObject json = productDTO.getFlow();
+ String compaiRegion = json.toJSONString();
if (StringUtils.isBlank(productdemand.getName())) {
return ResponseResult.error("传入值为空！");
}
@@ -124,11 +131,11 @@ public class ProductDemandController {
DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
Date startdate = new Date();
Date enddate = new Date();
- Date demandy = new Date();
+// Date demandy = new Date();
try {
startdate = format1.parse(starttime1);
enddate = format1.parse(endtime1);
- demandy = format1.parse(demandfront);
+// demandy = format1.parse(demandfront);
} catch (ParseException e) {
e.printStackTrace();
}
@@ -145,7 +152,7 @@ public class ProductDemandController {
productdemand.setFlowresult(flowPath+filename);
productdemand.setStarttime(startdate);
productdemand.setEndtime(enddate);
- productdemand.setDemandyear(demandy);
+// productdemand.setDemandyear(demandy);
String upCachePath = myPath + "_user" + userid;
// BaseAdminUser adminUser =adminUserService.queryById(SecurityUserUtil.getUser().getId());
String userName =SecurityUserUtil.getUser().getUsername();
@@ -196,7 +203,7 @@ public class ProductDemandController {
* @param id
* @return ResponseResult
*/
- @PostMapping("/selectbykey")
+ @GetMapping("/selectbykey")
public ResponseResult selsectbykey(Integer id) {
if (id == null) {
return ResponseResult.error("id为空！");
@@ -267,8 +274,8 @@ public class ProductDemandController {
*/
@PostMapping("/getproduct")
public PageDataResult getUserproduct() {
- BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId());
- String name = adminUser.getSysUserName();
+ //BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId());
+ String name = SecurityUserUtil.getUser().getUsername();
PageDataResult pdr = new PageDataResult();
pdr.setTotals(productdemandService.countMineSubmit(name));
pdr.setList(productdemandService.selectMySubmit(name));
diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java
index b5d0fe4f284b8dde729d88301aa76fd93b1d5b71..ef7ddfb6010f78de43741dc3b48efe79c477d674 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java
@@ -1,27 +1,18 @@
package com.cetc32.dh.controller.rest;
-
-import com.cetc32.dh.beans.LoginParameter;
-import com.cetc32.dh.beans.LoginResult;
import com.cetc32.dh.common.response.ResponseData;
import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.common.utils.DigestUtils;
-import com.cetc32.dh.common.utils.JWTUtil;
import com.cetc32.dh.entity.*;
-import com.cetc32.dh.service.AreaCommonService;
-import com.cetc32.dh.service.CityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.cetc32.dh.service.ProvinceGeomService;
+import com.cetc32.dh.mybatis.CityMapper;
import com.cetc32.dh.mybatis.ProvinceMapper;
+import com.cetc32.dh.service.CityGeomService;
+import com.cetc32.dh.service.DataFileService;
+import com.cetc32.dh.service.ProvinceGeomService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
@RestController
@RequestMapping("/rest/progeom/")
@@ -30,21 +21,30 @@ public class ProvinceGeomController {
ProvinceMapper provinceMapper;
@Autowired
ProvinceGeomService provinceGeomService;
+ @Autowired
+ CityMapper cityMapper;
+ @Autowired
+ CityGeomService cityGeomService;
+ @Autowired
+ CityMapper cityService;
+ @Autowired
+ DataFileService dataFileService;
@PostMapping("/init")
- public ResponseData init(){
+ public ResponseData init() {
List provinceList = provinceMapper.selectByDistinct();
ProvinceGeom provinceGeom = new ProvinceGeom();
- int data=0;
- for (Province province:provinceList) {
+ int data = 0;
+ for (Province province : provinceList) {
provinceGeom.setProvince(province.getProvince());
provinceGeom.setProvinceCode(province.getProvinceCode());
provinceGeomService.insertOne(provinceGeom);
data++;
}
- return ResponseData.success(200,"success",data);
+ return ResponseData.success(200, "success", data);
}
+ /*将点连接成面*/
@PostMapping("/geom")
public ResponseResult geom() {
int count = 0;
@@ -94,8 +94,99 @@ public class ProvinceGeomController {
} else {
return ResponseResult.error("更新失败");
}
+ }
+ /*
+ 判断输入的点或者面在哪些区域中包含，返回区域的名称
+ */
+ @GetMapping("/pointandpolygon")
+ public ResponseResult pointAndPolygon(String shape) {
+ Boolean jdg_point = false;
+ Boolean jdg_polygon = false;
+ shape = "POLYGON((98.5 46.5,98.7 46.5,98.7 46.7,98.5 46.7,98.5 46.5))";
+ shape = "POINT(2 2)";
+ List nameList = new ArrayList<>();
+ List provinceGeomList = provinceGeomService.selectAll();
+ for (ProvinceGeom provinceGeom : provinceGeomList) {
+ if (provinceGeom.getPolygonText() != null && shape.contains("POINT")) {
+ jdg_point = cityService.judgePointContain(shape, provinceGeom.getPolygonText());//不包含边界上的点
+ }
+ if (provinceGeom.getPolygonText() != null && shape.contains("POLYGON")) {
+ jdg_polygon = cityService.judgePolygonContain(provinceGeom.getPolygonText(), shape);
+ }
+ if (jdg_point || jdg_polygon) {
+ nameList.add(provinceGeom.getProvince());
+ }
+ }
+ return ResponseResult.success(nameList);
+ }
+
+
+
+
+
+ /**
+ * 根据地区名称areaName查询polygon
+ */
+ @PostMapping(value = "/areaTopolygon" , produces = "application/json;charset=UTF-8")
+ public ResponseResult areaToPolygon(@RequestBody Map map) {
+ String area = (String) map.get("areaNames");
+ List areaNames =Arrays.asList(area.split(","));
+// List areaNames = new ArrayList<>();
+// areaNames = (List) map.get("areaNames");s
+ Map areaPlg = null;
+ areaPlg = cityGeomService.areaToPolygon(areaNames);
+ return ResponseResult.success(areaPlg);
+ }
+
+
+ /**
+ * 根据polygons查路径
+ */
+ @PostMapping("/menuAndPgon")
+ public ResponseResult menuAndPgon(@RequestBody Map map) {
+ Integer menuId = (Integer) map.get("menuId");
+ List polygons = new ArrayList<>();
+ polygons = (List) map.get("polygons");
+ Set resultFileList = null;
+ if (menuId == 34) {
+ return ResponseResult.success(cityGeomService.menuAndPgonPlm(polygons));
+ }
+ resultFileList = cityGeomService.menuAndPgonCom(menuId,polygons);
+ return ResponseResult.success(resultFileList);
+ }
+
+ /**
+ * 根据areaNames查路径
+ */
+ @PostMapping("/menuAndArea")
+ public ResponseResult menuAndArea(@RequestBody Map map) {
+ Integer menuId = (Integer) map.get("menuId");
+ List areaNames = new ArrayList<>();
+ Set resultFileList = null;
+ areaNames = (List) map.get("areaNames");
+ Collection valueCollection = cityGeomService.areaToPolygon(areaNames).values();
+ List polygons = new ArrayList(valueCollection);
+// for (int i = 0; i
- * @auther: youqing
- * @date: 2018/11/30 11:35
- */
- @GetMapping("parentPermissionList")
- @ResponseBody
- public List parentPermissionList(){
- logger.info("获取根权限菜单列表");
- return permissionService.parentPermissionList();
- }
-
- /**
- * 功能描述:设置权限[新增或更新]
- * @param permission
- * @return: Map
- * @auther: youqing
- * @date: 2018/11/30 9:42
- */
- @PostMapping("setPermission")
- @ResponseBody
- public Map setPermission(BaseAdminPermission permission) {
- logger.info("设置权限[新增或更新]！permission:" + permission);
- Map data = new HashMap();
- if(permission.getId() == null){
- //新增权限
- data = permissionService.addPermission(permission);
- }else{
- //修改权限
- data = permissionService.updatePermission(permission);
- }
- return data;
- }
-
- /**
- * 功能描述: 删除权限菜单
- * @param id
- * @return: Map
- * @auther: youqing
- * @date: 2018/11/30 12:02
- */
- @PostMapping("del")
- @ResponseBody
- public Map del(@RequestParam("id") Long id) {
- logger.info("删除权限菜单！id:" + id);
- Map data = new HashMap<>();
- //删除服务类目类型
- data = permissionService.del(id);
- return data;
- }
-
- /**
- * 功能描述: 获取登陆用户的权限
- * @return: Map
- * @auther: youqing
- * @date: 2018/12/4 9:48
- */
- @GetMapping("getUserPerms")
- @ResponseBody
- public Map getUserPerms(){
- logger.info("获取登陆用户的权限");
- Map data = new HashMap<>();
- BaseAdminUser user = (BaseAdminUser) SecurityUtils.getSubject().getPrincipal();
- data = permissionService.getUserPerms(user);
- return data;
- }
-
-}
diff --git a/src/main/java/com/cetc32/dh/controller/system/RoleController.java b/src/main/java/com/cetc32/dh/controller/system/RoleController.java
deleted file mode 100644
index 84a41d450a92e61fcb2077486977f60dc202a992..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/controller/system/RoleController.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * @Description: 角色管理
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.controller.system;
-
-import com.cetc32.dh.service.AdminRoleService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Title: RoleController
- * @Description: 角色管理
- * @author: youqing
- * @version: 1.0
- * @date: 2018/11/21 13:43
- */
-@Controller
-@RequestMapping("role")
-public class RoleController {
- private Logger logger = LoggerFactory.getLogger(this.getClass());
-
- @Autowired
- private AdminRoleService adminRoleService;
-
- /**
- * 跳转到角色管理
- * @return String
- */
- @RequestMapping("/roleManage")
- public String toPage() {
- logger.info("进入角色管理");
- return "/role/roleManage";
- }
-
-// /**
-// * 功能描述: 获取角色列表
-// * @param pageNum
-// * @param pageSize
-// * @return: PageDataResult
-// * @auther: youqing
-// * @date: 2018/11/21 14:29
-// */
-// @RequestMapping(value = "/getRoleList", method = RequestMethod.GET)
-// @ResponseBody
-// public PageDataResult getRoleList(@RequestParam("pageNum") Integer pageNum,
-// @RequestParam("pageSize") Integer pageSize) {
-// logger.info("获取角色列表");
-// PageDataResult pdr = new PageDataResult();
-// try {
-// if(null == pageNum) {
-// pageNum = 1;
-// }
-// if(null == pageSize) {
-// pageSize = 10;
-// }
-// // 获取角色列表
-// pdr = adminRoleService.getRoleList(pageNum ,pageSize);
-// logger.info("角色列表查询=pdr:" + pdr);
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// logger.error("角色列表查询异常！", e);
-// }
-// return pdr;
-// }
-//
-// /**
-// * 功能描述: 获取角色列表
-// * @return: List
-// * @auther: youqing
-// * @date: 2018/12/3 13:22
-// */
-// @GetMapping("getRoles")
-// @ResponseBody
-// public List getRoles(){
-// logger.info("获取角色列表");
-// return adminRoleService.getRoles();
-// }
-//
-// /**
-// *述: 设置角色[新增或更新]
-// * @param role
-// * @return: Map
-// * @auther: youqing
-// * @date: 2018/12/3 10:54
-// */
-// @PostMapping("setRole")
-// @ResponseBody
-// public Map setRole(BaseAdminRole role) {
-// logger.info("设置角色[新增或更新]！role:" + role);
-// Map data = new HashMap();
-// if(role.getId() == null){
-// //新增角色
-// data = adminRoleService.addRole(role);
-// }else{
-// //修改角色
-// data = adminRoleService.updateRole(role);
-// }
-// return data;
-// }
-//
-//
-// /**
-// * 功能描述: 删除/恢复角色
-// * @param id
-// * @param status
-// * @return: Map
-// * @auther: youqing
-// * @date: 2018/11/21 16:00
-// */
-// @PostMapping("updateRoleStatus")
-// @ResponseBody
-// public Map updateRoleStatus(@RequestParam("id") int id, @RequestParam("status") Integer status) {
-// logger.info("删除/恢复角色！id:" + id+" status:"+status);
-// Map data = new HashMap<>();
-// if(status == 0){
-// //删除角色
-// data = adminRoleService.delRole(id,status);
-// }else{
-// //恢复角色
-// data = adminRoleService.recoverRole(id,status);
-// }
-// return data;
-// }
-
-}
diff --git a/src/main/java/com/cetc32/dh/controller/system/UserController.java b/src/main/java/com/cetc32/dh/controller/system/UserController.java
deleted file mode 100644
index 70069fe6468f17318faa219dbd2cf639bb4a4c56..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/controller/system/UserController.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/**
- * @Description: 用户控制
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.controller.system;
-
-import com.cetc32.dh.common.response.PageDataResult;
-import com.cetc32.dh.dto.LoginDTO;
-import com.cetc32.dh.dto.UserSearchDTO;
-import com.cetc32.dh.entity.BaseAdminUser;
-import com.cetc32.dh.service.AdminUserService;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.DisabledAccountException;
-import org.apache.shiro.authc.UnknownAccountException;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.subject.Subject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Title: UserController
- * @Description: 系统用户管理
- * @author: youqing
- * @version: 1.0
- * @date: 2018/11/20 15:17
- */
-@Controller
-@RequestMapping("user")
-public class UserController {
-
- private Logger logger = LoggerFactory.getLogger(this.getClass());
-
- @Autowired
- private AdminUserService adminUserService;
-
- /**
- * 功能描述: 登入系统
- * @param request
- * @param loginDTO
- * @param session
- * @return:Map
- * @auther: youqing
- * @date: 2018/11/22 15:47
- */
- @RequestMapping("/login")
- @ResponseBody
- public Map login(HttpServletRequest request, LoginDTO loginDTO, HttpSession session){
- logger.info("进行登陆");
- Map data = new HashMap();
- // 使用 shiro 进行登录
- Subject subject = SecurityUtils.getSubject();
- String userName = loginDTO.getUsername().trim();
- String password = loginDTO.getPassword().trim();
- String rememberMe = loginDTO.getRememberMe();
- String host = request.getRemoteAddr();
-
- //获取token
- UsernamePasswordToken token = new UsernamePasswordToken(userName, password,host);
-
- // 设置 remenmberMe 的功能
- if (rememberMe != null && rememberMe.equals("on")) {
- token.setRememberMe(true);
- }
-
- try {
- subject.login(token);
- // 登录成功
- BaseAdminUser user = (BaseAdminUser) subject.getPrincipal();
-
- session.setAttribute("user", user.getSysUserName());
- String tokens = request.getParameter("token");
- data.put("code",1);
-// data.put("url","/view/experiment/list");
- //data.put("url","/desktop");
- data.put("message","登陆成功");
- data.put("token",token);
- data.put("tokens",tokens);
-// data.put("subject",subject);
-// data.put("session",session);
- logger.info(user.getSysUserName()+"登陆成功");
- } catch (UnknownAccountException e) {
- data.put("code",0);
- data.put("message",userName+"账号不存在");
- logger.error(userName+"账号不存在");
- return data;
- }catch (DisabledAccountException e){
- data.put("code",0);
- data.put("message",userName+"账号异常");
- logger.error(userName+"账号异常");
- return data;
- }
- catch (AuthenticationException e){
- data.put("code",0);
- data.put("message",userName+"密码错误");
- logger.error(userName+"密码错误");
- return data;
- }
-
- return data;
- }
-
- /**
- * 功能描述: 修改密码
- * @param pwd
- * @param isPwd
- * @return:Map
- * @auther: youqing
- * @date: 2018/11/22 17:26
- */
- @RequestMapping("setPwd")
- @ResponseBody
- public Map setP(String pwd, String isPwd){
- logger.info("进行密码重置");
- Map data = new HashMap();
- if(!pwd.equals(isPwd)){
- data.put("code",0);
- data.put("message","两次输入的密码不一致!");
- logger.error("两次输入的密码不一致!");
- return data;
- }
- //获取当前登陆的用户信息
- BaseAdminUser user = (BaseAdminUser) SecurityUtils.getSubject().getPrincipal();
- int result = adminUserService.updatePwd(user.getSysUserName(),pwd);
- if(result == 0){
- data.put("code",0);
- data.put("msg","修改密码失败！");
- logger.error("用户修改密码失败！");
- return data;
- }
- data.put("code",1);
- data.put("msg","修改密码成功！");
- logger.info("用户修改密码成功！");
- return data;
- }
-
- /**
- * 功能描述: 跳到系统用户列表
- * @return:String
- * @auther: youqing
- * @date: 2018/11/21 13:50
- */
- @RequestMapping("/userManage")
- public String userManage() {
- return "/user/userManage";
- }
-
- /**
- * 功能描述: 分页查询用户列表
- * @param pageNum
- * @param pageSize
- * @param userSearch
- * @return:PageDataResult
- * @auther: youqing
- * @date: 2018/11/21 11:10
- */
- @RequestMapping(value = "/getUserList", method = RequestMethod.POST)
- @ResponseBody
- public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize,/*@Valid PageRequest page,*/ UserSearchDTO userSearch) {
- /*logger.info("分页查询用户列表！搜索条件：userSearch：" + userSearch + ",pageNum:" + page.getPageNum()
- + ",每页记录数量pageSize:" + page.getPageSize());*/
- PageDataResult pdr = new PageDataResult();
- try {
- if(null == pageNum) {
- pageNum = 1;
- }
- if(null == pageSize) {
- pageSize = 10;
- }
- // 获取用户列表
- pdr = adminUserService.getUserList(userSearch, pageNum ,pageSize);
- logger.info("用户列表查询=pdr:" + pdr);
-
- } catch (Exception e) {
- e.printStackTrace();
- logger.error("用户列表查询异常！", e);
- }
- return pdr;
- }
-
- /**
- * 功能描述: 新增和更新系统用户
- * @param user
- * @return:Map
- * @auther: youqing
- * @date: 2018/11/22 10:14
- */
- @RequestMapping(value = "/setUser", method = RequestMethod.POST)
- @ResponseBody
- public Map setUser(BaseAdminUser user) {
- logger.info("设置用户[新增或更新]！user:" + user);
- Map data = new HashMap();
- if(user.getId() == null){
- data = adminUserService.addUser(user);
- }else{
- data = adminUserService.updateUser(user);
- }
- return data;
- }
-
-
- /**
- * 功能描述: 删除/恢复 用户
- * @param id
- * @param status
- * @return:Map
- * @auther: youqing
- * @date: 2018/11/22 11:59
- */
- @RequestMapping(value = "/updateUserStatus", method = RequestMethod.POST)
- @ResponseBody
- public int updateUserStatus(@RequestParam("id") Integer id, @RequestParam("status") Integer status) {
- logger.info("删除/恢复用户！id:" + id+" status:"+status);
- int data=0;
- if(status == 0){
- //删除用户
- data = adminUserService.delUser(id,status);
- }
-// else{
-// //恢复用户
-//// data = adminUserService.recoverUser(id,status);
-// }
- return data;
- }
-
- /**
- * 功能描述: 根据权限查询用户列表
- * @param pageNum
- * @param pageSize
- * @param roleId
- * @return:PageDataResult
- * @auther: hubin
- * @date: 2020/10/23
- */
- @RequestMapping(value = "/getUserRole", method = RequestMethod.POST)
- @ResponseBody
- public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize,Integer roleId){
- PageDataResult pdr = new PageDataResult();
- try {
- if(null == pageNum) {
- pageNum = 1;
- }
- if(null == pageSize) {
- pageSize = 10;
- }
- // 获取用户列表
- pdr = adminUserService.getUserRole(roleId, pageNum ,pageSize);
- logger.info("用户列表查询=pdr:" + pdr);
-
- } catch (Exception e) {
- e.printStackTrace();
- logger.error("用户列表查询异常！", e);
- }
- return pdr;
- }
-
-}
diff --git a/src/main/java/com/cetc32/dh/dto/AreaCommonDTO.java b/src/main/java/com/cetc32/dh/dto/AreaCommonDTO.java
index ec4b6c06f48946853bab68239ef2f28e83fa9193..2218af4ca5c71a5cfb1a29e4d77760019b5ee783 100644
--- a/src/main/java/com/cetc32/dh/dto/AreaCommonDTO.java
+++ b/src/main/java/com/cetc32/dh/dto/AreaCommonDTO.java
@@ -1,6 +1,5 @@
package com.cetc32.dh.dto;
-import com.cetc32.dh.entity.AreaCommon;
import java.util.List;
diff --git a/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java b/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java
index 3110311bf215e56915779aa7a441f961282f504b..b4984c35f6c07b029a59ab3f02f14f6fd811b59e 100644
--- a/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java
+++ b/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java
@@ -55,6 +55,11 @@ public class DataMenuDTO implements Serializable {
*/
private Boolean addkids;
+ /**
+ * 菜单信息描述
+ */
+ private String discription;
+
/**
* 子编目节点
@@ -212,4 +217,11 @@ public class DataMenuDTO implements Serializable {
}
+ public String getDiscription() {
+ return discription;
+ }
+
+ public void setDiscription(String discription) {
+ this.discription = discription;
+ }
}
diff --git a/src/main/java/com/cetc32/dh/entity/AreaCommon.java b/src/main/java/com/cetc32/dh/entity/AreaCommon.java
deleted file mode 100644
index 0d9f222dfbb65e94565a94774a0e06b1813e5035..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/entity/AreaCommon.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.cetc32.dh.entity;
-
-import javax.persistence.*;
-
-
-@Table(name = "area_common")
-public class AreaCommon {
- public AreaCommon(){}
-
- public AreaCommon(String id,String parentId,String name,String mergerName,String shortName,String levelType,
- String cityCode,String lng,String lat,String remarks, String geom){
- this.id=id;
- this.parentId=parentId;
- this.name=name;
- this.mergerName=mergerName;
- this.shortName=shortName;
- this.levelType=levelType;
- this.cityCode=cityCode;
- this.lat=lat;
- this.lng=lng;
- this.remarks=remarks;
- this.geom=geom;
- }
-
- @Id
-// @GeneratedValue(strategy = GenerationType.IDENTITY)
- private String id;
-
- @Column(name = "parent_id")
- private String parentId;
-
- private String name;
-
- @Column(name = "merger_name")
- private String mergerName;
-
- @Column(name = "short_name")
- private String shortName;
-
- @Column(name = "level_type")
- private String levelType;
-
- @Column(name = "city_code")
- private String cityCode;
-
- private String lng;
-
- private String lat;
-
- private String remarks;
-
- private String geom;
-
- /**
- * @return id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id
- */
- public void setId(String id) {
- this.id = id == null ? null : id.trim();
- }
-
- /**
- * @return parent_id
- */
- public String getParentId() {
- return parentId;
- }
-
- /**
- * @param parentId
- */
- public void setParentId(String parentId) {
- this.parentId = parentId == null ? null : parentId.trim();
- }
-
- /**
- * @return name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name
- */
- public void setName(String name) {
- this.name = name == null ? null : name.trim();
- }
-
- /**
- * @return merger_name
- */
- public String getMergerName() {
- return mergerName;
- }
-
- /**
- * @param mergerName
- */
- public void setMergerName(String mergerName) {
- this.mergerName = mergerName == null ? null : mergerName.trim();
- }
-
- /**
- * @return short_name
- */
- public String getShortName() {
- return shortName;
- }
-
- /**
- * @param shortName
- */
- public void setShortName(String shortName) {
- this.shortName = shortName == null ? null : shortName.trim();
- }
-
- /**
- * @return level_type
- */
- public String getLevelType() {
- return levelType;
- }
-
- /**
- * @param levelType
- */
- public void setLevelType(String levelType) {
- this.levelType = levelType == null ? null : levelType.trim();
- }
-
- /**
- * @return city_code
- */
- public String getCityCode() {
- return cityCode;
- }
-
- /**
- * @param cityCode
- */
- public void setCityCode(String cityCode) {
- this.cityCode = cityCode == null ? null : cityCode.trim();
- }
-
- /**
- * @return lng
- */
- public String getLng() {
- return lng;
- }
-
- /**
- * @param lng
- */
- public void setLng(String lng) {
- this.lng = lng == null ? null : lng.trim();
- }
-
- /**
- * @return lat
- */
- public String getLat() {
- return lat;
- }
-
- /**
- * @param lat
- */
- public void setLat(String lat) {
- this.lat = lat == null ? null : lat.trim();
- }
-
- /**
- * @return remarks
- */
- public String getRemarks() {
- return remarks;
- }
-
- /**
- * @param remarks
- */
- public void setRemarks(String remarks) {
- this.remarks = remarks == null ? null : remarks.trim();
- }
-
- public String getGeom() {
- return geom;
- }
-
- public void setGeom(String geom) {
- this.geom = geom;
- }
-
- public String toString() {
- return "{" +
- "id =" + id +'\'' +
- "parentId=" + parentId +'\''+
- ", name='" + name +
- '}';
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/AreaCommonExample.java b/src/main/java/com/cetc32/dh/entity/AreaCommonExample.java
deleted file mode 100644
index d89d48f5078c32e7fae48e26aef4cc850899a9b2..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/entity/AreaCommonExample.java
+++ /dev/null
@@ -1,900 +0,0 @@
-package com.cetc32.dh.entity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AreaCommonExample {
- protected String orderByClause;
-
- protected boolean distinct;
-
- protected List oredCriteria;
-
- public AreaCommonExample() {
- oredCriteria = new ArrayList();
- }
-
- public void setOrderByClause(String orderByClause) {
- this.orderByClause = orderByClause;
- }
-
- public String getOrderByClause() {
- return orderByClause;
- }
-
- public void setDistinct(boolean distinct) {
- this.distinct = distinct;
- }
-
- public boolean isDistinct() {
- return distinct;
- }
-
- public List getOredCriteria() {
- return oredCriteria;
- }
-
- public void or(Criteria criteria) {
- oredCriteria.add(criteria);
- }
-
- public Criteria or() {
- Criteria criteria = createCriteriaInternal();
- oredCriteria.add(criteria);
- return criteria;
- }
-
- public Criteria createCriteria() {
- Criteria criteria = createCriteriaInternal();
- if (oredCriteria.size() == 0) {
- oredCriteria.add(criteria);
- }
- return criteria;
- }
-
- protected Criteria createCriteriaInternal() {
- Criteria criteria = new Criteria();
- return criteria;
- }
-
- public void clear() {
- oredCriteria.clear();
- orderByClause = null;
- distinct = false;
- }
-
- protected abstract static class GeneratedCriteria {
- protected List criteria;
-
- protected GeneratedCriteria() {
- super();
- criteria = new ArrayList();
- }
-
- public boolean isValid() {
- return criteria.size() > 0;
- }
-
- public List getAllCriteria() {
- return criteria;
- }
-
- public List getCriteria() {
- return criteria;
- }
-
- protected void addCriterion(String condition) {
- if (condition == null) {
- throw new RuntimeException("Value for condition cannot be null");
- }
- criteria.add(new Criterion(condition));
- }
-
- protected void addCriterion(String condition, Object value, String property) {
- if (value == null) {
- throw new RuntimeException("Value for " + property + " cannot be null");
- }
- criteria.add(new Criterion(condition, value));
- }
-
- protected void addCriterion(String condition, Object value1, Object value2, String property) {
- if (value1 == null || value2 == null) {
- throw new RuntimeException("Between values for " + property + " cannot be null");
- }
- criteria.add(new Criterion(condition, value1, value2));
- }
-
- public Criteria andIdIsNull() {
- addCriterion("id is null");
- return (Criteria) this;
- }
-
- public Criteria andIdIsNotNull() {
- addCriterion("id is not null");
- return (Criteria) this;
- }
-
- public Criteria andIdEqualTo(String value) {
- addCriterion("id =", value, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdNotEqualTo(String value) {
- addCriterion("id <>", value, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdGreaterThan(String value) {
- addCriterion("id >", value, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdGreaterThanOrEqualTo(String value) {
- addCriterion("id >=", value, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdLessThan(String value) {
- addCriterion("id <", value, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdLessThanOrEqualTo(String value) {
- addCriterion("id <=", value, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdLike(String value) {
- addCriterion("id like", value, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdNotLike(String value) {
- addCriterion("id not like", value, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdIn(List values) {
- addCriterion("id in", values, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdNotIn(List values) {
- addCriterion("id not in", values, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdBetween(String value1, String value2) {
- addCriterion("id between", value1, value2, "id");
- return (Criteria) this;
- }
-
- public Criteria andIdNotBetween(String value1, String value2) {
- addCriterion("id not between", value1, value2, "id");
- return (Criteria) this;
- }
-
- public Criteria andParentIdIsNull() {
- addCriterion("parent_id is null");
- return (Criteria) this;
- }
-
- public Criteria andParentIdIsNotNull() {
- addCriterion("parent_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andParentIdEqualTo(String value) {
- addCriterion("parent_id =", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdNotEqualTo(String value) {
- addCriterion("parent_id <>", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdGreaterThan(String value) {
- addCriterion("parent_id >", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdGreaterThanOrEqualTo(String value) {
- addCriterion("parent_id >=", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdLessThan(String value) {
- addCriterion("parent_id <", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdLessThanOrEqualTo(String value) {
- addCriterion("parent_id <=", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdLike(String value) {
- addCriterion("parent_id like", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdNotLike(String value) {
- addCriterion("parent_id not like", value, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdIn(List values) {
- addCriterion("parent_id in", values, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdNotIn(List values) {
- addCriterion("parent_id not in", values, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdBetween(String value1, String value2) {
- addCriterion("parent_id between", value1, value2, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andParentIdNotBetween(String value1, String value2) {
- addCriterion("parent_id not between", value1, value2, "parentId");
- return (Criteria) this;
- }
-
- public Criteria andNameIsNull() {
- addCriterion("name is null");
- return (Criteria) this;
- }
-
- public Criteria andNameIsNotNull() {
- addCriterion("name is not null");
- return (Criteria) this;
- }
-
- public Criteria andNameEqualTo(String value) {
- addCriterion("name =", value, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameNotEqualTo(String value) {
- addCriterion("name <>", value, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameGreaterThan(String value) {
- addCriterion("name >", value, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameGreaterThanOrEqualTo(String value) {
- addCriterion("name >=", value, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameLessThan(String value) {
- addCriterion("name <", value, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameLessThanOrEqualTo(String value) {
- addCriterion("name <=", value, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameLike(String value) {
- addCriterion("name like", value, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameNotLike(String value) {
- addCriterion("name not like", value, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameIn(List values) {
- addCriterion("name in", values, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameNotIn(List values) {
- addCriterion("name not in", values, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameBetween(String value1, String value2) {
- addCriterion("name between", value1, value2, "name");
- return (Criteria) this;
- }
-
- public Criteria andNameNotBetween(String value1, String value2) {
- addCriterion("name not between", value1, value2, "name");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameIsNull() {
- addCriterion("merger_name is null");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameIsNotNull() {
- addCriterion("merger_name is not null");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameEqualTo(String value) {
- addCriterion("merger_name =", value, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameNotEqualTo(String value) {
- addCriterion("merger_name <>", value, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameGreaterThan(String value) {
- addCriterion("merger_name >", value, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameGreaterThanOrEqualTo(String value) {
- addCriterion("merger_name >=", value, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameLessThan(String value) {
- addCriterion("merger_name <", value, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameLessThanOrEqualTo(String value) {
- addCriterion("merger_name <=", value, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameLike(String value) {
- addCriterion("merger_name like", value, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameNotLike(String value) {
- addCriterion("merger_name not like", value, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameIn(List values) {
- addCriterion("merger_name in", values, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameNotIn(List values) {
- addCriterion("merger_name not in", values, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameBetween(String value1, String value2) {
- addCriterion("merger_name between", value1, value2, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andMergerNameNotBetween(String value1, String value2) {
- addCriterion("merger_name not between", value1, value2, "mergerName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameIsNull() {
- addCriterion("short_name is null");
- return (Criteria) this;
- }
-
- public Criteria andShortNameIsNotNull() {
- addCriterion("short_name is not null");
- return (Criteria) this;
- }
-
- public Criteria andShortNameEqualTo(String value) {
- addCriterion("short_name =", value, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameNotEqualTo(String value) {
- addCriterion("short_name <>", value, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameGreaterThan(String value) {
- addCriterion("short_name >", value, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameGreaterThanOrEqualTo(String value) {
- addCriterion("short_name >=", value, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameLessThan(String value) {
- addCriterion("short_name <", value, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameLessThanOrEqualTo(String value) {
- addCriterion("short_name <=", value, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameLike(String value) {
- addCriterion("short_name like", value, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameNotLike(String value) {
- addCriterion("short_name not like", value, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameIn(List values) {
- addCriterion("short_name in", values, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameNotIn(List values) {
- addCriterion("short_name not in", values, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameBetween(String value1, String value2) {
- addCriterion("short_name between", value1, value2, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andShortNameNotBetween(String value1, String value2) {
- addCriterion("short_name not between", value1, value2, "shortName");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeIsNull() {
- addCriterion("level_type is null");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeIsNotNull() {
- addCriterion("level_type is not null");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeEqualTo(String value) {
- addCriterion("level_type =", value, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeNotEqualTo(String value) {
- addCriterion("level_type <>", value, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeGreaterThan(String value) {
- addCriterion("level_type >", value, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeGreaterThanOrEqualTo(String value) {
- addCriterion("level_type >=", value, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeLessThan(String value) {
- addCriterion("level_type <", value, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeLessThanOrEqualTo(String value) {
- addCriterion("level_type <=", value, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeLike(String value) {
- addCriterion("level_type like", value, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeNotLike(String value) {
- addCriterion("level_type not like", value, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeIn(List values) {
- addCriterion("level_type in", values, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeNotIn(List values) {
- addCriterion("level_type not in", values, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeBetween(String value1, String value2) {
- addCriterion("level_type between", value1, value2, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andLevelTypeNotBetween(String value1, String value2) {
- addCriterion("level_type not between", value1, value2, "levelType");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeIsNull() {
- addCriterion("city_code is null");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeIsNotNull() {
- addCriterion("city_code is not null");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeEqualTo(String value) {
- addCriterion("city_code =", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeNotEqualTo(String value) {
- addCriterion("city_code <>", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeGreaterThan(String value) {
- addCriterion("city_code >", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeGreaterThanOrEqualTo(String value) {
- addCriterion("city_code >=", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeLessThan(String value) {
- addCriterion("city_code <", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeLessThanOrEqualTo(String value) {
- addCriterion("city_code <=", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeLike(String value) {
- addCriterion("city_code like", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeNotLike(String value) {
- addCriterion("city_code not like", value, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeIn(List values) {
- addCriterion("city_code in", values, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeNotIn(List values) {
- addCriterion("city_code not in", values, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeBetween(String value1, String value2) {
- addCriterion("city_code between", value1, value2, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andCityCodeNotBetween(String value1, String value2) {
- addCriterion("city_code not between", value1, value2, "cityCode");
- return (Criteria) this;
- }
-
- public Criteria andLngIsNull() {
- addCriterion("lng is null");
- return (Criteria) this;
- }
-
- public Criteria andLngIsNotNull() {
- addCriterion("lng is not null");
- return (Criteria) this;
- }
-
- public Criteria andLngEqualTo(String value) {
- addCriterion("lng =", value, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngNotEqualTo(String value) {
- addCriterion("lng <>", value, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngGreaterThan(String value) {
- addCriterion("lng >", value, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngGreaterThanOrEqualTo(String value) {
- addCriterion("lng >=", value, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngLessThan(String value) {
- addCriterion("lng <", value, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngLessThanOrEqualTo(String value) {
- addCriterion("lng <=", value, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngLike(String value) {
- addCriterion("lng like", value, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngNotLike(String value) {
- addCriterion("lng not like", value, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngIn(List values) {
- addCriterion("lng in", values, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngNotIn(List values) {
- addCriterion("lng not in", values, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngBetween(String value1, String value2) {
- addCriterion("lng between", value1, value2, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLngNotBetween(String value1, String value2) {
- addCriterion("lng not between", value1, value2, "lng");
- return (Criteria) this;
- }
-
- public Criteria andLatIsNull() {
- addCriterion("lat is null");
- return (Criteria) this;
- }
-
- public Criteria andLatIsNotNull() {
- addCriterion("lat is not null");
- return (Criteria) this;
- }
-
- public Criteria andLatEqualTo(String value) {
- addCriterion("lat =", value, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatNotEqualTo(String value) {
- addCriterion("lat <>", value, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatGreaterThan(String value) {
- addCriterion("lat >", value, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatGreaterThanOrEqualTo(String value) {
- addCriterion("lat >=", value, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatLessThan(String value) {
- addCriterion("lat <", value, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatLessThanOrEqualTo(String value) {
- addCriterion("lat <=", value, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatLike(String value) {
- addCriterion("lat like", value, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatNotLike(String value) {
- addCriterion("lat not like", value, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatIn(List values) {
- addCriterion("lat in", values, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatNotIn(List values) {
- addCriterion("lat not in", values, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatBetween(String value1, String value2) {
- addCriterion("lat between", value1, value2, "lat");
- return (Criteria) this;
- }
-
- public Criteria andLatNotBetween(String value1, String value2) {
- addCriterion("lat not between", value1, value2, "lat");
- return (Criteria) this;
- }
-
- public Criteria andRemarksIsNull() {
- addCriterion("remarks is null");
- return (Criteria) this;
- }
-
- public Criteria andRemarksIsNotNull() {
- addCriterion("remarks is not null");
- return (Criteria) this;
- }
-
- public Criteria andRemarksEqualTo(String value) {
- addCriterion("remarks =", value, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksNotEqualTo(String value) {
- addCriterion("remarks <>", value, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksGreaterThan(String value) {
- addCriterion("remarks >", value, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksGreaterThanOrEqualTo(String value) {
- addCriterion("remarks >=", value, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksLessThan(String value) {
- addCriterion("remarks <", value, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksLessThanOrEqualTo(String value) {
- addCriterion("remarks <=", value, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksLike(String value) {
- addCriterion("remarks like", value, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksNotLike(String value) {
- addCriterion("remarks not like", value, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksIn(List values) {
- addCriterion("remarks in", values, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksNotIn(List values) {
- addCriterion("remarks not in", values, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksBetween(String value1, String value2) {
- addCriterion("remarks between", value1, value2, "remarks");
- return (Criteria) this;
- }
-
- public Criteria andRemarksNotBetween(String value1, String value2) {
- addCriterion("remarks not between", value1, value2, "remarks");
- return (Criteria) this;
- }
- }
-
- public static class Criteria extends GeneratedCriteria {
-
- protected Criteria() {
- super();
- }
- }
-
- public static class Criterion {
- private String condition;
-
- private Object value;
-
- private Object secondValue;
-
- private boolean noValue;
-
- private boolean singleValue;
-
- private boolean betweenValue;
-
- private boolean listValue;
-
- private String typeHandler;
-
- public String getCondition() {
- return condition;
- }
-
- public Object getValue() {
- return value;
- }
-
- public Object getSecondValue() {
- return secondValue;
- }
-
- public boolean isNoValue() {
- return noValue;
- }
-
- public boolean isSingleValue() {
- return singleValue;
- }
-
- public boolean isBetweenValue() {
- return betweenValue;
- }
-
- public boolean isListValue() {
- return listValue;
- }
-
- public String getTypeHandler() {
- return typeHandler;
- }
-
- protected Criterion(String condition) {
- super();
- this.condition = condition;
- this.typeHandler = null;
- this.noValue = true;
- }
-
- protected Criterion(String condition, Object value, String typeHandler) {
- super();
- this.condition = condition;
- this.value = value;
- this.typeHandler = typeHandler;
- if (value instanceof List) {
- this.listValue = true;
- } else {
- this.singleValue = true;
- }
- }
-
- protected Criterion(String condition, Object value) {
- this(condition, value, null);
- }
-
- protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
- super();
- this.condition = condition;
- this.value = value;
- this.secondValue = secondValue;
- this.typeHandler = typeHandler;
- this.betweenValue = true;
- }
-
- protected Criterion(String condition, Object value, Object secondValue) {
- this(condition, value, secondValue, null);
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminPermission.java b/src/main/java/com/cetc32/dh/entity/BaseAdminPermission.java
deleted file mode 100644
index 0e4b8427ae014a295a8ad4f2a0b2ae59f0100517..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/entity/BaseAdminPermission.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * @Description: 用户权限实体类
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-
-package com.cetc32.dh.entity;
-
-import javax.persistence.*;
-
-/**
- * @Title: BaseAdminPermission
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/21 11:19
- */
-@Table(name = "base_admin_permission")
-public class BaseAdminPermission {
-
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
- /**
- * 菜单名称
- */
- private String name;
-
- /**
- * 父菜单id
- */
- private Integer pid;
-
- /**
- * 描述
- */
- private String descpt;
-
- /**
- * 菜单url
- */
- private String url;
-
- /**
- * 添加时间
- */
- @Column(name = "create_time")
- private String createTime;
-
- /**
- * 更新时间
- */
- @Column(name = "update_time")
- private String updateTime;
-
- /**
- * 删除标志（0:删除 1：存在）
- */
- @Column(name = "del_flag")
- private Integer delFlag;
-
- /**
- * @return id
- */
- public Integer getId() {
- return id;
- }
-
- /**
- * @param id
- */
- public void setId(Integer id) {
- this.id = id;
- }
-
- /**
- * 获取菜单名称
- * @return name - 菜单名称
- */
- public String getName() {
- return name;
- }
-
- /**
- * 设置菜单名称
- * @param name 菜单名称
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * 获取父菜单id
- * @return pid - 父菜单id
- */
- public Integer getPid() {
- return pid;
- }
-
- /**
- * 设置父菜单id
- * @param pid 父菜单id
- */
- public void setPid(Integer pid) {
- this.pid = pid;
- }
-
- /**
- * 获取描述
- * @return descpt - 描述
- */
- public String getDescpt() {
- return descpt;
- }
-
- /**
- * 设置描述
- * @param descpt 描述
- */
- public void setDescpt(String descpt) {
- this.descpt = descpt;
- }
-
- /**
- * 获取菜单url
- * @return url - 菜单url
- */
- public String getUrl() {
- return url;
- }
-
- /**
- * 设置菜单url
- * @param url 菜单url
- */
- public void setUrl(String url) {
- this.url = url;
- }
-
- /**
- * 获取添加时间
- * @return create_time - 添加时间
- */
- public String getCreateTime() {
- return createTime;
- }
-
- /**
- * 设置添加时间
- * @param createTime 添加时间
- */
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
- }
-
- /**
- * 获取更新时间
- *
- * @return update_time - 更新时间
- */
- public String getUpdateTime() {
- return updateTime;
- }
-
- /**
- * 设置更新时间
- * @param updateTime 更新时间
- */
- public void setUpdateTime(String updateTime) {
- this.updateTime = updateTime;
- }
-
- /**
- * 获取删除标志（0:删除 1：存在）
- * @return del_flag - 删除标志（0:删除 1：存在）
- */
- public Integer getDelFlag() {
- return delFlag;
- }
-
- /**
- * 设置删除标志（0:删除 1：存在）
- * @param delFlag 删除标志（0:删除 1：存在）
- */
- public void setDelFlag(Integer delFlag) {
- this.delFlag = delFlag;
- }
-
- /**
- * 返回实体字符串数据
- */
- @Override
- public String toString() {
- return "BaseAdminPermission{" +
- "id=" + id +
- ", name='" + name + '\'' +
- ", pid=" + pid +
- ", descpt='" + descpt + '\'' +
- ", url='" + url + '\'' +
- ", createTime='" + createTime + '\'' +
- ", updateTime='" + updateTime + '\'' +
- ", delFlag=" + delFlag +
- '}';
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java b/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java
deleted file mode 100644
index 653c6d25c78d1978e126aff82cbad952e902d30d..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.cetc32.dh.entity;
-
-import com.cetc32.dh.common.utils.Tools;
-import org.apache.commons.collections.iterators.ArrayListIterator;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.persistence.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-
-public class BaseAdminRole extends NumberS {
-
- /**
- * 权限角色ID
- */
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
-
- public String getSystemMenu() {
- return systemMenu;
- }
-
- public void setSystemMenu(Object systemMenu) {
- if(systemMenu==null)
- {
- this.systemMenu=null;
- return;
- }
- if(systemMenu instanceof ArrayList)
- {
-
- this.systemMenu=","+ StringUtils.join( (List)systemMenu,",")+",";
-
- }
- else
- {
- this.systemMenu = (String) systemMenu;
- }
- }
-// public void setSystemMenu(List systemMenu) {
-// this.systemMenu = systemMenu!=null?","+ StringUtils.join(systemMenu,",")+",": null;
-// }
-
- /**
- * 系统菜单权限
- */
- @Column(name = "system_menu")
- private String systemMenu;
-
- /**
- * 角色描述
- */
- @Column(name = "description")
- private String description;
-
- /**
- * 是否为系统内置角色
- * 值为1，表只能改变角色名及描述，不过能修改权限，不能删除
- * 其他表示可删除和更改
- */
- @Column(name = "is_default")
- private Integer isDefault;
-
- /**
- * 角色名称
- */
- @Column(name = "role_name")
- private String roleName;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getRoleName() {
- return roleName;
- }
-
- public void setRoleName(String roleName) {
- this.roleName = roleName;
- }
-
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Integer getIsDefault() {
- return isDefault;
- }
-
- public void setIsDefault(Integer isDefault) {
- this.isDefault = isDefault;
- }
-}
diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java
deleted file mode 100644
index c69dd9ac363e09ca320440540d2e02f2a6cf53f0..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/**
- * @Description: 用户管理实体
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.entity;
-
-import com.google.inject.internal.util.$ToStringBuilder;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Repository;
-import javax.persistence.*;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.cetc32.dh.common.utils.Tools.*;
-
-/**
- * @Title: BaseAdminUser
- * @Description: 用户管理
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/21 13:43
- */
-@Repository
-@Table(name = "base_admin_user")
-public class BaseAdminUser extends NumberS {
- /**
- * ID
- */
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Integer id;
-
- /**
- * 系统用户名称
- */
- @Column(name = "sys_user_name")
- private String sysUserName;
-
- /**
- * 系统用户密码
- */
- @Column(name = "sys_user_pwd")
- private String sysUserPwd;
-
- /**
- * 角色
- */
- @Column(name = "role_id")
- private String roleId;
-
- /**
- * 手机号
- */
- @Column(name = "user_phone")
- private String userPhone;
-
- /**
- * 登记时间
- */
- @Column(name = "reg_time")
- private Date regTime;
-
- /**
- * 状态（0：无效；1：有效）
- */
- @Column(name = "user_status")
- private Integer userStatus;
-
- /**
- * 区域代码
- */
- @Column(name = "areacode")
- private String areacode;
-
- /**
- * 部门
- */
- @Column(name = "department")
- private String department;
-
- /**
- * 密级
- */
- @Column(name = "security")
- private Integer security;
-
- /**
- * 失败次数
- * **/
- @Column(name = "loginfailed")
- private Integer loginFailed;
-
- /**
- * 网页登陆时间
- * **/
- @Column(name = "web_login_time")
- private Date webLoginDate;
-
- /**
- * 网页登陆状态
- * **/
- @Column(name = "web_login_status")
- private Integer webLoginStatus;
-
- /**
- * 网页登陆次数
- * **/
- @Column(name = "web_login_count")
- private Integer webLoginCount;
-
- /**
- * app登陆时间
- * **/
- @Column(name = "app_login_time")
- private Date appLoginDate;
-
- /**
- * app登陆状态
- * **/
- @Column(name = "app_login_status")
- private Integer appLoginStatus;
-
- /**
- * app登陆次数
- * **/
- @Column(name = "app_login_count")
- private Integer appLoginCount;
-
- public Integer getLoginFailed() {
- return loginFailed;
- }
-
- public void setLoginFailed(Integer loginFailed) {
- this.loginFailed = loginFailed;
- }
-
- public Date getWebLoginDate() {
- return webLoginDate;
- }
-
- public void setWebLoginDate(Date webLoginDate) {
- this.webLoginDate = webLoginDate;
- }
-
- public Integer getWebLoginStatus() {
- return webLoginStatus;
- }
-
- public void setWebLoginStatus(Integer webLoginStatus) {
- this.webLoginStatus = webLoginStatus;
- }
-
- public Integer getWebLoginCount() {
- return webLoginCount;
- }
-
- public void setWebLoginCount(Integer webLoginCount) {
- this.webLoginCount = webLoginCount;
- }
-
- public Date getAppLoginDate() {
- return appLoginDate;
- }
-
- public void setAppLoginDate(Date appLoginDate) {
- this.appLoginDate = appLoginDate;
- }
-
- public Integer getAppLoginStatus() {
- return appLoginStatus;
- }
-
- public void setAppLoginStatus(Integer appLoginStatus) {
- this.appLoginStatus = appLoginStatus;
- }
-
- public Integer getAppLoginCount() {
- return appLoginCount;
- }
-
- public void setAppLoginCount(Integer appLoginCount) {
- this.appLoginCount = appLoginCount;
- }
-
- /**
- * 获取ID
- * @return id - ID
- */
- public Integer getId() {
- return id;
- }
-
- /**
- * 设置ID
- * @param id ID
- */
- public void setId(Integer id) {
- this.id = id;
- }
-
- /**
- * 获取系统用户名称
- * @return sys_user_name - 系统用户名称
- */
- public String getSysUserName() {
- return sysUserName;
- }
-
- /**
- * 设置系统用户名称
- * @param sysUserName 系统用户名称
- */
- public void setSysUserName(String sysUserName) {
- this.sysUserName = sysUserName;
- }
-
- /**
- * 获取系统用户密码
- * @return sys_user_pwd - 系统用户密码
- */
- public String getSysUserPwd() {
- return sysUserPwd;
- }
-
- /**
- * 设置系统用户密码
- * @param sysUserPwd 系统用户密码
- */
- public void setSysUserPwd(String sysUserPwd) {
- this.sysUserPwd = sysUserPwd;
- }
-
- /**
- * 获取角色
- * @return role_id - 角色
- */
- public String getRoleId() {
- return roleId;
- }
-
- /**
- * 设置角色
- * @param roleId 角色
- */
-// public void setRoleId(String roleId) {
-// this.roleId = roleId!=null?","+roleId+",":null;
-// }
-// public void setRoleId(List roleId) {
-// this.roleId = roleId!=null?","+StringUtils.join(roleId,",")+",": null;
-// }
- public void setRoleId(Object roleId)
- {
- if(roleId==null)
- {
- this.roleId=null;
- return;
- }
-
- List list=new ArrayList<>();
- //if(roleId.getClass() == List.class)
- if( roleId instanceof List){
- list = (List)roleId;
- }
- else if(roleId instanceof Integer)
- {
- list.add((Integer) roleId);
- }
- else if(roleId instanceof String)
- {
- if(isNumber((String) roleId))
- {
- list.add(Integer.parseInt((String) roleId));
- }
- else
- {
- String roles=(String)roleId;
- if(roles.startsWith(",") && roles.endsWith(","))
- {
- this.roleId=roles;
- return;
- }
- }
- }
- else
- {
- list=null;
- }
-
- if(String.valueOf(roleId).equals("-1"))
- {
- list=null;
- }
-
- if(list==null || list.size()==0)
- {
- this.roleId=null;
- }
- else
- {
- list=SortAndRemoveRepeat(list,Integer.class);
- this.roleId=","+StringUtils.join(list,",")+",";
- }
-
- }
-
- public List getRoleIdList()
- {
- return str2intList(roleId);
- }
- /**
- * 获取手机号
- * @return user_phone - 手机号
- */
- public String getUserPhone() {
- return userPhone;
- }
-
- /**
- * 设置手机号
- * @param userPhone 手机号
- */
- public void setUserPhone(String userPhone) {
- this.userPhone = userPhone;
- }
-
- /**
- * 获取登记时间
- * @return reg_time - 登记时间
- */
- public Date getRegTime() {
- return regTime;
- }
-
- /**
- * 设置登记时间
- * @param regTime 登记时间
- */
- public void setRegTime(Date regTime) {
- this.regTime = regTime;
- }
-
- /**
- * 获取状态（0：无效；1：有效）
- * @return user_status - 状态（0：无效；1：有效）
- */
- public Integer getUserStatus() {
- return userStatus;
- }
-
- /**
- * 设置状态（0：无效；1：有效）
- * @param userStatus 状态（-1：未审核；1：有效）
- */
- public void setUserStatus(Integer userStatus) {
- this.userStatus = userStatus;
- }
-
- public String getAreacode() {
- return areacode;
- }
- public List getAreaCodeList()
- {
- return str2StringList(areacode);
- }
-
- public void setAreacode(Object areacode) {
- if(areacode==null)
- {
- this.areacode=null;
- return;
- }
- List list=new ArrayList<>();
-
- if(areacode instanceof List)
- {
- list = (List)areacode;
- }
- else if(areacode instanceof String)
- {
- String db_str=(String)areacode;
- if(db_str.startsWith(",") && db_str.endsWith(","))
- {
- this.areacode=db_str;
- return;
- }
- list.add((String) areacode);
- }
- else if(areacode instanceof Integer)
- {
- list.add(String.valueOf(areacode));
- }
- else
- {
- list=null;
- }
-
- if(String.valueOf(areacode).equals("-1"))
- {
- list=null;
- }
-
- if(list==null || list.size()==0)
- {
- this.areacode=null;
- }
- else
- {
- list=SortAndRemoveRepeat(list,String.class);
- this.areacode=","+StringUtils.join(list,",")+",";
- }
- }
-
- public String getDepartment() {
- return department;
- }
- public List getDepartmentList()
- {
- return str2intList(department);
- }
- public void setDepartment(Object department) {
- if(department==null)
- {
- this.department=null;
- return;
- }
- List list=new ArrayList<>();
-
- if(department instanceof List)
- {
- list = (List)department;
- }
- else if(department instanceof String)
- {
- if(isNumber((String) department))
- {
- list.add(Integer.parseInt((String) department));
- }
- else
- {
- String db_str=(String)department;
- if(db_str.startsWith(",") && db_str.endsWith(","))
- {
- this.department=db_str;
- return;
- }
- }
-
- }
- else if(department instanceof Integer)
- {
- list.add((Integer)department);
- }
- else
- {
- list=null;
- }
-
- if(String.valueOf(department).equals("-1"))
- {
- list=null;
- }
-
- if(list==null || list.size()==0)
- {
- this.department=null;
- }
- else
- {
- list=SortAndRemoveRepeat(list,Integer.class);
- this.department=","+StringUtils.join(list,",")+",";
- }
- }
-
- public Integer getSecurity() {
- return security;
- }
-
- public void setSecurity(Integer security) {
- this.security = security;
- }
-
-
- /**
- * 实体类转换成字符串
- */
- @Override
- public String toString() {
- return "BaseAdminUser{" +
- "id=" + id +
- ", sysUserName='" + sysUserName + '\'' +
- ", sysUserPwd='" + sysUserPwd + '\'' +
- ", roleId=" + roleId +
- ", userPhone='" + userPhone + '\'' +
- ", regTime='" + regTime + '\'' +
- ", userStatus=" + userStatus +
- ", areacode='" + areacode +'\'' +
- ", department=" + department +
- ", security=" + security +
- '}';
- }
-}
diff --git a/src/main/java/com/cetc32/dh/entity/CityGeom.java b/src/main/java/com/cetc32/dh/entity/CityGeom.java
new file mode 100644
index 0000000000000000000000000000000000000000..714a0ea8453b0991f48470845b4731e4f3edd0a6
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/entity/CityGeom.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/15 下午2:07
+ ******************************************************************************/
+package com.cetc32.dh.entity;
+
+import com.cetc32.dh.common.TreeNode;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "city_geom")
+public class CityGeom implements TreeNode {
+
+ private String city;
+
+ @Id
+ @Column(name = "city_code")
+ private String cityCode;
+
+ @Column( name ="province_code")
+ private String provinceCode;
+
+ @Column( name ="province")
+ private String province;
+
+ @Column( name ="polygon_text")
+ private String polygonText;
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getCityCode() {
+ return cityCode;
+ }
+
+ public void setCityCode(String city_code) {
+ this.cityCode = city_code;
+ }
+
+ public String getProvinceCode() {
+ return provinceCode;
+ }
+
+ public void setProvinceCode(String province_code) {
+ this.provinceCode = province_code;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getPolygonText() {
+ return polygonText;
+ }
+
+ public void setPolygonText(String polygon_text) {
+ this.polygonText = polygon_text;
+ }
+
+ @Override
+ public String getKey() {
+ return cityCode;
+ }
+
+ @Override
+ public String getValue() {
+ return city;
+ }
+
+ @Override
+ public String getTitle() {
+ return city;
+ }
+
+ @Override
+ public String getParentKey() {
+ return provinceCode;
+ }
+}
diff --git a/src/main/java/com/cetc32/dh/entity/DataFile.java b/src/main/java/com/cetc32/dh/entity/DataFile.java
index d898c5c1aabb7c60134feea1033e4c2d2dad442e..741ee8034f7d0797868484285ce3ceb2ccc7513e 100644
--- a/src/main/java/com/cetc32/dh/entity/DataFile.java
+++ b/src/main/java/com/cetc32/dh/entity/DataFile.java
@@ -40,8 +40,7 @@ public class DataFile extends NumberS {
/**
* 数据安全等级，文件(夹)安全等级
*/
- @Column(name = "file_security")
- private String fileSecurity;
+ private Integer security;
/**
* 数据路径，文件(夹)存放路径
@@ -191,68 +190,45 @@ public class DataFile extends NumberS {
private String td_end;
/**
- * 无参构造函数
+ * 图片样本路径
*/
- public DataFile() {
- }
+ @Column(name= "img_example")
+ private String imgExample;
/**
- * @param id
- * @param fileName
- * @param area
- * @param fileSecurity
- * @param filePath
- * @param createTime
- * @param region
- * @param fileTime
- * @param gcs
- * @param lan
- * @param lon
- * @param catagory
- * @param scale
- * @param scanLevel
- * @param status
- * @param menuId
- * @param fileConfig
- * @param approveTime
- * @param userId
- * @param submitor
- * @param approver 有参构造函数
- */
- public DataFile(Long id, String fileName, String area, String fileSecurity, String filePath, Date createTime, String region, java.sql.Date fileTime, Long fileSize,
- Integer fileNumbers, String fileDiscription, String submitor, String approver, String gcs, Integer scanLevel, String scale, String lan, String lon,
- String catagory, String status, Integer menuId, String fileConfig, Date approveTime, Integer userId, List regionList, String startTime,
- String endTime, String[] timeRange, String td_end, String td_start) {
- this.id = id;
- this.fileName = fileName;
- this.area = area;
- this.fileSecurity = fileSecurity;
- this.createTime = createTime;
- this.filePath = filePath;
- this.region = region;
- this.fileTime = fileTime;
- this.fileSize = fileSize;
- this.fileNumbers = fileNumbers;
- this.fileDiscription = fileDiscription;
- this.submitor = submitor;
- this.approver = approver;
- this.gcs = gcs;
- this.scale = scale;
- this.scanLevel = scanLevel;
- this.lan = lan;
- this.lon = lon;
- this.catagory = catagory;
- this.status = status;
- this.menuId = menuId;
- this.fileConfig = fileConfig;
- this.approveTime = approveTime;
- this.userId = userId;
- this.regionList = regionList;
- this.startTime = startTime;
- this.endTime = endTime;
- this.timeRange = timeRange;
- this.td_end = td_end;
- this.td_start = td_start;
+ * 数据所有权单位
+ */
+ @Column(name= "owner_unit")
+ private String ownerUnit;
+
+ /**
+ * 数据出版单位
+ */
+ @Column(name= "pub_unit")
+ private String pubUnit;
+
+ /**
+ * 数据出版日期
+ */
+ @Column(name= "pub_time")
+ private java.sql.Date pubTime;
+
+ /**
+ * 参照图式编号
+ */
+ @Column(name= "ref_imgnum")
+ private String refImgnum;
+
+ /**
+ * 参照要素分类编码编号
+ */
+ @Column(name= "ref_codenum")
+ private String refCodenum;
+
+ /**
+ * 无参构造函数
+ */
+ public DataFile() {
}
/**
@@ -385,19 +361,19 @@ public class DataFile extends NumberS {
/**
* 获取数据安全等级，文件(夹)安全等级
*
- * @return file_security - 数据安全等级，文件(夹)安全等级
+ * @return security - 数据安全等级，文件(夹)安全等级
*/
- public String getFileSecurity() {
- return fileSecurity;
+ public Integer getSecurity() {
+ return security;
}
/**
* 设置数据安全等级，文件(夹)安全等级
*
- * @param fileSecurity 数据安全等级，文件(夹)安全等级
+ * @param security 数据安全等级，文件(夹)安全等级
*/
- public void setFileSecurity(String fileSecurity) {
- this.fileSecurity = fileSecurity == null ? null : fileSecurity.trim();
+ public void setSecurity(Integer security) {
+ this.security = security;
}
/**
@@ -819,8 +795,113 @@ public class DataFile extends NumberS {
this.timeRange = timeRange;
}
+ /**
+ * 获取图片样本路径（名称）
+ * @return imgExample
+ */
+ public String getImgExample() {
+ return imgExample;
+ }
/**
+ * 设置图片样本路径
+ * @param imgExample
+ */
+ public void setImgExample(String imgExample) {
+ this.imgExample = imgExample;
+ }
+
+ /**
+ * 获取数据所有权单位
+ * @return ownerUnit
+ */
+ public String getOwnerUnit() {
+ return ownerUnit;
+ }
+
+ /**
+ * 设置数据所有权单位
+ * @param ownerUnit
+ */
+ public void setOwnerUnit(String ownerUnit) {
+ this.ownerUnit = ownerUnit;
+ }
+
+ /**
+ * 获取数据出版单位
+ * @return pubUnit
+ */
+ public String getPubUnit() {
+ return pubUnit;
+ }
+
+ /**
+ * 设置数据出版单位
+ * @param pubUnit
+ */
+ public void setPubUnit(String pubUnit) {
+ this.pubUnit = pubUnit;
+ }
+
+ /**
+ * 获取数据出版日期
+ * @return pubTime
+ */
+ public Date getPubTime() {
+ return pubTime;
+ }
+
+ /**
+ * 设置数据出版日期
+ * @param pubTime
+ */
+ public void setPubTime(String pubTime) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ java.util.Date d = null;
+ try {
+ d = format.parse(pubTime);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ java.sql.Date date = new java.sql.Date(d.getTime());
+ this.pubTime = date;
+ }
+
+ /**
+ * 获取参照图式编号
+ * @return refImgnum
+ */
+ public String getRefImgnum() {
+ return refImgnum;
+ }
+
+ /**
+ * 设置参照图式编号
+ * @param refImgnum
+ */
+ public void setRefImgnum(String refImgnum) {
+ this.refImgnum = refImgnum;
+ }
+
+ /**
+ * 获取参照要素分类编码编号
+ * @return refCodenum
+ */
+ public String getRefCodenum() {
+ return refCodenum;
+ }
+
+ /**
+ * 设置参照要素分类编码编号
+ * @param refCodenum
+ */
+ public void setRefCodenum(String refCodenum) {
+ this.refCodenum = refCodenum;
+ }
+
+
+
+ /**
* 返回文件实体类的字符串形式
*/
public String toString() {
@@ -828,7 +909,7 @@ public class DataFile extends NumberS {
"menuId=" + menuId + '\'' +
"fileName=" + fileName + '\'' +
", area='" + area + '\'' +
- ", fileSecurity=" + fileSecurity + '\'' +
+ ", security=" + security + '\'' +
", filePath=" + filePath + '\'' +
", createTime=" + createTime + '\'' +
", region=" + region + '\'' +
diff --git a/src/main/java/com/cetc32/dh/entity/DataPlp.java b/src/main/java/com/cetc32/dh/entity/DataPlp.java
index 77b7079448bbfbc309d109e507cb36c523dfd2fa..31e619dc446155d174e4cb1712127ff1fcdcfbb3 100644
--- a/src/main/java/com/cetc32/dh/entity/DataPlp.java
+++ b/src/main/java/com/cetc32/dh/entity/DataPlp.java
@@ -63,7 +63,7 @@ public class DataPlp extends NumberS {
/**
* 预留字段2
*/
- private String reserver2;
+ private String cityName;
/**
* 唯一标识
@@ -73,7 +73,7 @@ public class DataPlp extends NumberS {
/**
* 数据安全等级
*/
- private String security;
+ private Integer security;
/**
* 审批人
@@ -114,7 +114,11 @@ public class DataPlp extends NumberS {
*/
@Column(name = "photo_byte")
private byte[] photoByte;
-
+ /**
+ * 照片流
+ */
+ @Column(name = "screen_shot")
+ private byte[] shot;
/**
* 提交者
*/
@@ -146,6 +150,72 @@ public class DataPlp extends NumberS {
*/
private String td_end;
+ /***/
+ private String eventName;
+ private String operateState;
+
+ private String type;
+ private String uploadTime;
+ private String reserve1;
+ private String reserve2;
+ private String reserve3;
+
+ public String getUploadTime() {
+ return uploadTime;
+ }
+
+ public void setUploadTime(String uploadTime) {
+ this.uploadTime = uploadTime;
+ }
+
+ public String getReserve1() {
+ return reserve1;
+ }
+
+ public void setReserve1(String reserve1) {
+ this.reserve1 = reserve1;
+ }
+
+ public String getReserve2() {
+ return reserve2;
+ }
+
+ public void setReserve2(String reserve2) {
+ this.reserve2 = reserve2;
+ }
+
+ public String getReserve3() {
+ return reserve3;
+ }
+
+ public void setReserve3(String reserve3) {
+ this.reserve3 = reserve3;
+ }
+
+ public String getEventName() {
+ return eventName;
+ }
+
+ public void setEventName(String eventName) {
+ this.eventName = eventName;
+ }
+
+ public String getOperateState() {
+ return operateState;
+ }
+
+ public void setOperateState(String operateType) {
+ this.operateState = operateType;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+;
/**
* 无参构造函数
*/
@@ -166,15 +236,15 @@ public class DataPlp extends NumberS {
* @param points
* @param approver
* @param menuId
- * @param reserver2
+ * @param cityName
* @param userId
* @param security
* @param description
* @param submitor 有参构造函数
*/
- public DataPlp(Integer id, String fileName, String eventType, String security, Date createTime, String region, String fileTime,
+ public DataPlp(Integer id, String fileName, String eventType, Integer security, Date createTime, String region, String fileTime,
String description, Integer userId, String approver, String status, String fileConfig, Date approveTime,
- String points, Integer menuId, String reserver2, byte[] photoByte, String submitor, String[] timeRange, String td_start, String td_end) {
+ String points, Integer menuId, String cityName, byte[] photoByte, String submitor, String[] timeRange, String td_start, String td_end) {
this.id = id;
this.fileName = fileName;
this.eventType = eventType;
@@ -191,7 +261,7 @@ public class DataPlp extends NumberS {
this.photoByte = photoByte;
this.points = points;
this.menuId = menuId;
- this.reserver2 = reserver2;
+ this.cityName = cityName;
this.submitor = submitor;
this.timeRange = timeRange;
this.td_end = td_end;
@@ -396,6 +466,9 @@ public class DataPlp extends NumberS {
this.description = description == null ? null : description.trim();
}
+ public void setDescribe(String dse){
+ this.description =dse;
+ }
/**
* 编目id
*
@@ -417,19 +490,19 @@ public class DataPlp extends NumberS {
/**
* 获取预留字段2
*
- * @return reserver2 - 预留字段2
+ * @return cityName - 预留字段2
*/
- public String getReserver2() {
- return reserver2;
+ public String getCityName() {
+ return cityName;
}
/**
* 设置预留字段2
*
- * @param reserver2 预留字段2
+ * @param cityName 预留字段2
*/
- public void setReserver2(String reserver2) {
- this.reserver2 = reserver2 == null ? null : reserver2.trim();
+ public void setCityName(String cityName) {
+ this.cityName = cityName == null ? null : cityName.trim();
}
/**
@@ -455,7 +528,7 @@ public class DataPlp extends NumberS {
*
* @return security - 数据安全等级
*/
- public String getSecurity() {
+ public Integer getSecurity() {
return security;
}
@@ -464,8 +537,8 @@ public class DataPlp extends NumberS {
*
* @param security 数据安全等级
*/
- public void setSecurity(String security) {
- this.security = security == null ? null : security.trim();
+ public void setSecurity(Integer security) {
+ this.security = security;
}
/**
@@ -612,5 +685,11 @@ public class DataPlp extends NumberS {
this.submitor = submitor == null ? null : submitor.trim();
}
+ public byte[] getShot() {
+ return shot;
+ }
+ public void setShot(byte[] shot) {
+ this.shot = shot;
+ }
}
diff --git a/src/main/java/com/cetc32/dh/entity/DataPlpCollect.java b/src/main/java/com/cetc32/dh/entity/DataPlpCollect.java
new file mode 100644
index 0000000000000000000000000000000000000000..be3c510825137b6c7f009df27423ccc97a6deeca
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/entity/DataPlpCollect.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/8/25 下午3:46
+ ******************************************************************************/
+package com.cetc32.dh.entity;
+
+public class DataPlpCollect extends DataPlp{
+ private String screenshot[];
+ private String photos[];
+
+ public String[] getScreenshot() {
+ return screenshot;
+ }
+
+ public void setScreenshot(String... screenshot) {
+ if(null == screenshot || screenshot.length ==0)
+ this.screenshot = null;
+ this.screenshot = screenshot;
+ }
+
+ public String[] getPhoto() {
+ return photos;
+ }
+
+ public void setPhoto(String... photos) {
+ if( photos ==null || photos.length==0) this.photos=null;
+ else this.photos = photos;
+ }
+}
diff --git a/src/main/java/com/cetc32/dh/entity/DataTrace.java b/src/main/java/com/cetc32/dh/entity/DataTrace.java
index f499d50ed54d89cf15bcf7f29d12d509fde6da21..acad71a67dd030961ae32ee0420f063efff2d250 100644
--- a/src/main/java/com/cetc32/dh/entity/DataTrace.java
+++ b/src/main/java/com/cetc32/dh/entity/DataTrace.java
@@ -58,7 +58,7 @@ public class DataTrace extends NumberS {
* @param menuId
* 有参构造函数
*/
- public DataTrace(Integer id, String security, Date createTime, String fileTime, String description, Integer userId, String approver, String status,
+ public DataTrace(Integer id, Integer security, Date createTime, String fileTime, String description, Integer userId, String approver, String status,
String fileConfig, Date approveTime, String lat, String lon, Integer speed, Integer direction, Integer locsource, Integer coordinateerror,
String deviceid, Integer encrylongitude, Integer enccrylatitude, Boolean flag, String points, String linkid, String submitor, Date startTime,
Date endTime, String filePath, String fileSize, String fileName, Integer menuId, String td_start, String td_end) {
@@ -260,7 +260,7 @@ public class DataTrace extends NumberS {
/**
* 安全等级
*/
- private String security;
+ private Integer security;
/**
* 提交用户姓名
@@ -751,7 +751,7 @@ public class DataTrace extends NumberS {
*
* @return security - 安全等级
*/
- public String getSecurity() {
+ public Integer getSecurity() {
return security;
}
@@ -760,8 +760,8 @@ public class DataTrace extends NumberS {
*
* @param security 安全等级
*/
- public void setSecurity(String security) {
- this.security = security == null ? null : security.trim();
+ public void setSecurity(Integer security) {
+ this.security = security;
}
/**
diff --git a/src/main/java/com/cetc32/dh/entity/DemandSubmit.java b/src/main/java/com/cetc32/dh/entity/DemandSubmit.java
index 3a4bb3179c31827f3644b3c3ce6efb48d8d45805..38f6b295344fa7ab36da4d682ac8b5939b0486c9 100644
--- a/src/main/java/com/cetc32/dh/entity/DemandSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DemandSubmit.java
@@ -61,6 +61,16 @@ public class DemandSubmit extends NumberS{
private String areaname;
+ private String reason;
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
public Integer getId() {
return id;
}
diff --git a/src/main/java/com/cetc32/dh/entity/Department.java b/src/main/java/com/cetc32/dh/entity/Department.java
deleted file mode 100644
index dd56904c1e2cdf0ae27b9298601bb9afee9e23cd..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/entity/Department.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.cetc32.dh.entity;
-
-public class Department extends NumberS{
- private Integer id;
-
- private String name;
-
- private String description;
-
- private Integer organizationid;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Integer getOrganizationid(){return organizationid;}
-
- public void setOrganizationid(Integer organizationid1){this.organizationid=organizationid1;}
-}
diff --git a/src/main/java/com/cetc32/dh/entity/EstimateTask.java b/src/main/java/com/cetc32/dh/entity/EstimateTask.java
index c442787a6d116e67f4327e25494122bf4430931e..4e28b97845d496581dd55d220bb0b1af6c582418 100644
--- a/src/main/java/com/cetc32/dh/entity/EstimateTask.java
+++ b/src/main/java/com/cetc32/dh/entity/EstimateTask.java
@@ -32,12 +32,27 @@ public class EstimateTask extends NumberS{
private String approver;
- private Integer demandid;
+ private Integer demandId;
private List frontyear;
private Date approvtime;
+ private String report;
+ private String reason;
+
+ private String taskdes;
+
+ private Date changetime;
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
public Integer getId() {
return id;
}
@@ -126,12 +141,12 @@ public class EstimateTask extends NumberS{
this.approver = approver;
}
- public Integer getDemandid() {
- return demandid;
+ public Integer getDemandId() {
+ return demandId;
}
- public void setDemandid(Integer demandid) {
- this.demandid = demandid;
+ public void setDemandId(Integer demandId) {
+ this.demandId = demandId;
}
public String getStarttimefront() {
@@ -173,4 +188,28 @@ public class EstimateTask extends NumberS{
public void setApprovtime(Date approvtime) {
this.approvtime = approvtime;
}
-}
\ No newline at end of file
+
+ public String getReport() {
+ return report;
+ }
+
+ public void setReport(String report) {
+ this.report = report;
+ }
+
+ public String getTaskdes() {
+ return taskdes;
+ }
+
+ public void setTaskdes(String taskdes) {
+ this.taskdes = taskdes;
+ }
+
+ public Date getChanggetime() {
+ return changetime;
+ }
+
+ public void setChanggetime(Date changgetime) {
+ this.changetime = changgetime;
+ }
+}
diff --git a/src/main/java/com/cetc32/dh/entity/NumberS.java b/src/main/java/com/cetc32/dh/entity/NumberS.java
index 663b2e24ec7ef1fcd359be605b2029270a23b15f..eb075b363982829959c1973004006090f21fc6cc 100644
--- a/src/main/java/com/cetc32/dh/entity/NumberS.java
+++ b/src/main/java/com/cetc32/dh/entity/NumberS.java
@@ -53,4 +53,5 @@ public class NumberS {
}
+
}
diff --git a/src/main/java/com/cetc32/dh/entity/Organization.java b/src/main/java/com/cetc32/dh/entity/Organization.java
deleted file mode 100644
index 0edf636dc6690c108e2056c8a6d2a48f6534d5c8..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/entity/Organization.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.cetc32.dh.entity;
-
-public class Organization extends NumberS{
- private Integer id;
-
- private String name;
-
- private String description;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/Productdemand.java b/src/main/java/com/cetc32/dh/entity/Productdemand.java
index cbd799ca4e6606dd0ea015cdb8e8ea0e10bc55f4..48dbd0afd6fc951124df79b0eb9232e5caa5cc7e 100644
--- a/src/main/java/com/cetc32/dh/entity/Productdemand.java
+++ b/src/main/java/com/cetc32/dh/entity/Productdemand.java
@@ -40,6 +40,22 @@ public class Productdemand extends NumberS{
private String area;
+ private String reason;
+
+ private Date changetime;
+
+ private String tasknum;
+
+ private String taskdetail;
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
public Integer getId() {
return id;
}
@@ -184,4 +200,28 @@ public class Productdemand extends NumberS{
public void setArea(String area) {
this.area = area;
}
+
+ public Date getChangetime() {
+ return changetime;
+ }
+
+ public void setChangetime(Date changetime) {
+ this.changetime = changetime;
+ }
+
+ public String getTaskNum() {
+ return tasknum;
+ }
+
+ public void setTaskNum(String taskNum) {
+ this.tasknum = taskNum;
+ }
+
+ public String getTaskDetail() {
+ return taskdetail;
+ }
+
+ public void setTaskDetail(String taskDetail) {
+ this.taskdetail = taskDetail;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/ProvinceGeom.java b/src/main/java/com/cetc32/dh/entity/ProvinceGeom.java
index 8e0b9996bad7c84f1390480679c66532345250fd..c4494120845e253d29e9ea76f2f767bd9abd9d1b 100644
--- a/src/main/java/com/cetc32/dh/entity/ProvinceGeom.java
+++ b/src/main/java/com/cetc32/dh/entity/ProvinceGeom.java
@@ -14,6 +14,18 @@ public class ProvinceGeom {
private Object geom;
+ @Column(name = "polygon_text")
+ private String polygonText;
+
+ public String getPolygonText() {
+ return polygonText;
+ }
+
+ public void setPolygonText(String polygonText) {
+ this.polygonText = polygonText;
+ }
+
+
/**
* @return province
*/
diff --git a/src/main/java/com/cetc32/dh/entity/vDemand.java b/src/main/java/com/cetc32/dh/entity/vDemand.java
index 0041b51a928271db78722fbd7abf8ca8c7099a12..51febdc5d39ff189d806de7860416573a11b95ef 100644
--- a/src/main/java/com/cetc32/dh/entity/vDemand.java
+++ b/src/main/java/com/cetc32/dh/entity/vDemand.java
@@ -5,7 +5,7 @@ import org.apache.commons.lang3.StringUtils;
import java.util.Date;
-public class vDemand {
+public class vDemand extends NumberS{
public String classify;
public String name;
public String people;
diff --git a/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java b/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java
deleted file mode 100644
index c9b039fb84a2f328a6a835f188ea368b6098db13..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.cetc32.dh.mybatis;
-
-import com.cetc32.dh.entity.AreaCommon;
-import com.cetc32.dh.entity.AreaCommonExample;
-import com.cetc32.dh.entity.BaseAdminPermission;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-import tk.mapper.MyMapper;
-import tk.mybatis.mapper.common.Mapper;
-
-import java.util.List;
-@Repository
-public interface AreaCommonMapper extends MyMapper {
- public Integer updateByCity(AreaCommon areaCommon);
- public List selectAll();
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminPermissionMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminPermissionMapper.java
deleted file mode 100644
index cb94e393cd8a71f4a035ac31030267f79389700e..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminPermissionMapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @Description: 用户权限数据库数据库实体操作
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.mybatis;
-
-import com.cetc32.dh.dto.PermissionDTO;
-import com.cetc32.dh.entity.BaseAdminPermission;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-import tk.mapper.MyMapper;
-import java.util.List;
-
-/**
- * @Title: BaseAdminPermissionMapper
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/21 11:19
- */
-@Repository
-public interface BaseAdminPermissionMapper extends MyMapper {
-
- List getPermissionList();
-
- List parentPermissionList();
-
- int updatePermission(BaseAdminPermission permission);
-
- List getPermissionListByPId(@Param("pid") Integer pid);
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java
deleted file mode 100644
index 8e30d1b2eaf26348a5630ac17ef3eab5d6255e5b..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @Description: 用户角色管理实体操作
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.mybatis;
-
-import com.cetc32.dh.beans.ResultUserRole;
-import com.cetc32.dh.entity.BaseAdminRole;
-import com.cetc32.dh.entity.NumberS;
-import org.springframework.stereotype.Repository;
-import tk.mapper.MyMapper;
-
-import java.util.List;
-/**
- * @Title: BaseAdminRoleMapper
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/21 11:19
- */
-@Repository
-public interface BaseAdminRoleMapper extends MyMapper {
-
- List getAllRoles(NumberS number);
- List getRoleList();
- ResultUserRole findRoleByID(Integer id);
- int addRole(BaseAdminRole baseAdminRole);
- ResultUserRole findRoleByName(String roleName);
- int countRoles();
- int updateRole(BaseAdminRole baseAdminRole);
- int delRoleByID(Integer id);
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java
deleted file mode 100644
index 534282a47a423041dd2553e59a3aaaa656b060be..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @Description: 用户管理数据库实体操作
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.mybatis;
-
-import com.cetc32.dh.beans.ResultUserInfo;
-import com.cetc32.dh.beans.ResultUserInfoDe;
-import com.cetc32.dh.dto.AdminUserDTO;
-import com.cetc32.dh.dto.UserSearchDTO;
-import com.cetc32.dh.entity.BaseAdminUser;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-import tk.mapper.MyMapper;
-import java.util.List;
-
-/**
- * @Title: BaseAdminUserMapper
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/21 11:19
- */
-@Repository
-public interface BaseAdminUserMapper extends MyMapper {
-
- int insertUser(BaseAdminUser user);
-
- int deleteInfo(@Param("id") Integer id);
-
- List findUserByCondition(BaseAdminUser user);
-
- Integer countUserByCondition(BaseAdminUser user);
-
- List getUserList(UserSearchDTO userSearchDTO);
-
- BaseAdminUser getUserByUserName(@Param("sysUserName") String sysUserName, @Param("id") Integer id);
-
- int updateUserStatus(@Param("id") Integer id, @Param("status") Integer status);
-
- int updateUser(BaseAdminUser user);
-
- int countUserByCondition(@Param("offset") Integer offset, @Param("limit") Integer limit,@Param("user") BaseAdminUser user);
-
- BaseAdminUser findByUserName(@Param("userName") String userName);
-
- BaseAdminUser findByUserNameAll(@Param("userName") String userName);
-
- int updatePwd(@Param("userName") String userName, @Param("password") String password);
-
- List getUserRole(@Param("roleId") Integer roleId);
-
- BaseAdminUser queryById(Integer id);
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b6da628124f5bbd5bf389316514d363fe9cde16
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright（C） CETC-32
+ * @Description：
+ * @Author ：徐文远
+ * @version：1.0
+ * @date ： 2021/9/15 下午2:06
+ ******************************************************************************/
+package com.cetc32.dh.mybatis;
+
+import com.cetc32.dh.entity.CityGeom;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+@Repository
+public interface CityGeomMapper extends Mapper {
+ List selectCityTree(@Param("proCode")String proCode) ;
+
+ public int updateByName(CityGeom cityGeom);
+
+ public CityGeom queryByName(String name);
+}
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
index a4f5acb44ba82c1acc3d4ed488b411d300795fba..09b453279c26c40e73b615d3171506e749974c0a 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
@@ -83,10 +83,10 @@ public interface DataFileMapper extends Mapper {
/**
* 根据安全等级查询文件数据
*
- * @param fileSecurity 文件安全等级
+ * @param security 文件安全等级
* @return 返回查询结果
*/
- public List queryAllByFileSecurity(String fileSecurity);
+ public List queryAllByFileSecurity(Integer security);
/**
* 根据安状态和用户查询文件数据
@@ -138,6 +138,14 @@ public interface DataFileMapper extends Mapper {
*/
public Integer deleteByMenuId(Integer menuId);
+ /**
+ * 查询编目menuId下的所有文件数据
+ *
+ * @param menuId 编目id
+ * @return 返回查询结果
+ */
+ public List queryByMenuId(Integer menuId);
+
/**
* 统计编目menuId下的所有文件数据的大小
*
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java
index 6312b48c88ff3d12c3d5850f81a38c0f46821516..b8ddc79b52a612f2e67c0ac7f521c08995c5fc62 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java
@@ -31,6 +31,12 @@ public interface DataPlpMapper extends Mapper {
*/
public Integer countAll();
+ /**
+ * 查询所有的点线面数据个数
+ *
+ * @return 返回统计结果
+ */
+ public List selectAll();
/**
* 插入一个点线面数据
*
@@ -43,7 +49,7 @@ public interface DataPlpMapper extends Mapper {
public Integer insertCollected(DataCollected data);
- public List selectPloygon(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("polygon") String polygon);
+ public List selectPloygon(@Param("status") String status,@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("polygon") String polygon);
/**
* 根据id更新点线面数据记录
@@ -91,7 +97,7 @@ public interface DataPlpMapper extends Mapper {
* @param security 安全等级
* @return 返回查询结果
*/
- public List queryAllByFileSecurity(String security);
+ public List queryAllByFileSecurity(Integer security);
/**
* 根据状态和审批用户查询点线面数据
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java
index 631607f5e7351be9a6c2828d58c78246bca1b226..fcb29490434ed026d97431db8603cd37d2943402 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java
@@ -84,7 +84,7 @@ public interface DataTraceMapper extends Mapper {
* @param security 轨迹数据安全等级
* @return 返回查询结果
*/
- public List queryAllByFileSecurity(String security);
+ public List queryAllByFileSecurity(Integer security);
/**
* 根据安状态和用户查询轨迹数据
diff --git a/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java
index 3e656c78dcf7ab6e4ad4cadb2c721c16933c4bb2..bdf866a4e617b17ef3556631702d20a12039a9ae 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java
@@ -63,5 +63,9 @@ public interface DemandSubmitMapper {
List queryFilesByObj(vDemand vdemand);
+ Long countFilesByObj(vDemand vDemand);
+
List searchbystatus(DemandSubmitDTO demandSubmitDTO);
-}
\ No newline at end of file
+
+ List alldemandclassify();
+}
diff --git a/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java b/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java
deleted file mode 100644
index 12d4441396f3e44c1b892400c4e55e0abc79c39d..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.cetc32.dh.mybatis;
-
-import com.cetc32.dh.entity.Department;
-import com.cetc32.dh.entity.NumberS;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-import tk.mapper.MyMapper;
-
-import java.util.List;
-
-@Repository
-public interface DepartmentMapper extends MyMapper {
- List findall(NumberS number);
-
- List findByParentID(@Param("organizationid") Integer pid);
-
- Department findByID(Integer id);
-
- int deleteById(Integer id);
-
- List getDepartmentList();
-
-// int deleteByPrimaryKey(Integer id);
-
- int insert(Department record);
-
- int insertSelective(Department record);
-
- List selectByLimit(@Param("offset") Integer offset, @Param("limit") Integer limit);
-
-// Department selectByPrimaryKey(Integer id);
-
- int countDepartment();
-
- int updateByPrimaryKeySelective(Department record);
-
- int updateByPrimaryKey(Department record);
- List findByKeyWord(String keyword);
-}
diff --git a/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java b/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java
deleted file mode 100644
index 21e249a43a5b290a19a68386bd8a9b5d544fee6c..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.cetc32.dh.mybatis;
-
-import com.cetc32.dh.entity.Organization;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface OrganizationMapper {
-
- List findall();
-
- int deleteByPrimaryKey(Integer id);
-
- int insert(Organization record);
-
- int insertSelective(Organization record);
-
- List selectByLimit(@Param("offset") Integer offset,@Param("limit") Integer limit);
-
- Organization selectByPrimaryKey(Integer id);
-
- int countOrganization();
-
- int updateByPrimaryKeySelective(Organization record);
-
- int updateByPrimaryKey(Organization record);
- List findByKeyWord(String keyword);
-}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java
index 04538f61b02c8625b6890240d5e46b59c937b0fc..333159e351cdf94fbfbae7aa78ea1887fa37556d 100644
--- a/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java
@@ -1,7 +1,7 @@
package com.cetc32.dh.mybatis;
-import com.cetc32.dh.entity.AreaCommon;
import com.cetc32.dh.entity.ProvinceGeom;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.common.Mapper;
@@ -12,6 +12,9 @@ public interface ProvinceGeomMapper extends Mapper {
public int insertOne(ProvinceGeom provinceGeom);
public int updateByName(ProvinceGeom provinceGeom);
public List selectAll();
+ public ProvinceGeom queryByName(String name);
+ public Boolean judgePolygonDisjoint(@Param("polygon1") String polygon1, @Param("polygon2") String polygon2);
+
}
diff --git a/src/main/java/com/cetc32/dh/service/AdminPermissionService.java b/src/main/java/com/cetc32/dh/service/AdminPermissionService.java
deleted file mode 100644
index 915f0b33f0cbc503eb498e5ae07405c0c8f46539..0000000000000000000000000000000000000000
--- a/src/main/java/com/cetc32/dh/service/AdminPermissionService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @Description: 用户权限
- * @author: youqing
- * @version: 1.0
- * @date: 2020/9/11 10:55
- * 更改描述：
- */
-package com.cetc32.dh.service;
-
-import com.cetc32.dh.common.response.PageDataResult;
-import com.cetc32.dh.dto.PermissionDTO;
-import com.cetc32.dh.entity.BaseAdminPermission;
-import com.cetc32.dh.entity.BaseAdminUser;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Title: AdminPermissionService
- * @Description:
- * @author: youqing
- * @version: 1.0
- * @date: 2020/11/30 9:44
- */
-public interface AdminPermissionService {
-
- Map addPermission(BaseAdminPermission permission);
-
- Map updatePermission(BaseAdminPermission permission);
-
- PageDataResult getPermissionList(Integer pageNum, Integer pageSize);
-
- List