1.磁铁需要添加加密员工编号参数需求

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysBatchSignForServiceImpl.java

@@ -28,13 +28,13 @@ import java.util.stream.Collectors;
 @Service
 public class SysBatchSignForServiceImpl implements ISysBatchSignForService {
 
-    @Autowired
+    /*@Autowired
     @Qualifier("deliverOrderBaseExecutor")
-    private Executor deliverOrderBaseExecutor;
-    @Autowired
+    private Executor deliverOrderBaseExecutor;*/
+    @Autowired(required = false)
     @Qualifier("tmsLogisticsStatusExecutor")
     private Executor tmsLogisticsStatusExecutor;
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("tmsLogisticsStatusDeleteExcutor")
     private Executor tmsLogisticsStatusDeleteExcutor;
 

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/domain/WxMagnet.java

@@ -55,6 +55,7 @@ public class WxMagnet extends BaseEntity
      */
     private String appletQrUrl;
 
+    private String isEncry;
 
 
     public Long getMagnetId()
@@ -150,6 +151,14 @@ public class WxMagnet extends BaseEntity
         this.appletQrUrl = appletQrUrl;
     }
 
+    public String getIsEncry() {
+        return isEncry;
+    }
+
+    public void setIsEncry(String isEncry) {
+        this.isEncry = isEncry;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -167,6 +176,7 @@ public class WxMagnet extends BaseEntity
             .append("remark", getRemark())
             .append("magnetType", getMagnetType())
             .append("appletQrUrl", getAppletQrUrl())
+            .append("", getIsEncry())
             .toString();
     }
 

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/mapper/WxMagnetMapper.java

@@ -112,4 +112,7 @@ public interface WxMagnetMapper
      * @return
      */
     List<WxMagnet> selectMagnetByUserId(String userId);
+
+
+    String selectSapEmploeeIdByUserId(String userId);
 }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/WxMagnetServiceImpl.java

@@ -1,6 +1,7 @@
 package com.dgtly.wxportal.service.impl;
 
 import com.dgtly.common.constant.UserConstants;
+import com.dgtly.common.core.controller.ApiBaseController;
 import com.dgtly.common.core.domain.Ztree;
 import com.dgtly.common.utils.StringUtils;
 import com.dgtly.system.domain.SysRole;
@@ -10,6 +11,8 @@ import com.dgtly.wxportal.domain.RoleMagnet;
 import com.dgtly.wxportal.domain.WxMagnet;
 import com.dgtly.wxportal.mapper.WxMagnetMapper;
 import com.dgtly.wxportal.service.IWxMagnetService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +34,8 @@ public class WxMagnetServiceImpl implements IWxMagnetService
     @Autowired
     private SysRoleMenuMapper roleMenuMapper;
 
+    protected final Logger logger = LoggerFactory.getLogger(WxMagnetServiceImpl.class);
+
 
     /**
      * 查询H5磁贴列表
@@ -195,10 +200,39 @@ public class WxMagnetServiceImpl implements IWxMagnetService
      */
     @Override
     public List<WxMagnet> selectMagnetByUserId(String userId) {
-        return wxMagnetMapper.selectMagnetByUserId(userId);
+
+        List<WxMagnet> list = wxMagnetMapper.selectMagnetByUserId(userId);
+        if(list!=null && list.size()>0){
+            for(WxMagnet wxMagnet: list){
+                logger.info("isEncry::::"+wxMagnet.getIsEncry());
+                if("1".equals(wxMagnet.getIsEncry())){
+                    String sapEmploeeId = this.wxMagnetMapper.selectSapEmploeeIdByUserId(userId);
+                    logger.info("sapEmploeeId::::"+sapEmploeeId);
+                    if(StringUtils.isNotEmpty(sapEmploeeId)){
+                        String encry = KL(sapEmploeeId);
+                        wxMagnet.setUrl(wxMagnet.getUrl()+"?empCode="+encry);
+                        logger.info("url::::"+wxMagnet.getUrl());
+                    }
+                }
+            }
+        }
+        return list;
     }
 
 
+
+
+    public static String KL(String inStr) {
+        char[] a = inStr.toCharArray();
+        for (int i = 0; i < a.length; i++) {
+            a[i] = (char) (a[i] ^ 't');
+        }
+        String s = new String(a);
+        return s;
+    }
+
+
+
     /**
      * 对象转磁贴树
      *

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -19,6 +19,7 @@
         <result property="remark"         column="remark"         />
         <result property="magnetType"     column="magnet_type"         />
         <result property="appletQrUrl"    column="applet_qr_url"         />
+        <result property="isEncry"        column="is_encry"   />
 
     </resultMap>
 
@@ -168,7 +169,7 @@
 
     <select id="selectMagnetByUserId" parameterType="String" resultMap="WxMagnetResult">
         select distinct m.magnet_id,  m.magnet_name, m.url, m.visible, m.magnet_size
-        , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url
+        , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url,m.is_encry
         from wx_magnet m
         left join wx_role_magnet rm on m.magnet_id = rm.magnet_id
         left join sys_user_role ur on rm.role_id = ur.role_id
@@ -179,6 +180,9 @@
         </where>
         order by  m.order_num
     </select>
+    <select id="selectSapEmploeeIdByUserId" resultType="java.lang.String">
+        select sap_employee_id from sys_user_ext where user_id = #{userId}
+    </select>
 
 
 </mapper>