selectRefIndexingByTaskId(Integer taskId);
}
\ No newline at end of file
diff --git a/src/main/java/com/indexingsystem/boss/admin/mapper/IdxTaskProductMapper.xml b/src/main/java/com/indexingsystem/boss/admin/mapper/IdxTaskProductMapper.xml
index 848ba44e19b529cf6c511988f14f52e6eeee1b00..0509f0b3b0df24d6bbb23389a12c98d8a4bbcefe 100644
--- a/src/main/java/com/indexingsystem/boss/admin/mapper/IdxTaskProductMapper.xml
+++ b/src/main/java/com/indexingsystem/boss/admin/mapper/IdxTaskProductMapper.xml
@@ -1,30 +1,36 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
id, product_id, task_id, status, check_status, ref_indexing, update_date, update_by
-
-
+
+
delete from idx_task_product
where id = #{id,jdbcType=VARCHAR}
-
+
insert into idx_task_product (id, product_id, task_id,
status, check_status, ref_indexing,
update_date, update_by)
@@ -32,89 +38,89 @@
#{status,jdbcType=INTEGER}, #{checkStatus,jdbcType=INTEGER}, #{refIndexing,jdbcType=INTEGER},
#{updateDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR})
-
- insert into idx_task_product
-
-
- id,
-
-
- product_id,
-
-
- task_id,
-
-
- status,
-
-
- check_status,
-
-
- ref_indexing,
-
-
- update_date,
-
-
- update_by,
-
-
-
-
- #{id,jdbcType=VARCHAR},
-
-
- #{productId,jdbcType=VARCHAR},
-
-
- #{taskId,jdbcType=INTEGER},
-
-
- #{status,jdbcType=INTEGER},
-
-
- #{checkStatus,jdbcType=INTEGER},
-
-
- #{refIndexing,jdbcType=INTEGER},
-
-
- #{updateDate,jdbcType=TIMESTAMP},
-
-
- #{updateBy,jdbcType=VARCHAR},
-
-
-
-
- update idx_task_product
-
-
- product_id = #{productId,jdbcType=VARCHAR},
-
-
- task_id = #{taskId,jdbcType=INTEGER},
-
-
- status = #{status,jdbcType=INTEGER},
-
-
- check_status = #{checkStatus,jdbcType=INTEGER},
-
-
- ref_indexing = #{refIndexing,jdbcType=INTEGER},
-
-
- update_date = #{updateDate,jdbcType=TIMESTAMP},
-
-
- update_by = #{updateBy,jdbcType=VARCHAR},
-
-
- where id = #{id,jdbcType=VARCHAR}
-
-
+
+ insert into idx_task_product
+
+
+ id,
+
+
+ product_id,
+
+
+ task_id,
+
+
+ status,
+
+
+ check_status,
+
+
+ ref_indexing,
+
+
+ update_date,
+
+
+ update_by,
+
+
+
+
+ #{id,jdbcType=VARCHAR},
+
+
+ #{productId,jdbcType=VARCHAR},
+
+
+ #{taskId,jdbcType=INTEGER},
+
+
+ #{status,jdbcType=INTEGER},
+
+
+ #{checkStatus,jdbcType=INTEGER},
+
+
+ #{refIndexing,jdbcType=INTEGER},
+
+
+ #{updateDate,jdbcType=TIMESTAMP},
+
+
+ #{updateBy,jdbcType=VARCHAR},
+
+
+
+
+ update idx_task_product
+
+
+ product_id = #{productId,jdbcType=VARCHAR},
+
+
+ task_id = #{taskId,jdbcType=INTEGER},
+
+
+ status = #{status,jdbcType=INTEGER},
+
+
+ check_status = #{checkStatus,jdbcType=INTEGER},
+
+
+ ref_indexing = #{refIndexing,jdbcType=INTEGER},
+
+
+ update_date = #{updateDate,jdbcType=TIMESTAMP},
+
+
+ update_by = #{updateBy,jdbcType=VARCHAR},
+
+
+ where id = #{id,jdbcType=VARCHAR}
+
+
update idx_task_product
set product_id = #{productId,jdbcType=VARCHAR},
task_id = #{taskId,jdbcType=INTEGER},
@@ -125,27 +131,27 @@
update_by = #{updateBy,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
-
-
- delete from idx_task_product
- where id in
-
- #{item,jdbcType=VARCHAR}
-
-
+
+
+ delete from idx_task_product
+ where id in
+
+ #{item,jdbcType=VARCHAR}
+
+
-
+
-
\ No newline at end of file
diff --git a/src/main/java/com/indexingsystem/boss/common/ImportClientHttpUtil.java b/src/main/java/com/indexingsystem/boss/common/ImportClientHttpUtil.java
index d1b59bdb38a41025825b3e71c7dd868f9c73b084..ba31969dfe162c4bd331dcfa3d812bae931cad25 100644
--- a/src/main/java/com/indexingsystem/boss/common/ImportClientHttpUtil.java
+++ b/src/main/java/com/indexingsystem/boss/common/ImportClientHttpUtil.java
@@ -3,7 +3,7 @@ package com.indexingsystem.boss.common;
import java.io.IOException;
import java.nio.charset.Charset;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
diff --git a/src/main/java/com/indexingsystem/boss/common/RemoteExecuteCommand.java b/src/main/java/com/indexingsystem/boss/common/RemoteExecuteCommand.java
index e0018c5bf4da8d3f498d2e883838ddb750df5717..36eb33d13279612e267c72cf766a8a4a7fb7abce 100644
--- a/src/main/java/com/indexingsystem/boss/common/RemoteExecuteCommand.java
+++ b/src/main/java/com/indexingsystem/boss/common/RemoteExecuteCommand.java
@@ -5,7 +5,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import ch.ethz.ssh2.Connection;
import ch.ethz.ssh2.Session;
import ch.ethz.ssh2.StreamGobbler;
diff --git a/src/main/java/com/indexingsystem/boss/common/SftpUtil.java b/src/main/java/com/indexingsystem/boss/common/SftpUtil.java
index 57f2a89df462393705531bd6709bbbbf32abafff..06bec133df34c42551b5a589a7f2ff1f081d6cc2 100644
--- a/src/main/java/com/indexingsystem/boss/common/SftpUtil.java
+++ b/src/main/java/com/indexingsystem/boss/common/SftpUtil.java
@@ -12,7 +12,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Vector;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.web.multipart.MultipartFile;
diff --git a/src/main/java/com/indexingsystem/boss/filter/KickoutSessionControlFilter.java b/src/main/java/com/indexingsystem/boss/filter/KickoutSessionControlFilter.java
index 7bcb144ce0fec7f390847bbd5620971740408296..c08ba6ffa129a3c969bbef4405a10fae6403bdef 100644
--- a/src/main/java/com/indexingsystem/boss/filter/KickoutSessionControlFilter.java
+++ b/src/main/java/com/indexingsystem/boss/filter/KickoutSessionControlFilter.java
@@ -164,12 +164,12 @@ public class KickoutSessionControlFilter extends AccessControlFilter
KickoutSessionControlFilter.shiroSessionRepository = shiroSessionRepository;
}
- public static String getKickoutUrl()
+ public String getKickoutUrl()
{
return kickoutUrl;
}
- public static void setKickoutUrl(String kickoutUrl)
+ public void setKickoutUrl(String kickoutUrl)
{
KickoutSessionControlFilter.kickoutUrl = kickoutUrl;
}
diff --git a/src/main/java/com/indexingsystem/boss/utils/EndecryptUtils.java b/src/main/java/com/indexingsystem/boss/utils/EndecryptUtils.java
index 46cefae5f5b64cab09534e9b102d2168229d4017..fea8deed13b035f3474f7c4b3576351bcc182e23 100644
--- a/src/main/java/com/indexingsystem/boss/utils/EndecryptUtils.java
+++ b/src/main/java/com/indexingsystem/boss/utils/EndecryptUtils.java
@@ -2,7 +2,7 @@ package com.indexingsystem.boss.utils;
import java.security.Key;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.codec.Base64;
import org.apache.shiro.codec.H64;
import org.apache.shiro.codec.Hex;
diff --git a/src/main/java/com/indexingsystem/boss/utils/ExcelUtil.java b/src/main/java/com/indexingsystem/boss/utils/ExcelUtil.java
index d5432d6c10fdfc30753e088a6b91242f3f48ddef..ce73ad71c793bf7400f6c4db3032ec4d5c9fb69b 100644
--- a/src/main/java/com/indexingsystem/boss/utils/ExcelUtil.java
+++ b/src/main/java/com/indexingsystem/boss/utils/ExcelUtil.java
@@ -17,7 +17,7 @@ import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFDataFormat;
diff --git a/src/main/java/com/indexingsystem/boss/utils/GsonDateTypeAdapter.java b/src/main/java/com/indexingsystem/boss/utils/GsonDateTypeAdapter.java
index df77d0358bd36269f90bfbbff02acb7aae7adb78..9e02ef0caef974ce4bcb011824d2af4d796cbc45 100644
--- a/src/main/java/com/indexingsystem/boss/utils/GsonDateTypeAdapter.java
+++ b/src/main/java/com/indexingsystem/boss/utils/GsonDateTypeAdapter.java
@@ -9,7 +9,7 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
diff --git a/src/main/java/com/indexingsystem/boss/utils/JsonUtil.java b/src/main/java/com/indexingsystem/boss/utils/JsonUtil.java
index 914b74e18d8c8666761c78ba763abc1df49ba5a5..02bb5877a77285c894112536c34fbb10d3da2d88 100644
--- a/src/main/java/com/indexingsystem/boss/utils/JsonUtil.java
+++ b/src/main/java/com/indexingsystem/boss/utils/JsonUtil.java
@@ -14,7 +14,7 @@ import java.util.Set;
import net.sf.json.JSON;
import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.map.ObjectMapper;
diff --git a/src/main/java/com/indexingsystem/boss/utils/MD5Util.java b/src/main/java/com/indexingsystem/boss/utils/MD5Util.java
index 7de3c495ab7db8e7902e25751ba189e8315cbcaf..e71e2120ed6f5d64764cbf96a2669abddac31849 100644
--- a/src/main/java/com/indexingsystem/boss/utils/MD5Util.java
+++ b/src/main/java/com/indexingsystem/boss/utils/MD5Util.java
@@ -162,7 +162,7 @@ public class MD5Util {
String jmValue = MD5Util.decode(MD5Util.decode(value));
System.out.println("解密用户名和密码22222="+jmValue);
-
+
}
}
\ No newline at end of file
diff --git a/src/main/java/com/indexingsystem/boss/utils/ObjectUtil.java b/src/main/java/com/indexingsystem/boss/utils/ObjectUtil.java
index ca2b6cecffd9c677e93b71b2a50fa9647962e364..32b01ee3d78de3c50032b26a3a11439d5808dc53 100644
--- a/src/main/java/com/indexingsystem/boss/utils/ObjectUtil.java
+++ b/src/main/java/com/indexingsystem/boss/utils/ObjectUtil.java
@@ -16,7 +16,7 @@ import java.util.Date;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang3.ClassUtils;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.NotReadablePropertyException;
diff --git a/src/main/java/com/indexingsystem/boss/utils/TimeUtil.java b/src/main/java/com/indexingsystem/boss/utils/TimeUtil.java
index 0c52eead3539ffa1158e49c8ab52768d8f2c8301..d83f9edc79235629ecddb3dbb335f781f6aa9d6f 100644
--- a/src/main/java/com/indexingsystem/boss/utils/TimeUtil.java
+++ b/src/main/java/com/indexingsystem/boss/utils/TimeUtil.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
/**
***********************************************
diff --git a/src/main/java/com/indexingsystem/boss/utils/UploadUtils.java b/src/main/java/com/indexingsystem/boss/utils/UploadUtils.java
index 5429781dfc9daaa1a04281dd2cf0fde01df0f47b..ae316c161ec7af3060ba3fb579781edf1eff2266 100644
--- a/src/main/java/com/indexingsystem/boss/utils/UploadUtils.java
+++ b/src/main/java/com/indexingsystem/boss/utils/UploadUtils.java
@@ -7,8 +7,8 @@ import java.util.Date;
import java.util.regex.Pattern;
import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* 文件上传工具类.
diff --git a/src/main/java/com/indexingsystem/db/mongoDB/impl/ArticlesResourceMongo.java b/src/main/java/com/indexingsystem/db/mongoDB/impl/ArticlesResourceMongo.java
index d30f29c7cd3fcf4fa9bdbfe60e12c30956aae969..b2455521ee087d33f1a24beed042f7c9583402c7 100644
--- a/src/main/java/com/indexingsystem/db/mongoDB/impl/ArticlesResourceMongo.java
+++ b/src/main/java/com/indexingsystem/db/mongoDB/impl/ArticlesResourceMongo.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/src/main/java/com/indexingsystem/db/mongoDB/impl/BooksResourceMongo.java b/src/main/java/com/indexingsystem/db/mongoDB/impl/BooksResourceMongo.java
index 37cdfdf696c13e4f17df035f2a63e023215463ed..f0144ddf9b970c09427e37618ae4470e0a43f77e 100644
--- a/src/main/java/com/indexingsystem/db/mongoDB/impl/BooksResourceMongo.java
+++ b/src/main/java/com/indexingsystem/db/mongoDB/impl/BooksResourceMongo.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/src/main/java/com/indexingsystem/db/mongoDB/impl/GamesResourceMongo.java b/src/main/java/com/indexingsystem/db/mongoDB/impl/GamesResourceMongo.java
index 81889cf5509a5aada7c9bba7188924743902f8e4..2a4c979c7c93d20c0d94e8e72fef67942167b632 100644
--- a/src/main/java/com/indexingsystem/db/mongoDB/impl/GamesResourceMongo.java
+++ b/src/main/java/com/indexingsystem/db/mongoDB/impl/GamesResourceMongo.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/src/main/java/com/indexingsystem/db/mongoDB/impl/MagazinesMongo.java b/src/main/java/com/indexingsystem/db/mongoDB/impl/MagazinesMongo.java
index 609235cd9477f91c4e967d401397d1c832ef52d4..e3c3dbac560528a6183542dc0071155c8d5d258f 100644
--- a/src/main/java/com/indexingsystem/db/mongoDB/impl/MagazinesMongo.java
+++ b/src/main/java/com/indexingsystem/db/mongoDB/impl/MagazinesMongo.java
@@ -8,7 +8,7 @@ import java.util.Set;
import java.util.regex.Pattern;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/src/main/java/com/indexingsystem/db/mongoDB/impl/ResourceCategorsMongo.java b/src/main/java/com/indexingsystem/db/mongoDB/impl/ResourceCategorsMongo.java
index 43bf59fb84e080847210c6d20b5ca7717f8ff2fc..cd3ff40cbe1031201d0fae0e0621bd4f154e8e39 100644
--- a/src/main/java/com/indexingsystem/db/mongoDB/impl/ResourceCategorsMongo.java
+++ b/src/main/java/com/indexingsystem/db/mongoDB/impl/ResourceCategorsMongo.java
@@ -5,7 +5,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/src/main/java/com/indexingsystem/db/mongoDB/impl/UserPublishMongo.java b/src/main/java/com/indexingsystem/db/mongoDB/impl/UserPublishMongo.java
index b3f32adda81d6eb11bc9280de8194d547bd2bf10..2963de449b3512fda1fa39fde3b1a6db3ecba95f 100644
--- a/src/main/java/com/indexingsystem/db/mongoDB/impl/UserPublishMongo.java
+++ b/src/main/java/com/indexingsystem/db/mongoDB/impl/UserPublishMongo.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/src/main/java/com/indexingsystem/db/mongoDB/impl/VideosMongo.java b/src/main/java/com/indexingsystem/db/mongoDB/impl/VideosMongo.java
index 4f6ace36df12c5fe58f58920bf564a46d84a1aa4..565c3a7d29615705d025a6e492dc243c4e68fc94 100644
--- a/src/main/java/com/indexingsystem/db/mongoDB/impl/VideosMongo.java
+++ b/src/main/java/com/indexingsystem/db/mongoDB/impl/VideosMongo.java
@@ -6,7 +6,7 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/src/main/java/com/indexingsystem/db/mongoDB/impl/WeChatSharesMongo.java b/src/main/java/com/indexingsystem/db/mongoDB/impl/WeChatSharesMongo.java
index 8619a021577abe6a5bcb826b82eee297036ae835..ab592a207ee12590e764ae0c9ee7999adbdfa5f3 100644
--- a/src/main/java/com/indexingsystem/db/mongoDB/impl/WeChatSharesMongo.java
+++ b/src/main/java/com/indexingsystem/db/mongoDB/impl/WeChatSharesMongo.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/src/main/java/com/indexingsystem/db/redis/InstitutionsRedis.java b/src/main/java/com/indexingsystem/db/redis/InstitutionsRedis.java
index 711c3fcf27d40986efd6940b48d0e9fb362f5ba2..d42cd35b24e34a216214410d433c9d993bac40c5 100644
--- a/src/main/java/com/indexingsystem/db/redis/InstitutionsRedis.java
+++ b/src/main/java/com/indexingsystem/db/redis/InstitutionsRedis.java
@@ -4,7 +4,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
import com.indexingsystem.boss.entity.Institutions;
import com.indexingsystem.boss.logback.LogCvt;
diff --git a/src/main/java/com/indexingsystem/db/redis/RedisKeyUtil.java b/src/main/java/com/indexingsystem/db/redis/RedisKeyUtil.java
index 52d6e6568baf92274d058406b4a421cb4aeda17b..fe9d1c5fec023c57fe3a4797dea47a18fb2b0736 100644
--- a/src/main/java/com/indexingsystem/db/redis/RedisKeyUtil.java
+++ b/src/main/java/com/indexingsystem/db/redis/RedisKeyUtil.java
@@ -2,7 +2,7 @@ package com.indexingsystem.db.redis;
import java.text.MessageFormat;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
/**
*
diff --git a/src/main/java/com/indexingsystem/system/extend/RedisCache.java b/src/main/java/com/indexingsystem/system/extend/RedisCache.java
index 71138698dc4d01e0e73e12e3096bd085140e1b2f..ec088237685b0e7f3d11f4f0ac923e6cc2db2e65 100644
--- a/src/main/java/com/indexingsystem/system/extend/RedisCache.java
+++ b/src/main/java/com/indexingsystem/system/extend/RedisCache.java
@@ -12,7 +12,10 @@ import redis.clients.jedis.Jedis;
@Component(value = "redisCache")
public class RedisCache {
private int port = 6379;
- private String host = "118.31.66.123";
+
+ //private String host = "118.31.66.123";
+ // mineary 本地测试
+ private String host = "localhost";
private Jedis jedis = new Jedis(host, port);
public String cache(String key, String value, int seconds) {
diff --git a/src/main/java/com/indexingsystem/system/productindex/controller/ProduceIndexingController.java b/src/main/java/com/indexingsystem/system/productindex/controller/ProduceIndexingController.java
new file mode 100644
index 0000000000000000000000000000000000000000..58a6fef9c101778330cda3c902fc05aa0fea5e7a
--- /dev/null
+++ b/src/main/java/com/indexingsystem/system/productindex/controller/ProduceIndexingController.java
@@ -0,0 +1,230 @@
+package com.indexingsystem.system.productindex.controller;
+
+
+import com.indexingsystem.boss.Vo.*;
+import com.indexingsystem.boss.common.PagedResult;
+import com.indexingsystem.boss.entity.IdxIndexingProductsCheck;
+import com.indexingsystem.system.service.IdxExportIndexingProductService;
+import com.indexingsystem.system.service.IdxIndexingProductsCheckService;
+import com.indexingsystem.system.service.IdxTaskProductService;
+import com.indexingsystem.system.service.IdxThemeTableService;
+import org.apache.poi.util.DocumentHelper;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+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.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@Controller
+@RequestMapping("/Service")
+public class ProduceIndexingController {
+
+ private static final Logger log = LoggerFactory.getLogger(ProduceIndexingController.class);
+
+ @Resource
+ private IdxThemeTableService idxThemeTableService;
+
+ @Resource
+ private IdxExportIndexingProductService idxExportIndexingProductService;
+
+ @Resource
+ private IdxIndexingProductsCheckService idxIndexingProductsCheckService;
+
+ @Resource
+ private IdxTaskProductService idxTaskProductService;
+
+ /**
+ * 产品标引结果导出
+ * @param reqVo
+ * @return
+ */
+ @RequestMapping(value = "/ExportIndexingThemeWords", method = RequestMethod.POST)
+ @ResponseBody
+ public Map exportIndexingThemeWords(@RequestBody ExportThemeWordsReqVo reqVo) {
+ log.info("/Service/ExportIndexingThemeWords");
+ Map result = new HashMap<>();
+ String message = "操作失败";
+ String result_code = "9999";
+ if (null != reqVo && reqVo.isNotBlank()) {
+ System.out.println(reqVo.toString());
+ try {
+ //idxThemeTableService.export(reqVo, );
+ message = "操作成功!";
+ result_code = "0000";
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ message = "参数不全!";
+ result_code = "6666";
+ }
+ result.put("message", message);
+ result.put("result_code", result_code);
+ log.info(result.toString());
+ return result;
+ }
+
+ /**
+ * 产品标引导出历史记录删除
+ * @param reqVo
+ * @return
+ */
+ @RequestMapping(value = "/DeleteExportIndexing", method = RequestMethod.POST)
+ @ResponseBody
+ public Map deleteExportIndexing(@RequestBody DelExportThemeWordsReqVo reqVo) {
+ log.info("/Service/DeleteExportIndexing");
+ Map result = new HashMap<>();
+ String message = "操作失败";
+ String result_code = "9999";
+ if (null != reqVo && reqVo.isNotBlank()) {
+ System.out.println(reqVo.toString());
+ try {
+ for (String id : reqVo.getIds()) {
+ //删除数据库的一行对象
+ idxExportIndexingProductService.deleteByPrimaryKey(id);
+ }
+ //idxThemeTableService.export(reqVo, );
+ message = "操作成功!";
+ result_code = "0000";
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ message = "参数不全!";
+ result_code = "6666";
+ }
+
+
+ result.put("message", message);
+ result.put("result_code", result_code);
+ log.info(result.toString());
+ return result;
+ }
+
+ /**
+ * 产品标引主题词表审核
+ * @param reqVo
+ * @return
+ */
+ @RequestMapping(value = "/innertext/auditProductThemeTable", method = RequestMethod.POST)
+ @ResponseBody
+ public Map auditProductThemeTable(@RequestBody ProductThemeTableAuditReqVo reqVo) {
+ log.info("/Service/innertext/auditProductThemeTable");
+ Map result = new HashMap<>();
+ String message = "操作失败";
+ String result_code = "9999";
+ if (null != reqVo && reqVo.isNotBlank()) {
+ log.info(reqVo.toString());
+ try {
+ //构造实体对象,设置参数
+ IdxIndexingProductsCheck idxIndexingProductsCheck = new IdxIndexingProductsCheck();
+ idxIndexingProductsCheck.setCheckId(UUID.randomUUID().toString().toLowerCase().replaceAll("-", ""));
+ idxIndexingProductsCheck.setTaskId(reqVo.getTaskId());
+ idxIndexingProductsCheck.setProductId(reqVo.getProductId());
+ idxIndexingProductsCheck.setThemeTableId(reqVo.getThemeTableId());
+ idxIndexingProductsCheck.setCheckStatus(reqVo.getCheckStatus());
+ String username = (String) SecurityUtils.getSubject().getPrincipal();
+ if (username != null) {
+ idxIndexingProductsCheck.setCreateBy(username);
+ } else {
+ idxIndexingProductsCheck.setCreateBy("unknown");
+ }
+ idxIndexingProductsCheck.setCreateTime(new Date());
+ idxIndexingProductsCheckService.insertSelective(idxIndexingProductsCheck);
+ log.info(idxIndexingProductsCheck.toString());
+ message = "操作成功!";
+ result_code = "0000";
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ message = "参数不全!";
+ result_code = "6666";
+ }
+
+ result.put("message", message);
+ result.put("result_code", result_code);
+ log.info(result.toString());
+ return result;
+ }
+
+ /**
+ * 产品标引主题词表列表
+ * @param reqVo
+ * @return
+ */
+ @RequestMapping(value = "/innertext/getProductThemeTableList", method = RequestMethod.POST)
+ @ResponseBody
+ public Map getProductThemeTableList(@RequestBody ProductThemeTableReqVo reqVo) {
+ log.info("/Service/innertext/getProductThemeTableList");
+ Map result = new HashMap<>();
+ String message = "操作失败";
+ String result_code = "9999";
+ if (null != reqVo && reqVo.isNotBlank()) {
+ log.info(reqVo.toString());
+ try {
+ //获取分页结果列表
+ PagedResult pagedResult = idxIndexingProductsCheckService.getProductThemeTableList(reqVo);
+ //idxThemeTableService.export(reqVo, );
+ result.put("data", pagedResult);
+ message = "操作成功!";
+ result_code = "0000";
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ message = "参数不全!";
+ result_code = "6666";
+ }
+
+ result.put("message", message);
+ result.put("result_code", result_code);
+ log.info(result.toString());
+ return result;
+ }
+
+ /**
+ * 产品参考标引列表
+ * @param reqVo
+ * @return
+ */
+ @RequestMapping(value = "/innertext/getRefIndexingList", method = RequestMethod.POST)
+ @ResponseBody
+ public Map getRefIndexingList(@RequestBody RefIndexingReqVo reqVo) {
+ log.info("/Service/innertext/getRefIndexingList");
+ Map result = new HashMap<>();
+ String message = "操作失败";
+ String result_code = "9999";
+ if (null != reqVo && reqVo.isNotBlank()) {
+ log.info(reqVo.toString());
+ try {
+ //获取分页结果列表
+ PagedResult pagedResult = idxTaskProductService.getRefIndexingList(reqVo);
+ //idxThemeTableService.export(reqVo, );
+ result.put("data", pagedResult);
+ message = "操作成功!";
+ result_code = "0000";
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } else {
+ message = "参数不全!";
+ result_code = "6666";
+ }
+
+ result.put("message", message);
+ result.put("result_code", result_code);
+ log.info(result.toString());
+ return result;
+ }
+
+}
diff --git a/src/main/java/com/indexingsystem/system/service/IdxIndexingProductsCheckService.java b/src/main/java/com/indexingsystem/system/service/IdxIndexingProductsCheckService.java
index d493229bf4cd51483bd719a0ec2ead95170f3e4e..98a9501cba7b6673ddef49bd23bffcbace880525 100644
--- a/src/main/java/com/indexingsystem/system/service/IdxIndexingProductsCheckService.java
+++ b/src/main/java/com/indexingsystem/system/service/IdxIndexingProductsCheckService.java
@@ -1,19 +1,27 @@
package com.indexingsystem.system.service;
+import com.indexingsystem.boss.Vo.ProductThemeTableAuditReqVo;
+import com.indexingsystem.boss.Vo.ProductThemeTableReqVo;
+import com.indexingsystem.boss.Vo.ProductThemeTableResVo;
+import com.indexingsystem.boss.common.PagedResult;
import com.indexingsystem.boss.entity.IdxIndexingProductsCheck;
+import java.util.List;
+
public interface IdxIndexingProductsCheckService {
- int deleteByPrimaryKey(String checkId);
+ int deleteByPrimaryKey(String checkId);
+
+ int insert(IdxIndexingProductsCheck record);
- int insert(IdxIndexingProductsCheck record);
+ int insertSelective(IdxIndexingProductsCheck record);
- int insertSelective(IdxIndexingProductsCheck record);
+ IdxIndexingProductsCheck selectByPrimaryKey(String checkId);
- IdxIndexingProductsCheck selectByPrimaryKey(String checkId);
+ int updateByPrimaryKeySelective(IdxIndexingProductsCheck record);
- int updateByPrimaryKeySelective(IdxIndexingProductsCheck record);
+ int updateByPrimaryKeyWithBLOBs(IdxIndexingProductsCheck record);
- int updateByPrimaryKeyWithBLOBs(IdxIndexingProductsCheck record);
+ int updateByPrimaryKey(IdxIndexingProductsCheck record);
- int updateByPrimaryKey(IdxIndexingProductsCheck record);
+ PagedResult getProductThemeTableList(ProductThemeTableReqVo record);
}
diff --git a/src/main/java/com/indexingsystem/system/service/IdxTaskProductService.java b/src/main/java/com/indexingsystem/system/service/IdxTaskProductService.java
index d9b832d893ddfc5b9765aa87251e804c114d5c4f..deba17c0cbb75f936de435e98e01150a80295a33 100644
--- a/src/main/java/com/indexingsystem/system/service/IdxTaskProductService.java
+++ b/src/main/java/com/indexingsystem/system/service/IdxTaskProductService.java
@@ -3,6 +3,9 @@ package com.indexingsystem.system.service;
import java.util.List;
import com.indexingsystem.boss.Vo.IdxTaskProductConditionVo;
+import com.indexingsystem.boss.Vo.RefIndexingReqVo;
+import com.indexingsystem.boss.Vo.RefIndexingResVo;
+import com.indexingsystem.boss.common.PagedResult;
import com.indexingsystem.boss.entity.IdxTaskProduct;
public interface IdxTaskProductService {
@@ -22,4 +25,6 @@ public interface IdxTaskProductService {
List selectByCondition(IdxTaskProductConditionVo idxTaskProductConditionVo);
List selectProductsByPrimaryKey(String taskProductId);
+
+ PagedResult getRefIndexingList(RefIndexingReqVo reqVo);
}
diff --git a/src/main/java/com/indexingsystem/system/service/IdxThemeTableService.java b/src/main/java/com/indexingsystem/system/service/IdxThemeTableService.java
index e71302279f34c4405047357f7a3fc70fc45fa060..8a44737bffd49f57cd92025d2889570c75dedde4 100644
--- a/src/main/java/com/indexingsystem/system/service/IdxThemeTableService.java
+++ b/src/main/java/com/indexingsystem/system/service/IdxThemeTableService.java
@@ -1,12 +1,10 @@
package com.indexingsystem.system.service;
-import com.indexingsystem.boss.Vo.IdxProductInnerTextDetailListVo;
-import com.indexingsystem.boss.Vo.IdxProductInnerTextSelectDetailReqVo;
-import com.indexingsystem.boss.Vo.IdxThemeTablesListVo;
-import com.indexingsystem.boss.Vo.IdxThemeTableslReqVo;
+import com.indexingsystem.boss.Vo.*;
import com.indexingsystem.boss.common.PagedResult;
import com.indexingsystem.boss.entity.IdxThemeTable;
import com.indexingsystem.boss.entity.IdxThemeTableWithBLOBs;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import java.util.List;
@@ -81,4 +79,5 @@ public interface IdxThemeTableService {
*/
Integer selectIdxThemeTableCount(IdxThemeTableslReqVo idxThemeTableslReqVo);
+ String export(ExportThemeWordsReqVo reqVo, HSSFWorkbook wb);
}
diff --git a/src/main/java/com/indexingsystem/system/service/impl/IdxExportIndexingProductServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/IdxExportIndexingProductServiceImpl.java
index 472af595b6ace1f3f7b85d7fabe8588c6cd90c19..265b232d0ed4021530dd4196cf8194f1ed8c58d7 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/IdxExportIndexingProductServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/IdxExportIndexingProductServiceImpl.java
@@ -5,9 +5,11 @@ import javax.annotation.Resource;
import com.indexingsystem.boss.admin.mapper.IdxExportIndexingProductMapper;
import com.indexingsystem.boss.entity.IdxExportIndexingProduct;
import com.indexingsystem.system.service.IdxExportIndexingProductService;
+import org.springframework.stereotype.Service;
//导出产品标引结果
+@Service
public class IdxExportIndexingProductServiceImpl implements IdxExportIndexingProductService {
@Resource
private IdxExportIndexingProductMapper idxExportIndexingProductMapper;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/IdxIndexingProductsCheckServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/IdxIndexingProductsCheckServiceImpl.java
index 2e5a207339ed83e132e0efa9934c8a9e3abba2a4..7e014d9ccae5d9f9e9647809f708395022f04b52 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/IdxIndexingProductsCheckServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/IdxIndexingProductsCheckServiceImpl.java
@@ -1,58 +1,75 @@
package com.indexingsystem.system.service.impl;
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-//标引产品审核(历史审核记录)
+import com.github.pagehelper.PageHelper;
+import com.indexingsystem.boss.Vo.ProductThemeTableReqVo;
+import com.indexingsystem.boss.Vo.ProductThemeTableResVo;
import com.indexingsystem.boss.admin.mapper.IdxIndexingProductsCheckMapper;
+import com.indexingsystem.boss.common.PagedResult;
import com.indexingsystem.boss.entity.IdxIndexingProductsCheck;
+import com.indexingsystem.boss.utils.BeanUtils;
import com.indexingsystem.system.service.IdxIndexingProductsCheckService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+//标引产品审核(历史审核记录)
+
//
@Service
-public class IdxIndexingProductsCheckServiceImpl implements IdxIndexingProductsCheckService {
-
- @Resource
- private IdxIndexingProductsCheckMapper idxIndexingProductsCheckMapper;
- @Override
- public int deleteByPrimaryKey(String checkId) {
- // TODO Auto-generated method stub
- return idxIndexingProductsCheckMapper.deleteByPrimaryKey(checkId);
- }
-
- @Override
- public int insert(IdxIndexingProductsCheck record) {
- // TODO Auto-generated method stub
- return idxIndexingProductsCheckMapper.insert(record);
- }
-
- @Override
- public int insertSelective(IdxIndexingProductsCheck record) {
- // TODO Auto-generated method stub
- return idxIndexingProductsCheckMapper.insertSelective(record);
- }
-
- @Override
- public IdxIndexingProductsCheck selectByPrimaryKey(String checkId) {
- // TODO Auto-generated method stub
- return idxIndexingProductsCheckMapper.selectByPrimaryKey(checkId);
- }
-
- @Override
- public int updateByPrimaryKeySelective(IdxIndexingProductsCheck record) {
- // TODO Auto-generated method stub
- return idxIndexingProductsCheckMapper.updateByPrimaryKeySelective(record);
- }
-
- @Override
- public int updateByPrimaryKeyWithBLOBs(IdxIndexingProductsCheck record) {
- // TODO Auto-generated method stub
- return idxIndexingProductsCheckMapper.updateByPrimaryKeyWithBLOBs(record);
- }
-
- @Override
- public int updateByPrimaryKey(IdxIndexingProductsCheck record) {
- // TODO Auto-generated method stub
- return idxIndexingProductsCheckMapper.updateByPrimaryKey(record);
- }
+public class IdxIndexingProductsCheckServiceImpl implements IdxIndexingProductsCheckService {
+
+ @Resource
+ private IdxIndexingProductsCheckMapper idxIndexingProductsCheckMapper;
+
+ @Override
+ public int deleteByPrimaryKey(String checkId) {
+ // TODO Auto-generated method stub
+ return idxIndexingProductsCheckMapper.deleteByPrimaryKey(checkId);
+ }
+
+ @Override
+ public int insert(IdxIndexingProductsCheck record) {
+ // TODO Auto-generated method stub
+ return idxIndexingProductsCheckMapper.insert(record);
+ }
+
+ @Override
+ public int insertSelective(IdxIndexingProductsCheck record) {
+ // TODO Auto-generated method stub
+ return idxIndexingProductsCheckMapper.insertSelective(record);
+ }
+
+ @Override
+ public IdxIndexingProductsCheck selectByPrimaryKey(String checkId) {
+ // TODO Auto-generated method stub
+ return idxIndexingProductsCheckMapper.selectByPrimaryKey(checkId);
+ }
+
+ @Override
+ public int updateByPrimaryKeySelective(IdxIndexingProductsCheck record) {
+ // TODO Auto-generated method stub
+ return idxIndexingProductsCheckMapper.updateByPrimaryKeySelective(record);
+ }
+
+ @Override
+ public int updateByPrimaryKeyWithBLOBs(IdxIndexingProductsCheck record) {
+ // TODO Auto-generated method stub
+ return idxIndexingProductsCheckMapper.updateByPrimaryKeyWithBLOBs(record);
+ }
+
+ @Override
+ public int updateByPrimaryKey(IdxIndexingProductsCheck record) {
+ // TODO Auto-generated method stub
+ return idxIndexingProductsCheckMapper.updateByPrimaryKey(record);
+ }
+
+ @Override
+ public PagedResult getProductThemeTableList(ProductThemeTableReqVo record) {
+ Integer pageNo = record.getPageNo() == null ? 1 : record.getPageNo();
+ Integer pageSize = record.getPageSize() == null ? 20 : record.getPageSize();
+ // startPage是告诉拦截器说我要开始分页了。分页参数是这两个。
+ PageHelper.startPage(pageNo, pageSize);
+ return BeanUtils.toPagedResult(idxIndexingProductsCheckMapper.selectSelective(record));
+ }
}
diff --git a/src/main/java/com/indexingsystem/system/service/impl/IdxTaskProductServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/IdxTaskProductServiceImpl.java
index 565a182538cb710645e8637430a4b40e56a9d7b7..77955b07be0d2e0968686240ab472c9127aa0206 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/IdxTaskProductServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/IdxTaskProductServiceImpl.java
@@ -1,72 +1,89 @@
package com.indexingsystem.system.service.impl;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
+import com.github.pagehelper.PageHelper;
import com.indexingsystem.boss.Vo.IdxTaskProductConditionVo;
+import com.indexingsystem.boss.Vo.RefIndexingReqVo;
+import com.indexingsystem.boss.Vo.RefIndexingResVo;
import com.indexingsystem.boss.admin.mapper.IdxTaskProductMapper;
+import com.indexingsystem.boss.common.BeanUtil;
+import com.indexingsystem.boss.common.PagedResult;
import com.indexingsystem.boss.entity.IdxTaskProduct;
import com.indexingsystem.system.service.IdxTaskProductService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
@Service
-public class IdxTaskProductServiceImpl implements IdxTaskProductService {
-
- @Resource
- private IdxTaskProductMapper idxTaskProductMapper;
- @Override
- public int deleteByPrimaryKey(String id) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.deleteByPrimaryKey(id);
- }
-
- @Override
- public int insert(IdxTaskProduct record) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.insert(record);
- }
-
- @Override
- public int insertSelective(IdxTaskProduct record) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.insertSelective(record);
- }
-
- @Override
- public IdxTaskProduct selectByPrimaryKey(String id) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.selectByPrimaryKey(id);
- }
-
- @Override
- public int updateByPrimaryKeySelective(IdxTaskProduct record) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.updateByPrimaryKeySelective(record);
- }
-
- @Override
- public int updateByPrimaryKey(IdxTaskProduct record) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.updateByPrimaryKey(record);
- }
-
- @Override
- public Integer deleteByIdBatch(List list) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.deleteByIdBatch( list );
- }
-
- @Override
- public List selectByCondition(IdxTaskProductConditionVo idxTaskProductConditionVo) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.selectByCondition( idxTaskProductConditionVo.getIds() );
- }
-
- @Override
- public List selectProductsByPrimaryKey(String taskProductId) {
- // TODO Auto-generated method stub
- return idxTaskProductMapper.selectProductsByPrimaryKey(taskProductId);
- }
+public class IdxTaskProductServiceImpl implements IdxTaskProductService {
+
+ @Resource
+ private IdxTaskProductMapper idxTaskProductMapper;
+
+
+ @Override
+ public int deleteByPrimaryKey(String id) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.deleteByPrimaryKey(id);
+ }
+
+ @Override
+ public int insert(IdxTaskProduct record) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.insert(record);
+ }
+
+ @Override
+ public int insertSelective(IdxTaskProduct record) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.insertSelective(record);
+ }
+
+ @Override
+ public IdxTaskProduct selectByPrimaryKey(String id) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public int updateByPrimaryKeySelective(IdxTaskProduct record) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.updateByPrimaryKeySelective(record);
+ }
+
+ @Override
+ public int updateByPrimaryKey(IdxTaskProduct record) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.updateByPrimaryKey(record);
+ }
+
+ @Override
+ public Integer deleteByIdBatch(List list) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.deleteByIdBatch(list);
+ }
+
+ @Override
+ public List selectByCondition(IdxTaskProductConditionVo idxTaskProductConditionVo) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.selectByCondition(idxTaskProductConditionVo.getIds());
+ }
+
+ @Override
+ public List selectProductsByPrimaryKey(String taskProductId) {
+ // TODO Auto-generated method stub
+ return idxTaskProductMapper.selectProductsByPrimaryKey(taskProductId);
+ }
+
+ @Override
+ public PagedResult getRefIndexingList(RefIndexingReqVo reqVo) {
+ Integer pageNo = reqVo.getPageNo() == null ? 1 : reqVo.getPageNo();
+ Integer pageSize = reqVo.getPageSize() == null ? 20 : reqVo.getPageSize();
+
+ // startPage是告诉拦截器说我要开始分页了。分页参数是这两个。
+ PageHelper.startPage(pageNo,pageSize);
+ return BeanUtil.toPagedResult(idxTaskProductMapper.selectRefIndexingByTaskId(reqVo.getTaskId()));
+ }
+
}
diff --git a/src/main/java/com/indexingsystem/system/service/impl/IdxTaskServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/IdxTaskServiceImpl.java
index ac0944d0b3b61f2eefec0b27c84502074eac2dce..92e13f2d7ee611b49f3edfd87736e74b849747c8 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/IdxTaskServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/IdxTaskServiceImpl.java
@@ -7,13 +7,13 @@ import com.indexingsystem.boss.admin.mapper.IdxTaskMapper;
import com.indexingsystem.boss.common.PagedResult;
import com.indexingsystem.boss.entity.IdxTask;
import com.indexingsystem.boss.entity.IdxTaskWithBLOBs;
-
+
import com.indexingsystem.boss.utils.BeanUtils;
-
+
import com.indexingsystem.boss.entity.IdxThemeWordsWithBLOBs;
-
+
import com.indexingsystem.system.service.IdxTaskService;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -123,7 +123,7 @@ public class IdxTaskServiceImpl implements IdxTaskService{
return parentList;
}
- @Override
+ @Override
public PagedResult getTasksList(TaskProductListReqVo taskProductListReqVo) {
Integer pageNo = taskProductListReqVo.getPageNo() == null ? 1 : taskProductListReqVo.getPageNo();
Integer pageSize = taskProductListReqVo.getPageSize() == null ? 10 : taskProductListReqVo.getPageSize();
@@ -136,7 +136,7 @@ public class IdxTaskServiceImpl implements IdxTaskService{
public Integer getTasksListCount(TaskProductListReqVo taskProductListReqVo) {
// TODO Auto-generated method stub
return idxTaskMapper.getTasksListCount( taskProductListReqVo );
- }
+ }
public List getTaskById(Integer taskId) {
// TODO Auto-generated method stub
return idxTaskMapper.getTaskById( taskId );
@@ -164,7 +164,7 @@ public class IdxTaskServiceImpl implements IdxTaskService{
}
}
return value;
-
+
}
}
diff --git a/src/main/java/com/indexingsystem/system/service/impl/IdxThemeTableGroupServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/IdxThemeTableGroupServiceImpl.java
index 38c4d0080971b3db9318715deae8e4c944344b15..30cbf47fcd560ee6978a463b82aedb4201b13c19 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/IdxThemeTableGroupServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/IdxThemeTableGroupServiceImpl.java
@@ -4,7 +4,7 @@ import com.indexingsystem.boss.admin.mapper.IdxThemeTableGroupMapper;
import com.indexingsystem.boss.entity.IdxThemeTableGroup;
import com.indexingsystem.boss.entity.IdxThemeTableGroupWithBLOBs;
import com.indexingsystem.system.service.IdxThemeTableGroupService;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/IdxThemeTableServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/IdxThemeTableServiceImpl.java
index e8ec5c81ea232020ea9f415252d60d8c4618e8cf..9f341b15eac870c99db0580ad8167aa14c214e66 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/IdxThemeTableServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/IdxThemeTableServiceImpl.java
@@ -1,16 +1,17 @@
package com.indexingsystem.system.service.impl;
import com.github.pagehelper.PageHelper;
+import com.indexingsystem.boss.Vo.ExportThemeWordsReqVo;
import com.indexingsystem.boss.Vo.IdxThemeTablesListVo;
import com.indexingsystem.boss.Vo.IdxThemeTableslReqVo;
import com.indexingsystem.boss.admin.mapper.IdxThemeTableMapper;
import com.indexingsystem.boss.common.PagedResult;
import com.indexingsystem.boss.entity.IdxThemeTable;
import com.indexingsystem.boss.entity.IdxThemeTableWithBLOBs;
-import com.indexingsystem.boss.entity.IdxThemeWordsWithBLOBs;
import com.indexingsystem.boss.utils.BeanUtils;
import com.indexingsystem.system.service.IdxThemeTableService;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -18,10 +19,10 @@ import java.util.ArrayList;
import java.util.List;
@Service
public class IdxThemeTableServiceImpl implements IdxThemeTableService {
-
+
@Resource
private IdxThemeTableMapper idxThemeTableMapper;
-
+
@Override
public int deleteByPrimaryKey(Integer themeTableId) {
return idxThemeTableMapper.deleteByPrimaryKey(themeTableId);
@@ -65,7 +66,7 @@ public class IdxThemeTableServiceImpl implements IdxThemeTableService {
List list = selectAllParentIdByParentId(parentList,parentIdList);
return list;
}
-
+
/**
* 根据父级id查询所有父级id
*/
@@ -123,7 +124,7 @@ public class IdxThemeTableServiceImpl implements IdxThemeTableService {
public Integer deleteByIdBatch(List list) {
return idxThemeTableMapper.deleteByIdBatch( list );
}
-
+
@Override
public Integer updateThemeTablesById(List list) {
Integer value = 0;
@@ -159,5 +160,20 @@ public class IdxThemeTableServiceImpl implements IdxThemeTableService {
return idxThemeTableMapper.selectIdxThemeTableCount(idxThemeTableslReqVo);
}
+ @Override
+ public String export(ExportThemeWordsReqVo reqVo, HSSFWorkbook wb) {
+
+ String filenameSuffix = reqVo.getExportPath().split("\\.")[1];
+ if (filenameSuffix.equals("xml")) {
+
+ } else if (filenameSuffix.equals("xls")) {
+
+ } else {
+ return "保存文件类型错误";
+ }
+
+ return null;
+ }
+
}
diff --git a/src/main/java/com/indexingsystem/system/service/impl/IdxThemeWordsServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/IdxThemeWordsServiceImpl.java
index 96c0343107ab3df96e7eaafab64880eb06358a83..94f023cd0607b0cfdcdfbe4126579641d1fdf3ff 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/IdxThemeWordsServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/IdxThemeWordsServiceImpl.java
@@ -5,7 +5,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/InstitutionsServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/InstitutionsServiceImpl.java
index 5e6a17187507e6e893071d39e6250de2f809bf33..1939e99d980cbab36f219c8c42cfc654db072e77 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/InstitutionsServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/InstitutionsServiceImpl.java
@@ -16,7 +16,7 @@ import java.util.Set;
import javax.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/PavilionColumnsServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/PavilionColumnsServiceImpl.java
index f4803963e3842a60d5af2851b93dc5add466fa31..3ddfb844882124bc1146d45f4f45f8ec63e58287 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/PavilionColumnsServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/PavilionColumnsServiceImpl.java
@@ -7,7 +7,7 @@ import java.util.Set;
import javax.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/PavilionsCommonServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/PavilionsCommonServiceImpl.java
index 5e1668dff331aff87dedc2804f6d2b6709fe49cf..7aa5b05a08addaafa552bf55a7955bdfba22e2d0 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/PavilionsCommonServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/PavilionsCommonServiceImpl.java
@@ -9,7 +9,7 @@ import java.util.Set;
import javax.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/PusersServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/PusersServiceImpl.java
index e3c04b435d4d3aded08c4ac09ceae623d7b76956..29bb6b815ae6c6ca554e21771adc56073311a71f 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/PusersServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/PusersServiceImpl.java
@@ -5,7 +5,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/ResCategoryRelationsServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/ResCategoryRelationsServiceImpl.java
index d1a797e219001fe400f6fd5ed70ce64621dd3e6e..7965b1af1122cf33f8b1e5e44f9f72751dae5ddd 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/ResCategoryRelationsServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/ResCategoryRelationsServiceImpl.java
@@ -10,7 +10,7 @@ import javax.annotation.Resource;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.indexingsystem.boss.Vo.ResCategoryRelationsVo;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/ResourceCategorsServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/ResourceCategorsServiceImpl.java
index e29f7d70f0231c53bce5123f7b1b02c67336ff36..110b6e103dbcbdd07074c9d14bddcdf405852940 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/ResourceCategorsServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/ResourceCategorsServiceImpl.java
@@ -6,7 +6,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
diff --git a/src/main/java/com/indexingsystem/system/service/impl/TablesServiceImpl.java b/src/main/java/com/indexingsystem/system/service/impl/TablesServiceImpl.java
index fe1301c94e9967aaaea87d09635ba5c3681a595a..893f81b368c92e1c7a22c8f92e1d36e4bb8aa4f9 100644
--- a/src/main/java/com/indexingsystem/system/service/impl/TablesServiceImpl.java
+++ b/src/main/java/com/indexingsystem/system/service/impl/TablesServiceImpl.java
@@ -4,7 +4,7 @@ import java.util.List;
import javax.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
diff --git a/src/main/java/com/indexingsystem/system/task/ExportInstitutionList.java b/src/main/java/com/indexingsystem/system/task/ExportInstitutionList.java
index 491d3ef89a026b338f5b97cf147355a2443a5b82..82dddf02ec0785928fd5418e66fbc98fca79a0cc 100644
--- a/src/main/java/com/indexingsystem/system/task/ExportInstitutionList.java
+++ b/src/main/java/com/indexingsystem/system/task/ExportInstitutionList.java
@@ -11,7 +11,7 @@ import java.util.ResourceBundle;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
diff --git a/src/main/java/com/indexingsystem/system/test/controller/testController.java b/src/main/java/com/indexingsystem/system/test/controller/testController.java
new file mode 100644
index 0000000000000000000000000000000000000000..f3f4371be325b11b1eda2cb6dc75196edfa847cb
--- /dev/null
+++ b/src/main/java/com/indexingsystem/system/test/controller/testController.java
@@ -0,0 +1,18 @@
+package com.indexingsystem.system.test.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class testController {
+
+ private static final Logger log = LoggerFactory.getLogger(testController.class);
+ @RequestMapping("/mineary/goMineary.do")
+ protected String goMineary() {
+ log.info("/mineary/goMineary.do");
+ log.info("mineary/mineary");
+ return "mineary/mineary";
+ }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 28ea817b829fbe9e1f6bf985879b58f02ff12471..656adfd828011794efcfaa8ed2591efcb7d8f484 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,11 +1,11 @@
##JDBC Global Setting
readjdbc.driver=com.mysql.jdbc.Driver
-readjdbc.url=jdbc:mysql://192.168.0.171:3306/indexingsystem?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8
+readjdbc.url=jdbc:mysql://localhost:3306/indexingsystem?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8
readjdbc.username=root
readjdbc.password=root
writejdbc.driver=com.mysql.jdbc.Driver
-writejdbc.url=jdbc:mysql://192.168.0.171:3306/indexingsystem?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8
+writejdbc.url=jdbc:mysql://localhost:3306/indexingsystem?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8
writejdbc.username=root
writejdbc.password=root
@@ -21,18 +21,18 @@ writejdbc.password=root
#writejdbc.password=password
-#配置初始化大小、最小、最大
+#\u914D\u7F6E\u521D\u59CB\u5316\u5927\u5C0F\u3001\u6700\u5C0F\u3001\u6700\u5927
ds.initialSize=1
ds.minIdle=1
ds.maxActive=20
-#配置获取连接等待超时的时间
+#\u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
ds.maxWait=20000
-#配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+#\u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
ds.timeBetweenEvictionRunsMillis=20000
-#配置一个连接在池中最小生存的时间,单位是毫秒
+#\u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
ds.minEvictableIdleTimeMillis=300000
#shiro
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 4e014e1896e9e103a9660605e503fb657e771a0c..cf127c633d113d59f233d36d5da52335f9f50725 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -497,9 +497,13 @@
type="int" />
-
-
+
-
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/redis.properties b/src/main/resources/redis.properties
index eb319486628e6598a76af0b596d695d2b1d17a40..5a083821eaf3f2761ce114d67de4c8aeba820314 100644
--- a/src/main/resources/redis.properties
+++ b/src/main/resources/redis.properties
@@ -1,35 +1,39 @@
#---------Read Redis config---------------
-#\u6700\u5927\u5206\u914d\u7684\u5bf9\u8c61\u6570
+#\u6700\u5927\u5206\u914D\u7684\u5BF9\u8C61\u6570
read.redis.pool.maxTotal=1024
-#\u6700\u5927\u80fd\u591f\u4fdd\u6301idel\u72b6\u6001\u7684\u5bf9\u8c61\u6570
+#\u6700\u5927\u80FD\u591F\u4FDD\u6301idel\u72B6\u6001\u7684\u5BF9\u8C61\u6570
read.redis.pool.maxIdle=200
-#\u5f53\u6c60\u5185\u6ca1\u6709\u8fd4\u56de\u5bf9\u8c61\u65f6\uff0c\u6700\u5927\u7b49\u5f85\u65f6\u95f4
+#\u5F53\u6C60\u5185\u6CA1\u6709\u8FD4\u56DE\u5BF9\u8C61\u65F6\uFF0C\u6700\u5927\u7B49\u5F85\u65F6\u95F4
read.redis.pool.maxWaitMillis=1000
-#\u5f53\u8c03\u7528borrow Object\u65b9\u6cd5\u65f6\uff0c\u662f\u5426\u8fdb\u884c\u6709\u6548\u6027\u68c0\u67e5
+#\u5F53\u8C03\u7528borrow Object\u65B9\u6CD5\u65F6\uFF0C\u662F\u5426\u8FDB\u884C\u6709\u6548\u6027\u68C0\u67E5
read.redis.pool.testOnBorrow=true
-#\u5f53\u8c03\u7528return Object\u65b9\u6cd5\u65f6\uff0c\u662f\u5426\u8fdb\u884c\u6709\u6548\u6027\u68c0\u67e5
+#\u5F53\u8C03\u7528return Object\u65B9\u6CD5\u65F6\uFF0C\u662F\u5426\u8FDB\u884C\u6709\u6548\u6027\u68C0\u67E5
read.redis.pool.testOnReturn=true
#IP
-read.redis.ip=118.31.66.123
-#Port
+#read.redis.ip=118.31.66.123
+#mineary:\u672C\u5730\u6D4B\u8BD5
+read.redis.ip=localhost
+#Port
read.redis.port=6379
#---------Write Redis config---------------
-#\u6700\u5927\u5206\u914d\u7684\u5bf9\u8c61\u6570
+#\u6700\u5927\u5206\u914D\u7684\u5BF9\u8C61\u6570
write.redis.pool.maxTotal=1024
-#\u6700\u5927\u80fd\u591f\u4fdd\u6301idel\u72b6\u6001\u7684\u5bf9\u8c61\u6570
+#\u6700\u5927\u80FD\u591F\u4FDD\u6301idel\u72B6\u6001\u7684\u5BF9\u8C61\u6570
write.redis.pool.maxIdle=200
-#\u5f53\u6c60\u5185\u6ca1\u6709\u8fd4\u56de\u5bf9\u8c61\u65f6\uff0c\u6700\u5927\u7b49\u5f85\u65f6\u95f4
+#\u5F53\u6C60\u5185\u6CA1\u6709\u8FD4\u56DE\u5BF9\u8C61\u65F6\uFF0C\u6700\u5927\u7B49\u5F85\u65F6\u95F4
write.redis.pool.maxWaitMillis=1000
-#\u5f53\u8c03\u7528borrow Object\u65b9\u6cd5\u65f6\uff0c\u662f\u5426\u8fdb\u884c\u6709\u6548\u6027\u68c0\u67e5
+#\u5F53\u8C03\u7528borrow Object\u65B9\u6CD5\u65F6\uFF0C\u662F\u5426\u8FDB\u884C\u6709\u6548\u6027\u68C0\u67E5
write.redis.pool.testOnBorrow=true
-#\u5f53\u8c03\u7528return Object\u65b9\u6cd5\u65f6\uff0c\u662f\u5426\u8fdb\u884c\u6709\u6548\u6027\u68c0\u67e5
+#\u5F53\u8C03\u7528return Object\u65B9\u6CD5\u65F6\uFF0C\u662F\u5426\u8FDB\u884C\u6709\u6548\u6027\u68C0\u67E5
write.redis.pool.testOnReturn=true
#IP
-write.redis.ip=118.31.66.123
-#Port
+#write.redis.ip=118.31.66.123
+#mineary:\u672C\u5730\u6D4B\u8BD5
+write.redis.ip=localhost
+#Port
write.redis.port=6379
#Page query expire time (second)
diff --git a/src/main/resources/spring-cache.xml b/src/main/resources/spring-cache.xml
index bc1ad53c46852c1d0e1799422b5e38dbe3cd36fa..9588ff4b71dc7476c7f096d4d175a730348b34b9 100644
--- a/src/main/resources/spring-cache.xml
+++ b/src/main/resources/spring-cache.xml
@@ -24,10 +24,13 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- classpath:messages
- classpath:org/hibernate/validator/ValidationMessages
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/plain;charset=UTF-8
- application/json;charset=UTF-8
- */*;charset=UTF-8
- text/*;charset=UTF-8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- com.ssm.maven.core.service.*
- com.ssm.maven.core.dao.*
-
-
-
-
-
-
+ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain;charset=UTF-8
+ application/json;charset=UTF-8
+ */*;charset=UTF-8
+ text/*;charset=UTF-8
+
+
+
+
+ WriteMapNullValue
+ QuoteFieldNames
+ WriteDateUseDateFormat
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ classpath:messages
+ classpath:org/hibernate/validator/ValidationMessages
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/plain;charset=UTF-8
+ application/json;charset=UTF-8
+ */*;charset=UTF-8
+ text/*;charset=UTF-8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.ssm.maven.core.service.*
+ com.ssm.maven.core.dao.*
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/mineary/jquery-3.3.1.js b/src/main/webapp/WEB-INF/jsp/mineary/jquery-3.3.1.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b5206bcc60781905d111863bdb6232d90490f33
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/mineary/jquery-3.3.1.js
@@ -0,0 +1,10364 @@
+/*!
+ * jQuery JavaScript Library v3.3.1
+ * https://jquery.com/
+ *
+ * Includes Sizzle.js
+ * https://sizzlejs.com/
+ *
+ * Copyright JS Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2018-01-20T17:24Z
+ */
+( function( global, factory ) {
+
+ "use strict";
+
+ if ( typeof module === "object" && typeof module.exports === "object" ) {
+
+ // For CommonJS and CommonJS-like environments where a proper `window`
+ // is present, execute the factory and get jQuery.
+ // For environments that do not have a `window` with a `document`
+ // (such as Node.js), expose a factory as module.exports.
+ // This accentuates the need for the creation of a real `window`.
+ // e.g. var jQuery = require("jquery")(window);
+ // See ticket #14549 for more info.
+ module.exports = global.document ?
+ factory( global, true ) :
+ function( w ) {
+ if ( !w.document ) {
+ throw new Error( "jQuery requires a window with a document" );
+ }
+ return factory( w );
+ };
+ } else {
+ factory( global );
+ }
+
+// Pass this if window is not defined yet
+} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
+// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
+// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
+// enough that all such attempts are guarded in a try block.
+"use strict";
+
+var arr = [];
+
+var document = window.document;
+
+var getProto = Object.getPrototypeOf;
+
+var slice = arr.slice;
+
+var concat = arr.concat;
+
+var push = arr.push;
+
+var indexOf = arr.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var fnToString = hasOwn.toString;
+
+var ObjectFunctionString = fnToString.call( Object );
+
+var support = {};
+
+var isFunction = function isFunction( obj ) {
+
+ // Support: Chrome <=57, Firefox <=52
+ // In some browsers, typeof returns "function" for HTML