Merge remote-tracking branch 'origin/master'

jpcj-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -180,22 +180,7 @@ public class SysLoginController
 
     }
 
-//
-//    /**
-//     * 用户 jscode登录
-//     *
-//     */
-//    @PostMapping("/login/jscode-test")
-//    @ApiOperation("用户jscode登录(测试，固定openid)")
-//    public Response<TokenDTO> getInfoTest(String jscode){
-//        TokenDTO tokenDTO = new TokenDTO();
-//            // 生成令牌
-//        String token = loginService.login("oO7PJ5CPQJo62kZWA3uiUX2KG2s4",null, StudentLoginTypeEnum.AUTHORIZATION_CODE_LOGIN.getCode());
-//        tokenDTO.setToken(token);
-//        return Response.success(tokenDTO) ;
-//
-//
-//    }
+
 
 
     /**

jpcj-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.17.0.6:3306/jpcj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/jpcj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                #url: jdbc:mysql://172.17.0.6:3306/jpcj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: Miaxis@2020
             # 从库数据源
@@ -58,9 +59,10 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 172.17.66.3
+#        host: 172.17.66.3
+        host: sh-crs-lfzs3n8w.sql.tencentcdb.com
         # 端口，默认为6379
-        port: 6379
+        port: 29466
         # 密码
         password: miaxis110
         # 连接超时时间

jpcj-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.miaxis.JpcjApplication;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.utils.http.HttpUtils;
 import com.miaxis.feign.dto.WxGzhBatchUser;
 import com.miaxis.feign.service.IWxSendService;
 import com.miaxis.spread.service.impl.WxSpreadRelationServiceImpl;
@@ -19,7 +20,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
-@ActiveProfiles("prodtest")
+@ActiveProfiles("dev")
 @SpringBootTest(classes = JpcjApplication.class)
 @RunWith(SpringRunner.class)
 public class NormalTest {
@@ -34,6 +35,7 @@ public class NormalTest {
     IWxGzhService wxGzhService;
     @Resource
     IUserInfoService userInfoService;
+
     @Test
     public void test666() throws Exception {
         String gzhToken = wxGzhService.getGzhToken();
@@ -88,8 +90,25 @@ public class NormalTest {
             index++;
         }
         userInfoService.updateBatchById(list);
+
+
+
     }
 
+    @Test
+    public void test4447() throws Exception {
+        String gzhToken = wxGzhService.getGzhToken();
+    }
+
+    public static void main(String[] args) {
+        String url ="https://sirius.kakamobi.cn/api/open/traffic-icon/icon-list.htm";
+        String param = "_appName=jiakaozhushou&_clv=1024&_launch=8&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=6edd66e6ce8fa26c21b8e9509f70ddf8&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12QO04CYRSF7%2FN%2FZG5DdRsIa3ALosOQaQjMBE1Eos0fuwkaGnsTV%2BAyLOxdBXE9UkhjdZpz8uU7M7ueXXX%2BbIzMY9QxhhGmilLF4mIAacoAEhU4RFT2td083N7vulF89GAkCIh%2BZ0CkHo3jFEkCpKSniJRcz53GBKVpIGKp60ZLizUXGZKUZmjDIJkH4MGX9vPxfXz7PL5%2F%2BYttltvLzud22L86Wc6pS5uepWfFVYY%2BrLln2qTVEnUl5OkM21kQ9K2x1%2F%2FMFCpCPxhkoph5UWJusbSsTVGWecEQF0kUTwK17%2F%2FGYcwywlyRVKdHJhdPv8lP2EY3AQAA&_vendor=appstore&_version=8.13.2&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.13.2&carType=car&groupId=1&patternCode=101&sceneCode=101&score12=0&sign=90620500420099af09ae692c81d3ed21";
+        String s = HttpUtils.sendGet(url, param);
+        //JSONObject j
+        System.out.println(s);
+    }
+
+
 
 
 

jpcj-admin/src/test/java/com/miaxis/test/Script1.java

@@ -0,0 +1,282 @@
+package com.miaxis.test;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.miaxis.JpcjApplication;
+import com.miaxis.common.utils.http.HttpUtils;
+import com.miaxis.icon.domain.IconCategory;
+import com.miaxis.icon.domain.IconCategoryImage;
+import com.miaxis.icon.domain.IconInfo;
+import com.miaxis.icon.domain.IconQuestion;
+import com.miaxis.icon.service.IIconCategoryImageService;
+import com.miaxis.icon.service.IIconCategoryService;
+import com.miaxis.icon.service.IIconInfoService;
+import com.miaxis.icon.service.IIconQuestionService;
+import com.miaxis.web.domain.WebNote;
+import com.miaxis.web.service.IWebNoteService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@ActiveProfiles("dev")
+@SpringBootTest(classes = JpcjApplication.class)
+@RunWith(SpringRunner.class)
+public class Script1 {
+
+//
+//    @Resource
+//    ITQuestionService questionService;
+
+    @Resource
+    IWebNoteService webNoteService;
+
+
+    @Resource
+    IIconInfoService iIconInfoService;
+
+    @Resource
+    IIconQuestionService iIconQuestionService;
+
+    @Resource
+    IIconCategoryService iIconCategoryService;
+
+    @Resource
+    IIconCategoryImageService iIconCategoryImageService;
+    @Test
+    public void Scrip1() throws Exception {
+
+        //插入图标分类以及分类图标对应关系
+       // setCategoryData();
+        //插入图标信息以及图标题目对应关系
+        setIconData();
+        //根据题目匹配
+        //matchByAnwser();
+    }
+
+    private void setCategoryData() {
+        String url ="https://sirius.kakamobi.cn/api/open/traffic-icon/group-list.htm";
+        String param = "_appName=jiakaozhushou&_clv=1024&_launch=12&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=f276d9e9cb131b8208b72f9f09e6a8fd&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PPU4CURRG3ZJhCTYuwMbSDRiX8BrtiZJpLBjFbsKQGQiIie7C%2Br37W9zJe9eGkNBIIY3V13wnJ2dmL7PX3p%2BMhOggcJC0kzJwGQgdTbXsSRUjKKUoQL60r4fP902%2Fi%2FeejFFUxD9MmcGjUdwLY9JS4DiRi8Pp0xoKtq1GCXXdQmikpoBVwdBWTaowU6VU%2BdrO765HN5ej2yt%2FtMV6%2B9b71MaTZ2fLufRl0RF2BLLK2qUldcSLsloLrJC9nGQbSyi%2BNfL6XxnowOJj08wcM81DzI2EhqANQDgNkuK8IMgxoPbJH5wOFHeSBz3CfHbx%2FfMLCV%2BJzjcBAAA%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&patternCode=101&sceneCode=101&score12=0&sign=731a6fcb825f5490e321e7f05a18fca2";
+        String s = HttpUtils.sendGet(url, param);
+        JSONObject wholeData = JSONObject.parseObject(s);
+        JSONObject data = wholeData.getJSONObject("data");
+        JSONArray itemList =  data.getJSONArray("itemList");
+        if (itemList == null) return ;
+        for (int i=0 ;i <itemList.size();i++){
+            JSONObject item = itemList.getJSONObject(i);
+            IconCategory iconCategory =  new IconCategory();
+            String name = unicodeToCN(item.getString("name"));
+            iconCategory.setCategory(name);
+
+            iIconCategoryService.save(iconCategory);
+            JSONArray imageList = item.getJSONArray("imageList");
+            if (imageList != null){
+                for (int j=0 ;j <imageList.size();j++){
+                    String imageStr =  imageList.getString(j);
+                    IconCategoryImage iconCategoryImage= new IconCategoryImage();
+                    iconCategoryImage.setImageurl(imageStr);
+                    iconCategoryImage.setCategory(name );
+                    iIconCategoryImageService.save(iconCategoryImage);
+                }
+            }
+
+        }
+
+    }
+
+    private void setIconData() throws Exception {
+        String url ="https://sirius.kakamobi.cn/api/open/traffic-icon/icon-list.htm";
+        String param = "_appName=jiakaozhushou&_clv=1024&_launch=8&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=6edd66e6ce8fa26c21b8e9509f70ddf8&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12QO04CYRSF7%2FN%2FZG5DdRsIa3ALosOQaQjMBE1Eos0fuwkaGnsTV%2BAyLOxdBXE9UkhjdZpz8uU7M7ueXXX%2BbIzMY9QxhhGmilLF4mIAacoAEhU4RFT2td083N7vulF89GAkCIh%2BZ0CkHo3jFEkCpKSniJRcz53GBKVpIGKp60ZLizUXGZKUZmjDIJkH4MGX9vPxfXz7PL5%2F%2BYttltvLzud22L86Wc6pS5uepWfFVYY%2BrLln2qTVEnUl5OkM21kQ9K2x1%2F%2FMFCpCPxhkoph5UWJusbSsTVGWecEQF0kUTwK17%2F%2FGYcwywlyRVKdHJhdPv8lP2EY3AQAA&_vendor=appstore&_version=8.13.2&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.13.2&carType=car&groupId=1&patternCode=101&sceneCode=101&score12=0&sign=90620500420099af09ae692c81d3ed21";
+        String category = "停车让行";
+        saveDataByCategory(url,param,category);
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=12&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=d84a0f0e954177d480052f28d4e76eb9&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12Pu04CURRF%2BQV7axP%2FwN6vMvyLzZncx3mS0JyK%2BjZa2RAl04wMo5ggJkpmIEghjdVu9srKWsPb%2Bn3wF2BlnipONc80VhIrJicwixM2o4TGOSmy7%2BHn8ftzM8zSg2cQUlP1LzAR9AScJiqULUY8TZLoeP60QEpta0lL17VYGu24UB2ptHWTawpcG9d%2BhLubi%2FH1aHx16c%2BwO24%2FBl%2FBfPHkAiHEIe56pp5RD8H6vOeeZRcPR8UDicezbAOZ1LfA3v0rQ6tEfQ4WRFLgZUmh0dIwtgWZVkVzWkZCPQV0vviD85TTTENlJ1hGt%2Fevv3A7cow3AQAA&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=2&patternCode=101&sceneCode=101&score12=0&sign=0d297639ffac5e96017659d4d394b346";
+        category = "警告标志";
+        saveDataByCategory(url,param,category);
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=245e01e9f78e99afc20a3f8e6ae36733&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PO04CYRRGXQxxI%2FRuwdIdmNhN0NBYafO3BGaCJiKJ4DBkKpdCdRsS7vN%2FZG4hhTRWX%2FOdnJyNf2%2B2NTy6kMiR7EjxQHngPIiCOmI%2BCaImQ4mJTGDhby%2Fvn%2Bv6kF4hOishEXw4Mhskl3Qi1og523kSZ7DLp3Ml7TpMFNq2s9BTK0GrrKGr%2BlhpkQqlgplf392M7m9HD2N48uVs9VXDzqeTZ2AvJdd52Yg2YjQv2MSFNMLLPJ%2BRzZUhX2Rrj0qwcoH2X5nhwARTx8KciuxDKj2FXqwLJroLFNM%2Bq9E5oIXJHxyPkg5UBjzDfDX%2BWfwCRvMztDcBAAA%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=3&patternCode=101&sceneCode=101&score12=0&sign=54de2c13f0c19b1c65a232a77e66c652";
+        category = "指示标志";
+        saveDataByCategory(url,param,category);
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=04e3278c5603be353d6e178c7b37a5cd&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PMU7DQBBFN3JHwAGJECuxlRqaLWisgKJdeYqZnZndJlLkam6BxF0i7sIFuAIlN6ChwQVpqH7zn57eHK7ml609ARPzgfRAeaQwpDCwmABiODKiFEXOhZRtA9f3N3erdiwPliEJIZHdAqakVoDLkZJkDEGnKSmYnj8OhMQ5LOTr2qmvqGYvfRDv%2Bir3ErlH7q2Bt8%2Fv08fX6f3HnmHbLC9aW8B%2B92gJYgxt2HYsHSutI3Z5wx2nbVg3pGtJFs6yFWQhWwJb%2Fa9McUhke8CYUok88yVW5CtW55Vl4SmXWRClKaC23R%2BcD1xGigNOcHLD68svoSiy0TcBAAA%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=4&patternCode=101&sceneCode=101&score12=0&sign=f97403ecc2f8ed22b7887784603e94a1";
+        category = "指路标志";
+        saveDataByCategory(url,param,category);
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=1ea37c194894b773c4da54636d7b737a&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PvUoDURBGRY35geyym8bARrGLSxDsBLmVJE2YYu%2BFYX7unXkAX0XyZla2ljY%2BgL0pTGP1Nd%2FhcJZ4u7yp4B5ZmXfqO817jQPFgQ0MReKWRay4cC7qDFM8f764HFX78gQZyVRU4QqFyKEgl62SZYnRj1Mogp8%2BLZpa20rR0HWth0Y7DtZHC23f5N4S98I9zPDt%2Fevw%2BXP4%2BIYHnM%2FG1xWscLO%2BA8KUYhXnNVvNrpMkdZ5yzTSPk5n6xAjiSTbCbApjZOj%2BlbkMpLBBSUQl8SKU1Gho2NvgbKuguSyiuR4DOlj%2FwXnHZa9pkCNMZy%2Bvj7%2BTkAIvNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=5&patternCode=101&sceneCode=101&score12=0&sign=eda769364f752677375c35d708d92208";
+        category = "交警手势信号";
+        saveDataByCategory(url,param,category);
+
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=1072d1a4ebf8a6294b9e662e097f74b2&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PPUoDURRGxQ1YuAxrG1s3E9yLewikvARu8R5z73v3p1TCkCzgoRijMENC0kwYnYAxhWmsvuY7HM4Rv49fDSzQ1X2sPNY01VBZqJyAUCRMXIQyi6es7LDDj5fP91Uzza%2BQ0EhFFd5QzBgyep6oUZIQ%2BDTZAvD50yEpdZ1kLcPQcel18EJ1oNLVfaopei1ewwYfbi5Hd9ej2yt4xvVm%2BdPAAWfzJzCMMTRh3Tq1zrqN0qadt27rsN0ob8kgnGUrTKSwRIfhXxlLZQozlGiWo%2B9Ljr2W3rkr7HQomvI%2BEOspYID5H5zGnqcaKznBdnH%2F6L%2BgIeVLNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=6&patternCode=101&sceneCode=101&score12=0&sign=9f16fda22d7461a759cac36ce9fe2252";
+        category = "旅游区标志";
+        saveDataByCategory(url,param,category);
+
+
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=980f0a8444dd6661705622512a74ee6d&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PPUoDURRG3YadZCsiuAVLd%2BAODBKns3ggWGcmCcaATtSUMyldx61CUr13f%2BHCvGcK01h9zXc4nI1%2FbT5reHQxkYPRweLO8sB5EAR01bwXVUykEpORwNzfXz5el%2FUuPUN0RlMzeHNlJkguaW%2BMUXOm4yTOQKdP72jY95ostG1PobNWAlYZQ191scIilUoFC7%2B4vR7d3Yzur%2BDBp4vVdw1rH0%2BegL2UXOdpI9gI2axoE%2BfSCE%2FzbGE0Q4Z8ki09osHKBdp%2FZaQDG4xdC3Mqsg2pdBY6oT6Q4DpYTNuMZMeAFiZ%2FcDxI2lkZ9Ajz2eXP%2BS8PCzKYNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=7&patternCode=101&sceneCode=101&score12=0&sign=5503b516040b4c4aa28b555983dbc0c3";
+        category = "道路施工安全标志";
+        saveDataByCategory(url,param,category);
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=8ff02d1e2f12cbfef0d702467b3504e8&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PvUoDURBGhTBlwvzcO8PeC9P4Ikkku6DGGNgou2niEgQ7Qe4j%2BAZ2Vva%2Bgp3kscQUprH6mu9wOGu%2FX9%2FV8OAkRBOxiYSRpApTRQrqzGlMzBqNKUQxgplfvlxdL%2BtRfIbgqMIicOOMaBCd4lhQA6dkx4mYwE6f3lW07zlKadveSictFR2Sln7owqCZBqYB5v79%2Bnl4%2Bzq8f8CjL%2Bar2xo2vt89AXrOqU6LhrQhk2nmJsyoIVyk6VxsqgjpJFt6UIGVE7T%2FyowrFNg7Z8SYaVti7qR0ZH0x0k2RELdJTY4BLez%2B4DChOJJc8RHGs4vzn1%2B2%2F%2Fh8NwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=8&patternCode=101&sceneCode=101&score12=0&sign=f88dd3c12f0d7e0a09bd8d0c751c2f3a";
+        category = "辅助标志";
+        saveDataByCategory(url,param,category);
+
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=abc820db8679d5b3eaf72f57b2a182c0&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PvUoDQRRGLXwFwdreN7DzuSTvYbXMIPdv5t4mEAj3BZQpLA1LcMk2EbIKGmNCwq4pTGP1Nd%2FhcJbwvvwY%2FAWQESesE85TjhXFCs0NROIYRSypYE6s6Fv4evr8Xg%2FT9OgZyFiY%2FQeESD0BpjGTZYlRj5Moup4%2BLRhb20ri0nWtloY7LFZHK23d5NoC1oK17%2BHu5mJ0fT66uvRXOOw3b4OvYD57doIQ4hAPPVqPyrsgfd5ij3SIuz3rzsjjSbaGbOwbQO%2F%2BlalUxD4HCUQp4KKk0HBpUNuiaKvCOS2iKR8DOp%2F9wXmCacqhkiNMZ7f3D79NRFhJNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=9&patternCode=101&sceneCode=101&score12=0&sign=dee6ab87308a4481555f90665e69c417";
+        category = "禁止标线";
+        saveDataByCategory(url,param,category);
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=ce888de508d485618740080083d2f339&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PPUoDURRGXYG4A0vBBbgB6%2BCqElJd3hu4cH%2Ffa12GQowkmQmZKSyiZsBuDJJWEB6mMI3V13yHw9ni2%2Fa9gU8UEhmTjSlPKVYaK3FwZI4TYfZkLDmRCSzx8fvhed5M0w9kVCcmgidkVYOEkiaknjlGO07SCHb6tOjkbcuJSt%2B3VjrqpfgQvbRDlwcPMrAMsMC786vR5c3o4hq%2BcL2YvTaww8P%2BAxRDiE1c1%2BK1GK0C13kpteg6rhZkK1eIJ9kcsxPMUKD%2FV2ZcKcEBOaimIJuSQkelE2uLie8K5bSJbnQM6GH%2FB%2BexpCmFio%2Bwnt3ev%2FwCZe66CTcBAAA%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=10&patternCode=101&sceneCode=101&score12=0&sign=d9f6d2182020c2367258689bdff9e4a8";
+        category = "警告标线";
+        saveDataByCategory(url,param,category);
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=e96be788c36b2c5dadcaf1513d7e6b8d&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12Pu00DQRRFZ943eKuZF1mW3AexF5ts5bV2bfmDBJNAboG1CQkNIMqgABLKQK6CLnCAE6Kb3KOjM7fr%2Baz3ZyMhmghMJI4kV5wrQkdTzWNSxQBKMQiQr%2Bz%2B8W637UfhwaMxior4rSkzeDAKY2GMmjOcJ3B2uHxaQ8G21SClrlsojdRUcMhY2qGJAyYalAbf2Pf71%2Bn14%2FT26U%2B23Oxvep%2Fa4fjibCnlPi87wo5A1km7uKKOeJnXG4E1sueLbGsRxfdGXv8rA61Y%2FGCamEOiRQmpkdIQtAUIp0ViWGQEOQfUfvyD44TCSFKlZ5jD7OrnF5B6t7Q3AQAA&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=11&patternCode=101&sceneCode=101&score12=0&sign=ac98b1af0beaa03bec673eb0e93ffccd";
+        category = "指示标线";
+        saveDataByCategory(url,param,category);
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=81732bba50ccd40cf81d5f1ae0eee319&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PO0oDYRRGXYLLkKxCsLZwGa5ANyAEidP%2FIGgMKJlJ0s1komYNriHpbhW4MP%2FjPk1hGquv%2BQ6Hs8Wv7WcNT6iuunfeez54HCQOSkBoFndqRoVNc3FWWOL7y8frtD6UZ8go5OYOb2giDAW17FwoW4x8nCIR%2BPTpkJy6zoqHvu84tN5roCpS6Ko2V5S0Mq1ghRe3l6P7m9HdNTzifDX7rmGD48kDCKYU6zhvlBplXyRr8lIblXlcrJwXJBBPsilmcpihQv%2BvjG0QhzFaEilJ16Gk1kOr3AVW2gTPZR2J%2FRjQw%2BQPznstB0%2BDHWE5u%2Fo5%2FwWwyHNdNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=12&patternCode=101&sceneCode=101&score12=0&sign=2b229552ceb5285838b1c4bce5e3d417";
+        category = "交通事故图解";
+        saveDataByCategory(url,param,category);
+
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=a62a5ce6d52f0a579c94c6f5118d888f&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PvU4CQRRGfRDiuxh7X8HSN7CxWbKd6KKJCIHdUGszhc0GDZnJ3uL%2BzliQEKr7HHZSSGP1Nd%2FJyZnA4%2BSh9U8QEtmR7SgfKA4cB1FXQIx7QdRiKLmQia%2Fg6e35dd4eyrtnYCUk8hdAZvMCUvbEmjFGO07h6Hb6VKCkVYWFQtNUFmpqJGgfNVR9nXtN0qP0voDz69vR1c3o4s6%2FYL2Y3bc%2Bhe3mwxlSim1cd6KdGC0TdnklnfA6LhdkS2WPJ9kcspLPQLz5V2Y4MPkWMDGXJONQUk2hFquCiU4D5TKOanQMaHzzB%2BedlAOlAY8wn13%2BfP8CA74P%2FDcBAAA%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=13&patternCode=101&sceneCode=101&score12=0&sign=c2603f106da0ffce1ee7a4ba6ea75705";
+        category = "汽车仪表盘指示灯";
+        saveDataByCategory(url,param,category);
+
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=13&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=a98979b1e0a3353c486549bca886c646&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12Pu0oDURRFrfwFrcXeP7CR4G%2BlOl3Ced7HwAF%2FJclMUIgRomYy041BAlaCcGtTmMZqN3uxWBt%2F27w38OGMzBPUCcYx5kpyxQbmRHnKRBaUOAZUhrk%2FfT%2B%2BrJtx%2BIHoYkiI8OwkohCcwxTFIuWsxwmSQU%2Bfzg2t6yhgadtOS48tFxuylW7o42CJB%2BIBZn5%2FfjO6uB1dXsGnL2er1wa2fth%2FgXhKucnLmq1mxUWiOs65ZlnmxQx1YQL5JFt7NISVM7T%2FypQqQTg4JZGQeFdC6rH0rF1Rtm3BGHbZFI8BLez%2F4DjhMMZU0RGWs7uH619OBpTmNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=14&patternCode=101&sceneCode=101&score12=0&sign=de5db22bdf8ccb0a7422e6068499bc0a";
+        category = "车内功能按键";
+        saveDataByCategory(url,param,category);
+
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=97be2efaf18d5240c0497d0835f28f32&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PvUoDURBGRY35geyym8bARrGLS7AW5FaSNGGKvReG%2Bbl35gHyKpI3s7K1tPEB7E1hGquv%2BQ6Hs8T75V0Fj8jKvFPfad5rHCgObGAoErcsYsWFc1FnmOLly9X1qNqXZ8hIpqIKNyhEDgW5bJUsS4x%2BmkIR%2FPxp0dTaVoqGrms9NNpxsD5aaPsm95a4F%2B5hhm%2FvX8fPn%2BPHNzzhfDa%2BrWCFm%2FUDEKYUqziv2Wp2nSSp85RrpnmczNQnRhDPshFmUxgjQ%2FevzGUghQ1KIiqJF6GkRkPD3gZnWwXNZRHN9RTQwfoPzjsue02DnGC6eD0cfgF5KLykNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=15&patternCode=101&sceneCode=101&score12=0&sign=821aa02650a1a1753090809ef6afa9ae";
+        category = "色盲色弱检测";
+        saveDataByCategory(url,param,category);
+
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=d25392905642ef671e05ef0cfa4fa88a&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PPU4CURRGbe1cBAmhuu9lbnF%2F3ytoJmjotXmaiBCYCUOmEx06GxfgMowbcEXENUghjdXXfCcnZ4%2Bv%2B5cGrlFZdcQ%2B4jThUEmo1MCQKIyVyLKTpsyusMH724enZTPJd5BQjIkZHpFEHDJqHrNYohD8NFkC%2BPnTobF1HWUuw9B56XnQYnWw0tV9qi1qTVrDCn8%2B347fH8evd7jB7Wrx3MAB57MpCMYYmrBt1Vp1Xkdq00ZblW1Yr9jXJhDOsiUmY1igwvCvzKkShjlSFMlRdyXHnkuv3hVXOxROeRfM%2BRQwwOwPTiPNE44VnWC5mF5e%2FQILMXKsNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=16&patternCode=101&sceneCode=101&score12=0&sign=729d4378b124d3361b9606a4e526ea79";
+        category = "道路施工安全设施设置示例";
+        saveDataByCategory(url,param,category);
+
+
+        param="_appName=jiakaozhushou&_clv=1024&_launch=11&_manufacturer=Apple&_network=wifi&_operator=T&_pkgName=cn.mucang.ios.jiakaobaodianhuoche&_platform=iphone&_product=%E9%A9%BE%E8%80%83%E5%AE%9D%E5%85%B8%E5%8A%A9%E6%89%8B&_productCategory=jiakaobaodian&_r=d89eb56c197ae4e37f0d6c1499939e68&_renyuan=mucang&_system=iOS&_systemVersion=13.5&_v=H4sIAAAAAAAAE12PvUoDQRRGI8RIkt2Q3TJqFuzWIGkFYRAkIdVlZuHC%2FZ1pfZngm4lvYCn4ANamMI3V13yHw1nhzeq2hnsUEtmR7agcKA2aBnFwZE57YfZsLCWTCczw4nF0NakP%2BQkKqhMTwSWyqkFGyXtSL5ySnSZrAjt%2FGnTypuFMoesaCy11ErxPHpq%2BLb1H6Vl6mOLb%2B9fx8%2Bf48Q0PuJiOr2tY43ZzB4oxpjotKvFKjOaRqzKTSnSR5lOyuSuks2yCxQnGKND9KzMelGCLHFVzlGXIsaXQijXBxNeBSl4mNzoFdLD5g8tO8oHiwCdYRy%2Bvz790g2LmNwEAAA%3D%3D&_vendor=appstore&_version=8.14.0&_webviewVersion=4.7&authToken=d84aa6f07ef5cda9a555e7c44af0f5a9d2328773&bizCode=8.14.0&carType=car&groupId=17&patternCode=101&sceneCode=101&score12=0&sign=d9827c272c5916346a3feb5bc6443b41";
+        category = "其他标线";
+        saveDataByCategory(url,param,category);
+
+    }
+
+//    @Test
+//    public void matchByAnwser() {
+//        List<IconQuestion> iconQuestionlist = iIconQuestionService.list(new QueryWrapper<IconQuestion>().isNull("ydt_id"));
+//        for (IconQuestion iconQuestion : iconQuestionlist){
+//            TQuestion tQuestion = questionService.getOne(new QueryWrapper<TQuestion>().eq("question_id", iconQuestion.getQuestionId()));
+//            if (tQuestion == null) continue;
+//            List<WebNote> list = webNoteService.list(new QueryWrapper<WebNote>().eq("An1", tQuestion.getOptionA())
+//                    .eq("An2", tQuestion.getOptionB()).eq("An3", tQuestion.getOptionC()).eq("An4", tQuestion.getOptionD()));
+//            if (!CollectionUtils.isEmpty(list)){
+//                if (list.size() ==1){
+//                    WebNote webNote = list.get(0);
+//                    iconQuestion.setYdtId(webNote.getId());
+//                    iconQuestion.setYdtImageUrl(webNote.getMediaUrl());
+//                    iIconQuestionService.updateById(iconQuestion);
+//                }
+//
+//            }
+//
+//        }
+//
+//
+//    }
+
+
+    public void saveDataByCategory(String url,String param,String category) throws Exception {
+        String s = HttpUtils.sendGet(url, param);
+        System.out.println(s);
+        JSONObject wholeData = JSONObject.parseObject(s);
+        JSONObject data = wholeData.getJSONObject("data");
+        JSONArray itemList =  data.getJSONArray("itemList");
+        if (itemList == null) return ;
+        //List<IconInfo> iconInfos = new ArrayList<IconInfo>();
+        for (int i=0 ;i <itemList.size();i++){
+            JSONObject item = itemList.getJSONObject(i);
+            IconInfo iconInfo =  new IconInfo();
+            iconInfo.setCategory(category);
+            String content = unicodeToCN(item.getString("content"));
+            String title = unicodeToCN(item.getString("title"));
+            iconInfo.setContent(content);
+            iconInfo.setTitle(title);
+            iconInfo.setImageurl(item.getString("imageUrl"));
+            iIconInfoService.save(iconInfo);
+            JSONArray ke1QuestionList = item.getJSONArray("ke1QuestionList");
+            if (ke1QuestionList != null){
+                for (int j=0 ;j <ke1QuestionList.size();j++){
+                    long quetionId =  ke1QuestionList.getLong(j);
+                    IconQuestion iconQuestion= new IconQuestion();
+                    iconQuestion.setIconId(iconInfo.getId());
+                    iconQuestion.setTitle(iconInfo.getTitle());
+                    iconQuestion.setQuestionId(quetionId);
+                    iconQuestion.setQuestionImageUrl(iIconQuestionService.getImageUrl(quetionId));
+                    iIconQuestionService.save(iconQuestion);
+                }
+            }
+
+        }
+    }
+
+
+    public static String unicodeToCN(String str) {
+        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
+        Matcher matcher = pattern.matcher(str);
+        char ch;
+        while (matcher.find()) {
+            ch = (char) Integer.parseInt(matcher.group(2), 16);
+            str = str.replace(matcher.group(1), ch + "");
+        }
+        return str;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

jpcj-framework/src/main/java/com/miaxis/framework/web/service/SysLoginService.java

@@ -104,7 +104,7 @@ public class SysLoginService
         // 用户验证
         if (StudentLoginTypeEnum.AUTHORIZATION_CODE_LOGIN.getCode().equals(loginType)
                 ||StudentLoginTypeEnum.AUTHORIZATION_XCX_LOGIN.getCode().equals(loginType)){
-            return authenticate(wxUserInfo.getOpenid(),new OpenIdAuthenticationToken(wxUserInfo.getUnionid()));
+            return authenticate(wxUserInfo.getUnionid(),new OpenIdAuthenticationToken(wxUserInfo.getUnionid()));
         }
         else{
             throw new CustomException("loginType参数错误");

jpcj-service/src/main/java/com/miaxis/icon/controller/IconCategoryController.java

@@ -0,0 +1,117 @@
+package com.miaxis.icon.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.icon.domain.IconCategory;
+import com.miaxis.icon.service.IIconCategoryService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【题目图标】Controller
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+@RestController
+@RequestMapping("/icon/category")
+@Api(tags={"【H5-题目图标】"})
+public class IconCategoryController extends BaseController{
+    @Autowired
+    private IIconCategoryService iconCategoryService;
+
+    /**
+     * 查询题目图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:category:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询题目图标列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<IconCategory> list(@ModelAttribute IconCategory iconCategory){
+        startPage();
+        List<IconCategory> list = iconCategoryService.selectIconCategoryList(iconCategory);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出题目图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:category:export')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出题目图标列表Excel")
+    public Response<String> export(@ModelAttribute IconCategory iconCategory){
+        List<IconCategory> list = iconCategoryService.selectIconCategoryList(iconCategory);
+        ExcelUtil<IconCategory> util = new ExcelUtil<IconCategory>(IconCategory.class);
+        return util.exportExcel(list, "category");
+    }
+
+    /**
+     * 获取题目图标详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('icon:category:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取题目图标详细信息")
+    public Response<IconCategory> getInfo(
+            @ApiParam(name = "id", value = "题目图标参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(iconCategoryService.getById(id));
+    }
+
+    /**
+     * 新增题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:category:add')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增题目图标")
+    public Response<Integer> add(@RequestBody IconCategory iconCategory){
+        return toResponse(iconCategoryService.save(iconCategory) ? 1 : 0);
+    }
+
+    /**
+     * 修改题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:category:edit')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改题目图标")
+    public Response<Integer> edit(@RequestBody IconCategory iconCategory){
+        return toResponse(iconCategoryService.updateById(iconCategory) ? 1 : 0);
+    }
+
+    /**
+     * 删除题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:category:remove')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除题目图标")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "题目图标ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(iconCategoryService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/controller/IconCategoryImageController.java

@@ -0,0 +1,117 @@
+package com.miaxis.icon.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.icon.domain.IconCategoryImage;
+import com.miaxis.icon.service.IIconCategoryImageService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【题目图标】Controller
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+@RestController
+@RequestMapping("/icon/image")
+@Api(tags={"【H5-题目图标】"})
+public class IconCategoryImageController extends BaseController{
+    @Autowired
+    private IIconCategoryImageService iconCategoryImageService;
+
+    /**
+     * 查询题目图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:image:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询题目图标列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<IconCategoryImage> list(@ModelAttribute IconCategoryImage iconCategoryImage){
+        startPage();
+        List<IconCategoryImage> list = iconCategoryImageService.selectIconCategoryImageList(iconCategoryImage);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出题目图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:image:export')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出题目图标列表Excel")
+    public Response<String> export(@ModelAttribute IconCategoryImage iconCategoryImage){
+        List<IconCategoryImage> list = iconCategoryImageService.selectIconCategoryImageList(iconCategoryImage);
+        ExcelUtil<IconCategoryImage> util = new ExcelUtil<IconCategoryImage>(IconCategoryImage.class);
+        return util.exportExcel(list, "image");
+    }
+
+    /**
+     * 获取题目图标详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('icon:image:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取题目图标详细信息")
+    public Response<IconCategoryImage> getInfo(
+            @ApiParam(name = "id", value = "题目图标参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(iconCategoryImageService.getById(id));
+    }
+
+    /**
+     * 新增题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:image:add')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增题目图标")
+    public Response<Integer> add(@RequestBody IconCategoryImage iconCategoryImage){
+        return toResponse(iconCategoryImageService.save(iconCategoryImage) ? 1 : 0);
+    }
+
+    /**
+     * 修改题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:image:edit')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改题目图标")
+    public Response<Integer> edit(@RequestBody IconCategoryImage iconCategoryImage){
+        return toResponse(iconCategoryImageService.updateById(iconCategoryImage) ? 1 : 0);
+    }
+
+    /**
+     * 删除题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:image:remove')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除题目图标")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "题目图标ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(iconCategoryImageService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/controller/IconInfoController.java

@@ -0,0 +1,117 @@
+package com.miaxis.icon.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.icon.domain.IconInfo;
+import com.miaxis.icon.service.IIconInfoService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【题目图标】Controller
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@RestController
+@RequestMapping("/icon/info")
+@Api(tags={"【H5-题目图标】"})
+public class IconInfoController extends BaseController{
+    @Autowired
+    private IIconInfoService iconInfoService;
+
+    /**
+     * 查询题目图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:info:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询题目图标列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<IconInfo> list(@ModelAttribute IconInfo iconInfo){
+        startPage();
+        List<IconInfo> list = iconInfoService.selectIconInfoList(iconInfo);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出题目图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:info:export')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出题目图标列表Excel")
+    public Response<String> export(@ModelAttribute IconInfo iconInfo){
+        List<IconInfo> list = iconInfoService.selectIconInfoList(iconInfo);
+        ExcelUtil<IconInfo> util = new ExcelUtil<IconInfo>(IconInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 获取题目图标详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('icon:info:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取题目图标详细信息")
+    public Response<IconInfo> getInfo(
+            @ApiParam(name = "id", value = "题目图标参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(iconInfoService.getById(id));
+    }
+
+    /**
+     * 新增题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:info:add')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增题目图标")
+    public Response<Integer> add(@RequestBody IconInfo iconInfo){
+        return toResponse(iconInfoService.save(iconInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:info:edit')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改题目图标")
+    public Response<Integer> edit(@RequestBody IconInfo iconInfo){
+        return toResponse(iconInfoService.updateById(iconInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:info:remove')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除题目图标")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "题目图标ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(iconInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/controller/IconQuestionController.java

@@ -0,0 +1,117 @@
+package com.miaxis.icon.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.icon.domain.IconQuestion;
+import com.miaxis.icon.service.IIconQuestionService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【题目图标】Controller
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@RestController
+@RequestMapping("/icon/question")
+@Api(tags={"【H5-题目图标】"})
+public class IconQuestionController extends BaseController{
+    @Autowired
+    private IIconQuestionService iconQuestionService;
+
+    /**
+     * 查询题目图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:question:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询题目图标列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<IconQuestion> list(@ModelAttribute IconQuestion iconQuestion){
+        startPage();
+        List<IconQuestion> list = iconQuestionService.selectIconQuestionList(iconQuestion);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出题目图标列表
+     */
+    @PreAuthorize("@ss.hasPermi('icon:question:export')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出题目图标列表Excel")
+    public Response<String> export(@ModelAttribute IconQuestion iconQuestion){
+        List<IconQuestion> list = iconQuestionService.selectIconQuestionList(iconQuestion);
+        ExcelUtil<IconQuestion> util = new ExcelUtil<IconQuestion>(IconQuestion.class);
+        return util.exportExcel(list, "question");
+    }
+
+    /**
+     * 获取题目图标详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('icon:question:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取题目图标详细信息")
+    public Response<IconQuestion> getInfo(
+            @ApiParam(name = "id", value = "题目图标参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(iconQuestionService.getById(id));
+    }
+
+    /**
+     * 新增题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:question:add')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增题目图标")
+    public Response<Integer> add(@RequestBody IconQuestion iconQuestion){
+        return toResponse(iconQuestionService.save(iconQuestion) ? 1 : 0);
+    }
+
+    /**
+     * 修改题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:question:edit')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改题目图标")
+    public Response<Integer> edit(@RequestBody IconQuestion iconQuestion){
+        return toResponse(iconQuestionService.updateById(iconQuestion) ? 1 : 0);
+    }
+
+    /**
+     * 删除题目图标
+     */
+    @PreAuthorize("@ss.hasPermi('icon:question:remove')")
+    @Log(title = "题目图标", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除题目图标")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "题目图标ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(iconQuestionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/domain/IconCategory.java

@@ -0,0 +1,62 @@
+package com.miaxis.icon.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 题目图标对象 icon_category
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+@Data
+@TableName("icon_category")
+@ApiModel(value = "IconCategory", description = "题目图标对象 icon_category")
+public class IconCategory extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    @TableField("category")
+    @ApiModelProperty(value = "内容")
+    private String category;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setCategory(String category){
+        this.category = category;
+    }
+
+    public String getCategory(){
+        return category;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("category", getCategory())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/domain/IconCategoryImage.java

@@ -0,0 +1,76 @@
+package com.miaxis.icon.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 题目图标对象 icon_category_image
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+@Data
+@TableName("icon_category_image")
+@ApiModel(value = "IconCategoryImage", description = "题目图标对象 icon_category_image")
+public class IconCategoryImage extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    /** 图标地址 */
+    @Excel(name = "图标地址")
+    @TableField("imageUrl")
+    @ApiModelProperty(value = "图标地址")
+    private String imageurl;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    @TableField("category")
+    @ApiModelProperty(value = "分类名称")
+    private String category;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setImageurl(String imageurl){
+        this.imageurl = imageurl;
+    }
+
+    public String getImageurl(){
+        return imageurl;
+    }
+    public void setCategory(String category){
+        this.category = category;
+    }
+
+    public String getCategory(){
+        return category;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("imageurl", getImageurl())
+            .append("category", getCategory())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/domain/IconInfo.java

@@ -0,0 +1,104 @@
+package com.miaxis.icon.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 题目图标对象 icon_info
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@Data
+@TableName("icon_info")
+@ApiModel(value = "IconInfo", description = "题目图标对象 icon_info")
+public class IconInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    @TableField("content")
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    /** 图标地址 */
+    @Excel(name = "图标地址")
+    @TableField("imageUrl")
+    @ApiModelProperty(value = "图标地址")
+    private String imageurl;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    @TableField("title")
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    /** 类别 */
+    @Excel(name = "类别")
+    @TableField("category")
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setContent(String content){
+        this.content = content;
+    }
+
+    public String getContent(){
+        return content;
+    }
+    public void setImageurl(String imageurl){
+        this.imageurl = imageurl;
+    }
+
+    public String getImageurl(){
+        return imageurl;
+    }
+    public void setTitle(String title){
+        this.title = title;
+    }
+
+    public String getTitle(){
+        return title;
+    }
+    public void setCategory(String category){
+        this.category = category;
+    }
+
+    public String getCategory(){
+        return category;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("content", getContent())
+            .append("imageurl", getImageurl())
+            .append("title", getTitle())
+            .append("category", getCategory())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/domain/IconQuestion.java

@@ -0,0 +1,102 @@
+package com.miaxis.icon.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 题目图标对象 icon_question
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@Data
+@TableName("icon_question")
+@ApiModel(value = "IconQuestion", description = "题目图标对象 icon_question")
+public class IconQuestion extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    /** 图标id */
+    @Excel(name = "图标id")
+    @TableField("icon_id")
+    @ApiModelProperty(value = "图标id")
+    private Long iconId;
+
+    /** 标题 */
+    @Excel(name = "图标标题")
+    @TableField("title")
+    @ApiModelProperty(value = "图标标题")
+    private String title;
+
+
+    /** 图标id */
+    @Excel(name = "宝典题目id")
+    @TableField("question_id")
+    @ApiModelProperty(value = "宝典题目id")
+    private Long questionId;
+
+    /** 一点通题目id */
+    @Excel(name = "一点通题目id")
+    @TableField("ydt_id")
+    @ApiModelProperty(value = "一点通题目id")
+    private Long ydtId;
+
+
+    /** 标题 */
+    @Excel(name = "一点通图片地址")
+    @TableField("ydt_image_url")
+    @ApiModelProperty(value = "一点通图片地址")
+    private String ydtImageUrl;
+
+    /** 标题 */
+    @Excel(name = "驾考宝典图片地址")
+    @TableField("question_image_url")
+    @ApiModelProperty(value = "驾考宝典图片地址")
+    private String questionImageUrl;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setIconId(Long iconId){
+        this.iconId = iconId;
+    }
+
+    public Long getIconId(){
+        return iconId;
+    }
+    public void setYdtId(Long ydtId){
+        this.ydtId = ydtId;
+    }
+
+    public Long getYdtId(){
+        return ydtId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("iconId", getIconId())
+            .append("ydtId", getYdtId())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/mapper/IconCategoryImageMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.icon.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.icon.domain.IconCategoryImage;
+
+/**
+ * 题目图标Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+public interface IconCategoryImageMapper extends BaseMapper<IconCategoryImage> {
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconCategoryImage 题目图标
+     * @return 题目图标集合
+     */
+    public List<IconCategoryImage> selectIconCategoryImageList(IconCategoryImage iconCategoryImage);
+
+}

jpcj-service/src/main/java/com/miaxis/icon/mapper/IconCategoryMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.icon.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.icon.domain.IconCategory;
+
+/**
+ * 题目图标Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+public interface IconCategoryMapper extends BaseMapper<IconCategory> {
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconCategory 题目图标
+     * @return 题目图标集合
+     */
+    public List<IconCategory> selectIconCategoryList(IconCategory iconCategory);
+
+}

jpcj-service/src/main/java/com/miaxis/icon/mapper/IconInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.icon.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.icon.domain.IconInfo;
+
+/**
+ * 题目图标Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+public interface IconInfoMapper extends BaseMapper<IconInfo> {
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconInfo 题目图标
+     * @return 题目图标集合
+     */
+    public List<IconInfo> selectIconInfoList(IconInfo iconInfo);
+
+}

jpcj-service/src/main/java/com/miaxis/icon/mapper/IconQuestionMapper.java

@@ -0,0 +1,23 @@
+package com.miaxis.icon.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.icon.domain.IconQuestion;
+
+/**
+ * 题目图标Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+public interface IconQuestionMapper extends BaseMapper<IconQuestion> {
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconQuestion 题目图标
+     * @return 题目图标集合
+     */
+    public List<IconQuestion> selectIconQuestionList(IconQuestion iconQuestion);
+
+    String getImageUrl(long quetionId);
+}

jpcj-service/src/main/java/com/miaxis/icon/service/IIconCategoryImageService.java

@@ -0,0 +1,21 @@
+package com.miaxis.icon.service;
+
+import java.util.List;
+import com.miaxis.icon.domain.IconCategoryImage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 题目图标Service接口
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+public interface IIconCategoryImageService extends IService<IconCategoryImage>{
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconCategoryImage 题目图标
+     * @return 题目图标集合
+     */
+    public List<IconCategoryImage> selectIconCategoryImageList(IconCategoryImage iconCategoryImage);
+}

jpcj-service/src/main/java/com/miaxis/icon/service/IIconCategoryService.java

@@ -0,0 +1,21 @@
+package com.miaxis.icon.service;
+
+import java.util.List;
+import com.miaxis.icon.domain.IconCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 题目图标Service接口
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+public interface IIconCategoryService extends IService<IconCategory>{
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconCategory 题目图标
+     * @return 题目图标集合
+     */
+    public List<IconCategory> selectIconCategoryList(IconCategory iconCategory);
+}

jpcj-service/src/main/java/com/miaxis/icon/service/IIconInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.icon.service;
+
+import java.util.List;
+import com.miaxis.icon.domain.IconInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 题目图标Service接口
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+public interface IIconInfoService extends IService<IconInfo>{
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconInfo 题目图标
+     * @return 题目图标集合
+     */
+    public List<IconInfo> selectIconInfoList(IconInfo iconInfo);
+}

jpcj-service/src/main/java/com/miaxis/icon/service/IIconQuestionService.java

@@ -0,0 +1,23 @@
+package com.miaxis.icon.service;
+
+import java.util.List;
+import com.miaxis.icon.domain.IconQuestion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 题目图标Service接口
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+public interface IIconQuestionService extends IService<IconQuestion>{
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconQuestion 题目图标
+     * @return 题目图标集合
+     */
+    public List<IconQuestion> selectIconQuestionList(IconQuestion iconQuestion);
+
+    String getImageUrl(long quetionId);
+}

jpcj-service/src/main/java/com/miaxis/icon/service/impl/IconCategoryImageServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.icon.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.icon.mapper.IconCategoryImageMapper;
+import com.miaxis.icon.domain.IconCategoryImage;
+import com.miaxis.icon.service.IIconCategoryImageService;
+
+/**
+ * 题目图标Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+@Service
+public class IconCategoryImageServiceImpl extends ServiceImpl<IconCategoryImageMapper, IconCategoryImage> implements IIconCategoryImageService {
+    @Autowired
+    private IconCategoryImageMapper iconCategoryImageMapper;
+
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconCategoryImage 题目图标
+     * @return 题目图标
+     */
+    @Override
+    public List<IconCategoryImage> selectIconCategoryImageList(IconCategoryImage iconCategoryImage){
+        return iconCategoryImageMapper.selectIconCategoryImageList(iconCategoryImage);
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/service/impl/IconCategoryServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.icon.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.icon.mapper.IconCategoryMapper;
+import com.miaxis.icon.domain.IconCategory;
+import com.miaxis.icon.service.IIconCategoryService;
+
+/**
+ * 题目图标Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-08-02
+ */
+@Service
+public class IconCategoryServiceImpl extends ServiceImpl<IconCategoryMapper, IconCategory> implements IIconCategoryService {
+    @Autowired
+    private IconCategoryMapper iconCategoryMapper;
+
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconCategory 题目图标
+     * @return 题目图标
+     */
+    @Override
+    public List<IconCategory> selectIconCategoryList(IconCategory iconCategory){
+        return iconCategoryMapper.selectIconCategoryList(iconCategory);
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/service/impl/IconInfoServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.icon.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.icon.mapper.IconInfoMapper;
+import com.miaxis.icon.domain.IconInfo;
+import com.miaxis.icon.service.IIconInfoService;
+
+/**
+ * 题目图标Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@Service
+public class IconInfoServiceImpl extends ServiceImpl<IconInfoMapper, IconInfo> implements IIconInfoService {
+    @Autowired
+    private IconInfoMapper iconInfoMapper;
+
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconInfo 题目图标
+     * @return 题目图标
+     */
+    @Override
+    public List<IconInfo> selectIconInfoList(IconInfo iconInfo){
+        return iconInfoMapper.selectIconInfoList(iconInfo);
+    }
+}

jpcj-service/src/main/java/com/miaxis/icon/service/impl/IconQuestionServiceImpl.java

@@ -0,0 +1,41 @@
+package com.miaxis.icon.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.icon.mapper.IconQuestionMapper;
+import com.miaxis.icon.domain.IconQuestion;
+import com.miaxis.icon.service.IIconQuestionService;
+
+/**
+ * 题目图标Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@Service
+public class IconQuestionServiceImpl extends ServiceImpl<IconQuestionMapper, IconQuestion> implements IIconQuestionService {
+    @Autowired
+    private IconQuestionMapper iconQuestionMapper;
+
+    /**
+     * 查询题目图标列表
+     *
+     * @param iconQuestion 题目图标
+     * @return 题目图标
+     */
+    @Override
+    public List<IconQuestion> selectIconQuestionList(IconQuestion iconQuestion){
+        return iconQuestionMapper.selectIconQuestionList(iconQuestion);
+    }
+
+    @Override
+    public String getImageUrl(long quetionId) {
+        return iconQuestionMapper.getImageUrl(quetionId);
+    }
+}

jpcj-service/src/main/java/com/miaxis/web/controller/WebNoteController.java

@@ -0,0 +1,117 @@
+package com.miaxis.web.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.web.domain.WebNote;
+import com.miaxis.web.service.IWebNoteService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【【请填写功能名称】】Controller
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@RestController
+@RequestMapping("/web/note")
+@Api(tags={"【H5-【请填写功能名称】】"})
+public class WebNoteController extends BaseController{
+    @Autowired
+    private IWebNoteService webNoteService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('web:note:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询【请填写功能名称】列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<WebNote> list(@ModelAttribute WebNote webNote){
+        startPage();
+        List<WebNote> list = webNoteService.selectWebNoteList(webNote);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('web:note:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出【请填写功能名称】列表Excel")
+    public Response<String> export(@ModelAttribute WebNote webNote){
+        List<WebNote> list = webNoteService.selectWebNoteList(webNote);
+        ExcelUtil<WebNote> util = new ExcelUtil<WebNote>(WebNote.class);
+        return util.exportExcel(list, "note");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('web:note:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取【请填写功能名称】详细信息")
+    public Response<WebNote> getInfo(
+            @ApiParam(name = "id", value = "【请填写功能名称】参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(webNoteService.getById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('web:note:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增【请填写功能名称】")
+    public Response<Integer> add(@RequestBody WebNote webNote){
+        return toResponse(webNoteService.save(webNote) ? 1 : 0);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('web:note:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改【请填写功能名称】")
+    public Response<Integer> edit(@RequestBody WebNote webNote){
+        return toResponse(webNoteService.updateById(webNote) ? 1 : 0);
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('web:note:remove')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除【请填写功能名称】")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "【请填写功能名称】ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(webNoteService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

jpcj-service/src/main/java/com/miaxis/web/domain/WebNote.java

@@ -0,0 +1,481 @@
+package com.miaxis.web.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 【请填写功能名称】对象 web_note
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@Data
+@TableName("web_note")
+@ApiModel(value = "WebNote", description = "【请填写功能名称】对象 web_note")
+public class WebNote {
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("ID")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("Type")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long type;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("intNumber")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String intnumber;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("strTppe")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String strtppe;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("strType_l")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String strtypeL;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("LicenseType")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String licensetype;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("Question")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String question;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("An1")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String an1;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("An2")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String an2;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("An3")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String an3;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("An4")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String an4;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("An5")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String an5;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("An6")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String an6;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("An7")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String an7;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("AnswerTrue")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String answertrue;
+
+//    /** $column.columnComment */
+//    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+//    @TableField("explain")
+//    @ApiModelProperty(value = "$column.columnComment")
+//    private String explain;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("BestAnswerId")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String bestanswerid;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("kemu")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long kemu;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("jieshi_from")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String jieshiFrom;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("moretypes")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String moretypes;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("chapterid")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long chapterid;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("sinaimg")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String sinaimg;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("video_url")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String videoUrl;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("diff_degree")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long diffDegree;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("cityid")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long cityid;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("gs")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String gs;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("keyword")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String keyword;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("error_rate")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long errorRate;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("media_url")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String mediaUrl;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("show_option_type")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long showOptionType;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("question_source")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long questionSource;
+
+    /** $column.columnComment */
+    @Excel(name = "${column.columnComment}", readConverterExp = "$column.readConverterExp()")
+    @TableField("best_explain_new")
+    @ApiModelProperty(value = "$column.columnComment")
+    private String bestExplainNew;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setType(Long type){
+        this.type = type;
+    }
+
+    public Long getType(){
+        return type;
+    }
+    public void setIntnumber(String intnumber){
+        this.intnumber = intnumber;
+    }
+
+    public String getIntnumber(){
+        return intnumber;
+    }
+    public void setStrtppe(String strtppe){
+        this.strtppe = strtppe;
+    }
+
+    public String getStrtppe(){
+        return strtppe;
+    }
+    public void setStrtypeL(String strtypeL){
+        this.strtypeL = strtypeL;
+    }
+
+    public String getStrtypeL(){
+        return strtypeL;
+    }
+    public void setLicensetype(String licensetype){
+        this.licensetype = licensetype;
+    }
+
+    public String getLicensetype(){
+        return licensetype;
+    }
+    public void setQuestion(String question){
+        this.question = question;
+    }
+
+    public String getQuestion(){
+        return question;
+    }
+    public void setAn1(String an1){
+        this.an1 = an1;
+    }
+
+    public String getAn1(){
+        return an1;
+    }
+    public void setAn2(String an2){
+        this.an2 = an2;
+    }
+
+    public String getAn2(){
+        return an2;
+    }
+    public void setAn3(String an3){
+        this.an3 = an3;
+    }
+
+    public String getAn3(){
+        return an3;
+    }
+    public void setAn4(String an4){
+        this.an4 = an4;
+    }
+
+    public String getAn4(){
+        return an4;
+    }
+    public void setAn5(String an5){
+        this.an5 = an5;
+    }
+
+    public String getAn5(){
+        return an5;
+    }
+    public void setAn6(String an6){
+        this.an6 = an6;
+    }
+
+    public String getAn6(){
+        return an6;
+    }
+    public void setAn7(String an7){
+        this.an7 = an7;
+    }
+
+    public String getAn7(){
+        return an7;
+    }
+    public void setAnswertrue(String answertrue){
+        this.answertrue = answertrue;
+    }
+
+    public String getAnswertrue(){
+        return answertrue;
+    }
+//    public void setExplain(String explain){
+//        this.explain = explain;
+//    }
+//
+//    public String getExplain(){
+//        return explain;
+//    }
+    public void setBestanswerid(String bestanswerid){
+        this.bestanswerid = bestanswerid;
+    }
+
+    public String getBestanswerid(){
+        return bestanswerid;
+    }
+    public void setKemu(Long kemu){
+        this.kemu = kemu;
+    }
+
+    public Long getKemu(){
+        return kemu;
+    }
+    public void setJieshiFrom(String jieshiFrom){
+        this.jieshiFrom = jieshiFrom;
+    }
+
+    public String getJieshiFrom(){
+        return jieshiFrom;
+    }
+    public void setMoretypes(String moretypes){
+        this.moretypes = moretypes;
+    }
+
+    public String getMoretypes(){
+        return moretypes;
+    }
+    public void setChapterid(Long chapterid){
+        this.chapterid = chapterid;
+    }
+
+    public Long getChapterid(){
+        return chapterid;
+    }
+    public void setSinaimg(String sinaimg){
+        this.sinaimg = sinaimg;
+    }
+
+    public String getSinaimg(){
+        return sinaimg;
+    }
+    public void setVideoUrl(String videoUrl){
+        this.videoUrl = videoUrl;
+    }
+
+    public String getVideoUrl(){
+        return videoUrl;
+    }
+    public void setDiffDegree(Long diffDegree){
+        this.diffDegree = diffDegree;
+    }
+
+    public Long getDiffDegree(){
+        return diffDegree;
+    }
+    public void setCityid(Long cityid){
+        this.cityid = cityid;
+    }
+
+    public Long getCityid(){
+        return cityid;
+    }
+    public void setGs(String gs){
+        this.gs = gs;
+    }
+
+    public String getGs(){
+        return gs;
+    }
+    public void setKeyword(String keyword){
+        this.keyword = keyword;
+    }
+
+    public String getKeyword(){
+        return keyword;
+    }
+    public void setErrorRate(Long errorRate){
+        this.errorRate = errorRate;
+    }
+
+    public Long getErrorRate(){
+        return errorRate;
+    }
+    public void setMediaUrl(String mediaUrl){
+        this.mediaUrl = mediaUrl;
+    }
+
+    public String getMediaUrl(){
+        return mediaUrl;
+    }
+    public void setShowOptionType(Long showOptionType){
+        this.showOptionType = showOptionType;
+    }
+
+    public Long getShowOptionType(){
+        return showOptionType;
+    }
+    public void setQuestionSource(Long questionSource){
+        this.questionSource = questionSource;
+    }
+
+    public Long getQuestionSource(){
+        return questionSource;
+    }
+    public void setBestExplainNew(String bestExplainNew){
+        this.bestExplainNew = bestExplainNew;
+    }
+
+    public String getBestExplainNew(){
+        return bestExplainNew;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("type", getType())
+            .append("intnumber", getIntnumber())
+            .append("strtppe", getStrtppe())
+            .append("strtypeL", getStrtypeL())
+            .append("licensetype", getLicensetype())
+            .append("question", getQuestion())
+            .append("an1", getAn1())
+            .append("an2", getAn2())
+            .append("an3", getAn3())
+            .append("an4", getAn4())
+            .append("an5", getAn5())
+            .append("an6", getAn6())
+            .append("an7", getAn7())
+            .append("answertrue", getAnswertrue())
+          //  .append("explain", getExplain())
+            .append("bestanswerid", getBestanswerid())
+            .append("kemu", getKemu())
+            .append("jieshiFrom", getJieshiFrom())
+            .append("moretypes", getMoretypes())
+            .append("chapterid", getChapterid())
+            .append("sinaimg", getSinaimg())
+            .append("videoUrl", getVideoUrl())
+            .append("diffDegree", getDiffDegree())
+            .append("cityid", getCityid())
+            .append("gs", getGs())
+            .append("keyword", getKeyword())
+            .append("errorRate", getErrorRate())
+            .append("mediaUrl", getMediaUrl())
+            .append("showOptionType", getShowOptionType())
+            .append("questionSource", getQuestionSource())
+            .append("bestExplainNew", getBestExplainNew())
+            .toString();
+    }
+}

jpcj-service/src/main/java/com/miaxis/web/mapper/WebNoteMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.web.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.web.domain.WebNote;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+public interface WebNoteMapper extends BaseMapper<WebNote> {
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param webNote 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<WebNote> selectWebNoteList(WebNote webNote);
+
+}

jpcj-service/src/main/java/com/miaxis/web/service/IWebNoteService.java

@@ -0,0 +1,21 @@
+package com.miaxis.web.service;
+
+import java.util.List;
+import com.miaxis.web.domain.WebNote;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+public interface IWebNoteService extends IService<WebNote>{
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param webNote 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<WebNote> selectWebNoteList(WebNote webNote);
+}

jpcj-service/src/main/java/com/miaxis/web/service/impl/WebNoteServiceImpl.java

@@ -0,0 +1,35 @@
+package com.miaxis.web.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.web.mapper.WebNoteMapper;
+import com.miaxis.web.domain.WebNote;
+import com.miaxis.web.service.IWebNoteService;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-08-01
+ */
+@Service
+public class WebNoteServiceImpl extends ServiceImpl<WebNoteMapper, WebNote> implements IWebNoteService {
+    @Autowired
+    private WebNoteMapper webNoteMapper;
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param webNote 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<WebNote> selectWebNoteList(WebNote webNote){
+        return webNoteMapper.selectWebNoteList(webNote);
+    }
+}

jpcj-service/src/main/resources/mapper/icon/IconCategoryImageMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.icon.mapper.IconCategoryImageMapper">
+
+    <resultMap type="IconCategoryImage" id="IconCategoryImageResult">
+        <result property="id"    column="id"    />
+        <result property="imageurl"    column="imageUrl"    />
+        <result property="category"    column="category"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectIconCategoryImageVo">
+        select * from icon_category_image
+    </sql>
+
+    <select id="selectIconCategoryImageList" parameterType="IconCategoryImage" resultMap="IconCategoryImageResult">
+        <include refid="selectIconCategoryImageVo"/>
+        <where>
+            <if test="imageurl != null  and imageurl != ''"> and imageUrl = #{imageurl}</if>
+            <if test="category != null  and category != ''"> and category = #{category}</if>
+        </where>
+    </select>
+
+</mapper>

jpcj-service/src/main/resources/mapper/icon/IconCategoryMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.icon.mapper.IconCategoryMapper">
+
+    <resultMap type="IconCategory" id="IconCategoryResult">
+        <result property="id"    column="id"    />
+        <result property="category"    column="category"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectIconCategoryVo">
+        select * from icon_category
+    </sql>
+
+    <select id="selectIconCategoryList" parameterType="IconCategory" resultMap="IconCategoryResult">
+        <include refid="selectIconCategoryVo"/>
+        <where>
+            <if test="category != null  and category != ''"> and category = #{category}</if>
+        </where>
+    </select>
+
+</mapper>

jpcj-service/src/main/resources/mapper/icon/IconInfoMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.icon.mapper.IconInfoMapper">
+
+    <resultMap type="IconInfo" id="IconInfoResult">
+        <result property="id"    column="id"    />
+        <result property="content"    column="content"    />
+        <result property="imageurl"    column="imageUrl"    />
+        <result property="title"    column="title"    />
+        <result property="category"    column="category"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectIconInfoVo">
+        select * from icon_info
+    </sql>
+
+    <select id="selectIconInfoList" parameterType="IconInfo" resultMap="IconInfoResult">
+        <include refid="selectIconInfoVo"/>
+        <where>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="imageurl != null  and imageurl != ''"> and imageUrl = #{imageurl}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="category != null  and category != ''"> and category = #{category}</if>
+        </where>
+    </select>
+
+</mapper>

jpcj-service/src/main/resources/mapper/icon/IconQuestionMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.icon.mapper.IconQuestionMapper">
+
+    <resultMap type="IconQuestion" id="IconQuestionResult">
+        <result property="id"    column="id"    />
+        <result property="iconId"    column="icon_id"    />
+        <result property="ydtId"    column="ydt_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectIconQuestionVo">
+        select * from icon_question
+    </sql>
+
+    <select id="selectIconQuestionList" parameterType="IconQuestion" resultMap="IconQuestionResult">
+        <include refid="selectIconQuestionVo"/>
+        <where>
+            <if test="iconId != null "> and icon_id = #{iconId}</if>
+            <if test="ydtId != null "> and ydt_id = #{ydtId}</if>
+        </where>
+    </select>
+
+    <select id="getImageUrl"  resultType="string">
+       select hd_image_url from t_media t1 join t_question t2 on (t1.media_key=  t2.media_key) where t2.question_id =#{questionId}
+    </select>
+
+</mapper>

jpcj-service/src/main/resources/mapper/web/WebNoteMapper.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.web.mapper.WebNoteMapper">
+
+    <resultMap type="WebNote" id="WebNoteResult">
+        <result property="id"    column="ID"    />
+        <result property="type"    column="Type"    />
+        <result property="intnumber"    column="intNumber"    />
+        <result property="strtppe"    column="strTppe"    />
+        <result property="strtypeL"    column="strType_l"    />
+        <result property="licensetype"    column="LicenseType"    />
+        <result property="question"    column="Question"    />
+        <result property="an1"    column="An1"    />
+        <result property="an2"    column="An2"    />
+        <result property="an3"    column="An3"    />
+        <result property="an4"    column="An4"    />
+        <result property="an5"    column="An5"    />
+        <result property="an6"    column="An6"    />
+        <result property="an7"    column="An7"    />
+        <result property="answertrue"    column="AnswerTrue"    />
+        <result property="explain"    column="explain"    />
+        <result property="bestanswerid"    column="BestAnswerId"    />
+        <result property="kemu"    column="kemu"    />
+        <result property="jieshiFrom"    column="jieshi_from"    />
+        <result property="moretypes"    column="moretypes"    />
+        <result property="chapterid"    column="chapterid"    />
+        <result property="sinaimg"    column="sinaimg"    />
+        <result property="videoUrl"    column="video_url"    />
+        <result property="diffDegree"    column="diff_degree"    />
+        <result property="cityid"    column="cityid"    />
+        <result property="gs"    column="gs"    />
+        <result property="keyword"    column="keyword"    />
+        <result property="errorRate"    column="error_rate"    />
+        <result property="mediaUrl"    column="media_url"    />
+        <result property="showOptionType"    column="show_option_type"    />
+        <result property="questionSource"    column="question_source"    />
+        <result property="bestExplainNew"    column="best_explain_new"    />
+    </resultMap>
+
+    <sql id="selectWebNoteVo">
+        select * from web_note
+    </sql>
+
+    <select id="selectWebNoteList" parameterType="WebNote" resultMap="WebNoteResult">
+        <include refid="selectWebNoteVo"/>
+        <where>
+            <if test="id != null "> and ID = #{id}</if>
+            <if test="type != null "> and Type = #{type}</if>
+            <if test="intnumber != null  and intnumber != ''"> and intNumber = #{intnumber}</if>
+            <if test="strtppe != null  and strtppe != ''"> and strTppe = #{strtppe}</if>
+            <if test="strtypeL != null  and strtypeL != ''"> and strType_l = #{strtypeL}</if>
+            <if test="licensetype != null  and licensetype != ''"> and LicenseType = #{licensetype}</if>
+            <if test="question != null  and question != ''"> and Question = #{question}</if>
+            <if test="an1 != null  and an1 != ''"> and An1 = #{an1}</if>
+            <if test="an2 != null  and an2 != ''"> and An2 = #{an2}</if>
+            <if test="an3 != null  and an3 != ''"> and An3 = #{an3}</if>
+            <if test="an4 != null  and an4 != ''"> and An4 = #{an4}</if>
+            <if test="an5 != null  and an5 != ''"> and An5 = #{an5}</if>
+            <if test="an6 != null  and an6 != ''"> and An6 = #{an6}</if>
+            <if test="an7 != null  and an7 != ''"> and An7 = #{an7}</if>
+            <if test="answertrue != null  and answertrue != ''"> and AnswerTrue = #{answertrue}</if>
+            <if test="explain != null  and explain != ''"> and explain = #{explain}</if>
+            <if test="bestanswerid != null  and bestanswerid != ''"> and BestAnswerId = #{bestanswerid}</if>
+            <if test="kemu != null "> and kemu = #{kemu}</if>
+            <if test="jieshiFrom != null  and jieshiFrom != ''"> and jieshi_from = #{jieshiFrom}</if>
+            <if test="moretypes != null  and moretypes != ''"> and moretypes = #{moretypes}</if>
+            <if test="chapterid != null "> and chapterid = #{chapterid}</if>
+            <if test="sinaimg != null  and sinaimg != ''"> and sinaimg = #{sinaimg}</if>
+            <if test="videoUrl != null  and videoUrl != ''"> and video_url = #{videoUrl}</if>
+            <if test="diffDegree != null "> and diff_degree = #{diffDegree}</if>
+            <if test="cityid != null "> and cityid = #{cityid}</if>
+            <if test="gs != null  and gs != ''"> and gs = #{gs}</if>
+            <if test="keyword != null  and keyword != ''"> and keyword = #{keyword}</if>
+            <if test="errorRate != null "> and error_rate = #{errorRate}</if>
+            <if test="mediaUrl != null  and mediaUrl != ''"> and media_url = #{mediaUrl}</if>
+            <if test="showOptionType != null "> and show_option_type = #{showOptionType}</if>
+            <if test="questionSource != null "> and question_source = #{questionSource}</if>
+            <if test="bestExplainNew != null  and bestExplainNew != ''"> and best_explain_new = #{bestExplainNew}</if>
+        </where>
+    </select>
+
+</mapper>

jpcj-service/src/main/resources/mapper/wx/WxOrderMapper.xml

@@ -104,10 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and  goods_type = #{goodsType}
         </if>
         <if test="startTime != null">
-            and DATE_FORMAT(create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+            and DATE_FORMAT(create_time,'%Y%m%d')<![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null">
-            and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+            and DATE_FORMAT(create_time,'%Y%m%d') <![CDATA[ < ]]> #{endTime}
         </if>
         order by create_time desc
     </select>
@@ -119,10 +119,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and  t1.openid in (select openid from user_info where school_name = #{schoolName})
         </if>
         <if test="startTime != null">
-            and DATE_FORMAT(t1.create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+            and DATE_FORMAT(t1.create_time,'%Y%m%d')<![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null">
-            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+            and DATE_FORMAT(t1.create_time,'%Y%m%d') <![CDATA[ < ]]> #{endTime}
         </if>
         order by t1.create_time desc
     </select>
@@ -133,10 +133,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and  t1.openid in (select openid from user_info where school_name = #{schoolName})
         </if>
         <if test="startTime != null">
-            and DATE_FORMAT(t1.create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+            and DATE_FORMAT(t1.create_time,'%Y%m%d')<![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null">
-            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+            and DATE_FORMAT(t1.create_time,'%Y%m%d') <![CDATA[ < ]]> #{endTime}
         </if>
         order by t1.create_time desc
     </select>