修改关键字大小写匹配问题

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/constant/Constant.java

@@ -19,7 +19,7 @@ public class Constant {
     public static final Integer UN_HANDLE = 0;//定时任务未处理的状态码
     public static final String PIC_PATH_PREFIX = "";//定时任务未处理的状态码
     public static final String COMMON_SOFTWARE_KEYWORDS = "keyWords";//常用软件关键字
-    public static final String[] keyWords = new String[]{"Intellij IDEA","Eclipse",
+    public static final String[] keyWords = new String[]{"IntelliJ IDEA","Eclipse",
             "Postman","MyEclipse","Visual Studio Code",
             "Navicat","Pycharm","Android Studio",
             "WebStorm","SQLyog","PhpStorm",

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.Set;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 吴涛涛
@@ -50,7 +50,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
     public HttpRespMsg saveAndProcessImage(ScreenshotVO screenshotvo) {
         String filePath = UploadFileToFileNameUtil.uploadFile(screenshotvo.getFile(), path);
         Screenshot screenshot = new Screenshot();
-        BeanUtils.copyProperties(screenshotvo,screenshot);
+        BeanUtils.copyProperties(screenshotvo, screenshot);
         screenshot.setPicUrl(filePath);
         screenshot.setDateStr(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(screenshotvo.getIndate()));
         String accessToken = "";
@@ -65,21 +65,26 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
 //        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 //        LocalDateTime l = LocalDateTime.parse("2019-02-03",dateTimeFormatter);
         Map<String, Object> picResultMap = CheckPicUtil.generalPicTextContentMap(path + filePath.substring("/upload/".length()), accessToken);
-        List<String> textContents = (List<String>)picResultMap.get("wordsList");
-        screenshot.setPicContext((String)picResultMap.get("picContent"));
+        List<String> textContents = (List<String>) picResultMap.get("wordsList");
+        screenshot.setPicContext((String) picResultMap.get("picContent"));
         Set<Object> members = redisUtil.members(Constant.COMMON_SOFTWARE_KEYWORDS);
-            for (String textContent : textContents) {
-                for (Object member : members) {
-                    //由于redis里存储的member是一个PicContentKeywords类型的json字符串，所以取出关键字内容比较
-                    JSONObject jsonMember = JSON.parseObject((String)member);
-                    if (textContent.contains(jsonMember.getString("content"))) {
-                        //包含关键字们可以简单认为是在用常用开发软件
-                        screenshot.setIsHandle(1);
-                        //确定图片是哪个类型的图片
-                        screenshot.setPicType(jsonMember.getInteger("type"));
-                    }
+        for (String textContent : textContents) {
+            for (Object member : members) {
+                //由于redis里存储的member是一个PicContentKeywords类型的json字符串，所以取出关键字内容比较
+                JSONObject jsonMember = JSON.parseObject((String) member);
+                System.out.println(jsonMember.getString("content"));
+                System.out.println("textContent----->"+textContent);
+                if (textContent.contains(jsonMember.getString("content"))) {
+                    System.out.println("进来了判断=====");
+                    System.out.println("content=====" + jsonMember.getString("content"));
+                    System.out.println("textContent=====" + textContent);
+                    //包含关键字们可以简单认为是在用常用开发软件
+                    //确定图片是哪个类型的图片
+                    screenshot.setPicType(jsonMember.getInteger("type"));
                 }
             }
+        }
+        screenshot.setIsHandle(1);
         screenshotMapper.insert(screenshot);
         return new HttpRespMsg();
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/test/TestApplicationTests.java

@@ -29,13 +29,15 @@ public class TestApplicationTests {
     private PicContentKeywordsMapper picContentKeywordsMapper;
     @Test
     public void contextLoads() {
-        //初始化redis关键词
-//        List<PicContentKeywords> picContentKeywords = picContentKeywordsMapper.selectList(null);
-//        for (PicContentKeywords  keyWord : picContentKeywords) {
-//            redisUtil.sSetJsonString("keyWords",keyWord);
-//        }
-//        redisUtil.deleteKey("list1");
-//        Set<Object> keyWords = redisUtil.members("keyWords");
+//        //初始化redis关键词
+        redisUtil.deleteKey("keyWords");
+        List<PicContentKeywords> picContentKeywords = picContentKeywordsMapper.selectList(null);
+        for (PicContentKeywords  keyWord : picContentKeywords) {
+            redisUtil.sSetJsonString("keyWords",keyWord);
+        }
+
+        Set<Object> keyWords = redisUtil.members("keyWords");
+        System.out.println(keyWords.toString());
 //        for (Object keyWord : keyWords) {
 //            JSONObject jsonMember = JSON.parseObject((String)keyWord);
 //            System.out.println(jsonMember.getString("content"));
@@ -43,14 +45,14 @@ public class TestApplicationTests {
 //        }
 
 
-        Map<String,Object> map = AuthService.getAuth(Constant.API_KEY, Constant.SECRET_KEY);
-        String accessToken = (String)map.get("access_token");
-        Long expiresTimeOut = (Long)map.get("expires_in");
-        System.out.println("accessToken:==="+accessToken);
-        System.out.println("expiresTimeOut:==="+expiresTimeOut);
-        redisUtil.setKeyWithExpireTime("accessToken",accessToken,expiresTimeOut);
-//        redisUtil.setString("wtt","aaa");
-        System.out.println(redisUtil.getKey("accessToken"));
+//        Map<String,Object> map = AuthService.getAuth(Constant.API_KEY, Constant.SECRET_KEY);
+//        String accessToken = (String)map.get("access_token");
+//        Long expiresTimeOut = (Long)map.get("expires_in");
+//        System.out.println("accessToken:==="+accessToken);
+//        System.out.println("expiresTimeOut:==="+expiresTimeOut);
+//        redisUtil.setKeyWithExpireTime("accessToken",accessToken,expiresTimeOut);
+////        redisUtil.setString("wtt","aaa");
+//        System.out.println(redisUtil.getKey("accessToken"));
 
 //        for (String keyWord : Constant.keyWords) {
 //            redisUtil.sSet("keyWords",keyWord);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CheckPicUtil.java

@@ -127,6 +127,9 @@ public class CheckPicUtil {
     }
 
     public static void main(String[] args) {
-        CheckPicUtil.generalPicTextContent("D:\\360MoveData\\Users\\Administrator\\Desktop\\idea.jpg",(String)AuthService.getAuth().get("access_token"));
+//        CheckPicUtil.generalPicTextContent("D:\\360MoveData\\Users\\Administrator\\Desktop\\idea.jpg",(String)AuthService.getAuth().get("access_token"));
+
+        System.out.println("m]- IntelliJ IDEA(Administrator)".contains("Intellij IDEA"));
+
     }
 }