Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/service/impl/EanUpcServiceImpl.java

@@ -46,17 +46,18 @@ public class EanUpcServiceImpl extends ServiceImpl<EanUpcDao, EanUpcEntity> impl
         List<EanUpcEntityVo> eanUpcTopList = new ArrayList<>();
         EanUpcEntity eanUpcEntity = new EanUpcEntity();
 
-        eanUpcEntity.setLogoutFlag("1");
-        List<EanUpcEntityVo> eanUpcTop1 = this.baseMapper.getEanUpcTop(eanUpcEntity);
-        if(CollectionUtils.isNotEmpty(eanUpcTop1)) {
-            eanUpcTopList.addAll(eanUpcTop1);
-        }
+
 
         eanUpcEntity.setLogoutFlag("0");
         List<EanUpcEntityVo> eanUpcTop = this.baseMapper.getEanUpcTop(eanUpcEntity);
         if(CollectionUtils.isNotEmpty(eanUpcTop)) {
             eanUpcTopList.addAll(eanUpcTop);
         }
+        eanUpcEntity.setLogoutFlag("1");
+        List<EanUpcEntityVo> eanUpcTop1 = this.baseMapper.getEanUpcTop(eanUpcEntity);
+        if(CollectionUtils.isNotEmpty(eanUpcTop1)) {
+            eanUpcTopList.addAll(eanUpcTop1);
+        }
         return eanUpcTopList;
     }
 

src/main/java/io/office/modules/manage/service/impl/TycpdmFirmServiceImpl.java

 package io.office.modules.manage.service.impl;
 
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.common.exception.RRException;
 import io.office.modules.manage.dao.*;
 import io.office.modules.manage.entity.*;
 import io.office.modules.manage.service.TycpdmFirmChangeService;
-import io.office.modules.manage.utils.AlgorithmUtils;
-import io.office.modules.manage.utils.DESUtils;
-import io.office.modules.manage.utils.DateUtils;
-import io.office.modules.manage.utils.MD5Util;
+import io.office.modules.manage.utils.*;
 import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -637,9 +636,16 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
             throw new RRException("用户类型错误");
         }
         String phone_M = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(phone.getBytes(),"loginkey".getBytes()));
-
         String url="http://wsdt.gs1cn.org/anccoh/login?method=phoneSSO&phone="+phone_M;
-        return url;
+        String token = HttpUtil.get(url);
+        JSONObject jsonObject = JSON.parseObject(token);
+        String status = jsonObject.getString("status");
+        String msg = jsonObject.getString("msg");
+
+        if (!"200".equals(status)){
+            throw new RRException("获取token失败"+msg);
+        }
+        return "http://wsdt.gs1cn.org/anccoh/login?method=redirect&token="+msg;
     }
 
 

src/main/java/io/office/modules/manage/transfer/TransferController.java

@@ -61,6 +61,8 @@ public class TransferController {
     private PolicyService policyService;
     @Autowired
     private KnowledgeinfoService knowledgeinfoService;
+    @Autowired
+    private DocService docService;
 
     @RequestMapping("/api/indexCarouselManage")
 //    @RequiresPermissions("generator:topicnews:list")
@@ -1407,6 +1409,50 @@ public class TransferController {
     }
 
 
+    @RequestMapping("/api/doc")
+//    @RequiresPermissions("generator:topicnews:list")
+    public R doc() {
+        QueryWrapper<DocEntity> indexCarouselManageEntityQueryWrapper = new QueryWrapper<>();
+        int count = docService.count(indexCarouselManageEntityQueryWrapper);
+        if (count > 0) {
+            boolean flag = true;
+            int n = 1;
+            while (flag) {
+                int limit = 10;
+                int pages = 0;
+                if ((count % limit) == 0) {
+                    pages = (count / limit);
+                } else {
+                    pages = (count / limit) + 1;
+                }
+                if (n <= pages) {
+                    IPage<DocEntity> pageData = docService.page(new Page(n, limit), indexCarouselManageEntityQueryWrapper);
+                    if (CollectionUtils.isNotEmpty(pageData.getRecords())) {
+                        for (DocEntity docEntity : pageData.getRecords()) {
+                            //如果不为空
+                            if (StringUtils.isNotBlank(docEntity.getDocfile())) {
+                                //处理图片
+                                docEntity.setDocfile(fileRequestPrefix + "manage/down/" + docEntity.getDocfile());
+                                //修改
+                                UpdateWrapper<DocEntity> updateWrapper = new UpdateWrapper();
+                                updateWrapper.eq("id", docEntity.getId());
+                                docService.update(docEntity, updateWrapper);
+                            }
+                        }
+                        n = n + 1;
+
+                    }
+                } else {
+                    flag = false;
+                }
+            }
+        }
+        return R.ok().put("data", null);
+    }
+
+
+
+
 
 
     public static void main(String[] args) {

src/main/resources/application-test.yml

@@ -77,9 +77,9 @@ ueditorSavePath: D:/uploadFileResource/
 prefix_host: http://192.168.0.77:9091/office/
 
 #uploadFileQY: C:\upload_img\firm_archives_file\ #/第二步，电子表格上传路径(企业认证)
-uploadFileQY: /uploadFileResource/upload_img/firm_archives_file/ #/第二步，电子表格上传路径(企业认证)
+uploadFileQY: D:/uploadFileResource/upload_img/firm_archives_file/ #/第二步，电子表格上传路径(企业认证)
 #uploadFileQYOne: C:\upload_img\firmBusinessLicenseFile\ #第一步，营业执照上传路径(企业认证)
-uploadFileQYOne: /uploadFileResource/upload_img/firmBusinessLicenseFile/ #第一步，营业执照上传路径(企业认证)
+uploadFileQYOne: D:/uploadFileResource/upload_img/firmBusinessLicenseFile/ #第一步，营业执照上传路径(企业认证)
 
 #是否开启查询限制  1 打开  0关闭
 searchLimitSwitch: 0