花田厝 20 uur geleden
bovenliggende
commit
05b710a8df

+ 0 - 51
jsjp-admin/src/main/java/com/miaxis/app/controller/icon/IconClassifyController.java

@@ -1,17 +1,14 @@
 package com.miaxis.app.controller.icon;
 
-import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.icon.domain.IconClassify;
 import com.miaxis.icon.service.IIconClassifyService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -33,7 +30,6 @@ public class IconClassifyController extends BaseController{
     /**
      * 查询图标分类列表
      */
-    @PreAuthorize("@ss.hasPermi('icon:icon:list')")
     @GetMapping("/list")
     @ApiOperation("查询图标分类列表")
         @ApiImplicitParams({
@@ -46,23 +42,10 @@ public class IconClassifyController extends BaseController{
         return toResponsePageInfo(list);
     }
     
-    /**
-     * 导出图标分类列表
-     */
-    @PreAuthorize("@ss.hasPermi('icon:icon:export')")
-    @Log(title = "图标分类", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出图标分类列表Excel")
-    public Response<String> export(@ModelAttribute IconClassify iconClassify){
-        List<IconClassify> list = iconClassifyService.selectIconClassifyList(iconClassify);
-        ExcelUtil<IconClassify> util = new ExcelUtil<IconClassify>(IconClassify.class);
-        return util.exportExcel(list, "icon");
-    }
 
     /**
      * 获取图标分类详细信息
      */
-    @PreAuthorize("@ss.hasPermi('icon:icon:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取图标分类详细信息")
     public Response<IconClassify> getInfo(
@@ -72,39 +55,5 @@ public class IconClassifyController extends BaseController{
         return Response.success(iconClassifyService.getById(id));
     }
 
-    /**
-     * 新增图标分类
-     */
-    @PreAuthorize("@ss.hasPermi('icon:icon:add')")
-    @Log(title = "图标分类", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增图标分类")
-    public Response<Integer> add(@RequestBody IconClassify iconClassify){
-        return toResponse(iconClassifyService.save(iconClassify) ? 1 : 0);
-    }
 
-    /**
-     * 修改图标分类
-     */
-    @PreAuthorize("@ss.hasPermi('icon:icon:edit')")
-    @Log(title = "图标分类", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改图标分类")
-    public Response<Integer> edit(@RequestBody IconClassify iconClassify){
-        return toResponse(iconClassifyService.updateById(iconClassify) ? 1 : 0);
-    }
-
-    /**
-     * 删除图标分类
-     */
-    @PreAuthorize("@ss.hasPermi('icon:icon:remove')")
-    @Log(title = "图标分类", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除图标分类")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "图标分类ids参数", required = true)
-            @PathVariable String[] ids
-    ){
-        return toResponse(iconClassifyService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
 }

+ 0 - 52
jsjp-admin/src/main/java/com/miaxis/app/controller/icon/IconDataController.java

@@ -1,17 +1,14 @@
 package com.miaxis.app.controller.icon;
 
-import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.icon.domain.IconData;
 import com.miaxis.icon.service.IIconDataService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -33,7 +30,6 @@ public class IconDataController extends BaseController{
     /**
      * 查询图标列表
      */
-    @PreAuthorize("@ss.hasPermi('icon:icon:list')")
     @GetMapping("/list")
     @ApiOperation("查询图标列表")
         @ApiImplicitParams({
@@ -46,23 +42,10 @@ public class IconDataController extends BaseController{
         return toResponsePageInfo(list);
     }
     
-    /**
-     * 导出图标列表
-     */
-    @PreAuthorize("@ss.hasPermi('icon:icon:export')")
-    @Log(title = "图标", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出图标列表Excel")
-    public Response<String> export(@ModelAttribute IconData iconData){
-        List<IconData> list = iconDataService.selectIconDataList(iconData);
-        ExcelUtil<IconData> util = new ExcelUtil<IconData>(IconData.class);
-        return util.exportExcel(list, "icon");
-    }
 
     /**
      * 获取图标详细信息
      */
-    @PreAuthorize("@ss.hasPermi('icon:icon:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取图标详细信息")
     public Response<IconData> getInfo(
@@ -72,39 +55,4 @@ public class IconDataController extends BaseController{
         return Response.success(iconDataService.getById(id));
     }
 
-    /**
-     * 新增图标
-     */
-    @PreAuthorize("@ss.hasPermi('icon:icon:add')")
-    @Log(title = "图标", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增图标")
-    public Response<Integer> add(@RequestBody IconData iconData){
-        return toResponse(iconDataService.save(iconData) ? 1 : 0);
-    }
-
-    /**
-     * 修改图标
-     */
-    @PreAuthorize("@ss.hasPermi('icon:icon:edit')")
-    @Log(title = "图标", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改图标")
-    public Response<Integer> edit(@RequestBody IconData iconData){
-        return toResponse(iconDataService.updateById(iconData) ? 1 : 0);
-    }
-
-    /**
-     * 删除图标
-     */
-    @PreAuthorize("@ss.hasPermi('icon:icon: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(iconDataService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
 }

File diff suppressed because it is too large
+ 0 - 0
jsjp-admin/src/test/java/com/miaxis/test/Test11.java


+ 164 - 0
jsjp-admin/src/test/java/com/miaxis/test/YDTDownload.java

@@ -0,0 +1,164 @@
+package com.miaxis.test;
+
+
+import com.miaxis.JsjpApplication;
+import com.miaxis.icon.domain.IconClassify;
+import com.miaxis.icon.domain.IconData;
+import com.miaxis.icon.service.IIconClassifyService;
+import com.miaxis.icon.service.IIconDataService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+
+
+@SpringBootTest(classes = JsjpApplication.class)
+@RunWith(SpringRunner.class)
+public class YDTDownload {
+
+
+    @Autowired
+    private IIconDataService conDataService;
+
+    @Autowired
+    private IIconClassifyService conClassifyService;
+
+
+    private static String savePath = "E:\\驾培\\一点通JSON数据\\";
+
+    @Test
+    public void testExcel() throws Exception {
+
+        List<IconClassify> list = conClassifyService.selectIconClassifyList(null);
+
+        downLoadList(list);
+
+        //List<IconData> iconDataList = conDataService.selectIconDataList(null);
+
+        //downLoadList(iconDataList);
+
+
+    }
+
+
+    public static void downLoadList(List<?> list) {
+
+        if (list.get(0) instanceof IconClassify) {
+            for (int i = 0; i < list.size(); i++) {
+                IconClassify iconClassify = (IconClassify)list.get(i);
+                String coverImg = iconClassify.getCoverImg(); //要修改
+
+                String[] coverImgArray = coverImg.split(",");
+
+                for (int j = 0; j < coverImgArray.length; j++) {
+                    String coverImgSingle = coverImgArray[j];
+
+                    int index = coverImgSingle.lastIndexOf("/");
+                    String fileName = coverImgSingle.substring(index + 1);
+
+                    try {
+                        downLoadFromUrl(coverImgSingle, fileName, savePath + "classifyImg"); //要修改
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        } else if (list.get(0) instanceof IconData) {
+
+            for (int i = 0; i < list.size(); i++) {
+                IconData conData = (IconData)list.get(i);
+                String icon = conData.getIcon(); //要修改
+                int index = icon.lastIndexOf("/");
+                String fileName = icon.substring(index + 1);
+
+                try {
+                    downLoadFromUrl(icon, fileName, savePath + "dataImg"); //要修改
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+
+        }
+    }
+
+
+    public static void downLoadFromUrl(String urlStr, String fileName, String savePath) throws IOException {
+        URL url = new URL(urlStr);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        //设置超时间为3秒
+        conn.setConnectTimeout(3 * 1000);
+        //防止屏蔽程序抓取而返回403错误
+        conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+        //得到输入流
+        InputStream inputStream = conn.getInputStream();
+
+        //获取自己数组
+        byte[] getData = readInputStream(inputStream);
+
+        //文件保存位置
+        File saveDir = new File(savePath);
+        if (!saveDir.exists()) {
+            saveDir.mkdir();
+        }
+        int index = fileName.lastIndexOf(".");
+        String first = fileName.substring(0, index);
+        String lastName = fileName.substring(index);
+        System.out.println(fileName);
+        first += lastName; //要修改
+
+        System.out.println(savePath + "\\" + fileName);
+
+        File file = new File(saveDir + File.separator + first);
+
+        FileOutputStream fos = new FileOutputStream(file);
+
+        fos.write(getData);
+
+        if (fos != null) {
+            fos.close();
+        }
+        if (inputStream != null) {
+
+            inputStream.close();
+        }
+        try {
+            Thread.sleep(300);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        System.out.println("info:" + url + " download success");
+    }
+
+
+    /**
+     * 从输入流中获取字节数组
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     */
+    public static byte[] readInputStream(InputStream inputStream) throws IOException {
+
+        byte[] buffer = new byte[1024];
+
+        int len = 0;
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        while ((len = inputStream.read(buffer)) != -1) {
+            bos.write(buffer, 0, len);
+        }
+        bos.close();
+
+        return bos.toByteArray();
+
+    }
+
+
+}

File diff suppressed because it is too large
+ 0 - 0
jsjp-admin/src/test/java/com/miaxis/test/指路标志.txt


+ 2 - 2
jsjp-service/src/main/java/com/miaxis/icon/domain/IconData.java

@@ -31,7 +31,7 @@ public class IconData extends BaseBusinessEntity{
 
     /** 分类ID */
     @Excel(name = "分类ID")
-    @TableField("icon_classif_id")
+    @TableField("icon_classify_id")
     @ApiModelProperty(value = "分类ID")
     private String iconClassifyId;
 
@@ -71,7 +71,7 @@ public class IconData extends BaseBusinessEntity{
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("iconClassifId", getIconClassifyId())
+            .append("iconClassifyId", getIconClassifyId())
             .append("iconClassifyName", getIconClassifyName())
             .append("name", getName())
             .append("icon", getIcon())

Some files were not shown because too many files changed in this diff