Merge remote-tracking branch 'origin/uat' into uat

suishenbang-admin/src/main/resources/application-uat.yml

@@ -52,7 +52,7 @@ qiyeweixin:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 10002
+  port: 10000
   servlet:
     # 应用的访问路径
     context-path: /oneportal

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -71,6 +71,17 @@ public class RyTask
         hanaOrderComponent.hanaSalesOrderSync();
     }
 
+    /**
+     * @description: C类产品订单标记
+     * @param: []
+     * @return: void
+     * @author: njs
+     * @date: 2025/5/7 13:22
+     */
+    public void hanaErpOrderSyncByC()throws Exception {
+        hanaOrderComponent.hanaErpOrderSyncByC();
+    }
+
     /**HANA交货单电子签收定时同时*/
     public void hanaSalesDeliverSignatureSync() throws Exception {
         hanaOrderComponent.hanaSalesDeliverSignatureSync();

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -114,6 +114,7 @@ public class HanaOrderComponent {
                 "               T.PSTYV,\n"+
                 "               T.UEPOS, \n"+
                 "               T.MAABC, \n"+
+                "               T.ZCODE8, \n"+
                 "\t replace(replace(T.BSTKD_E,CHAR(10),''),CHAR(13),'') BSTKD_E \n" +
                 "FROM (\n" +
                 "\n" +
@@ -171,6 +172,7 @@ public class HanaOrderComponent {
                 "               A.PSTYV,"+
                 "               A.UEPOS,"+
                 "               A.MAABC,"+
+                "               A.ZCODE8,"+
                 "                A.BSTKD_E "+
                 "FROM \"_SYS_BIC\".\"com.sd/CAL_SALES\"" +
                 "('PLACEHOLDER' = ('$$IP_ENDDATE$$',\n" +
@@ -181,7 +183,7 @@ public class HanaOrderComponent {
                 "\t LEFT JOIN ERP.ZHANAMATDOWN D ON D.MATNR = A.MATNR \n" +
                 "\t LEFT JOIN ERP.T001L E ON E.WERKS = A.WERKS AND E.LGORT = A.LGORT \n" +
                 "\t LEFT JOIN \"_SYS_BIC\".\"com.md/CAL_MAT_HIERARCHY_S\" CAL ON B.MATNR=CAL.MATNR AND A.VTWEG=CAL.VTWEG \n" +
-                "\t WHERE A.VKORG != '4000' AND A.VTWEG IN ('D9','Y9','D8') AND A.SPART != '16' AND A.AUART NOT IN ('31','32','33','35','36','39','29') " +
+                "\t WHERE A.VKORG != '4000' AND A.VTWEG IN ('D9','Y9','D8') AND A.SPART != '16' AND A.AUART NOT IN ('31','32','33','35','36','39','29','11') " +
                 "and ((A.ZCMGST !='信用通过' and A.ABGRU='') or (A.ZCMGST ='信用通过' and A.ABGRU=''))\n" +
                 " order by A.VBELN,A.POSNR " +
                 " ) T");
@@ -197,6 +199,28 @@ public class HanaOrderComponent {
 
     }
 
+    /**
+     * @description: C类产品订单标记
+     * @param: []
+     * @return: void
+     * @author: njs
+     * @date: 2025/5/7 13:24
+     */
+    public void hanaErpOrderSyncByC() throws  Exception {
+        Connection con = this.getHanaConnection();
+        PreparedStatement pstmt = con.prepareStatement("SELECT MAABC,SPRAS,TMABC,MANDT FROM ERP.TMABCT");
+
+        Long startTime = System.currentTimeMillis();
+        ResultSet rs = pstmt.executeQuery();
+        Long endTime = System.currentTimeMillis();
+        log.info("TMABCT查询用时：" + (endTime - startTime)+"毫秒");
+        this.createTmabcTxt(rs);
+        this.runLoadTmabcTxt();
+        this.closeConnection(con, pstmt);
+
+    }
+
+
     /**
      * @description: 交货单电子签收数据同步
      * @param: []
@@ -221,6 +245,7 @@ public class HanaOrderComponent {
                 "\t ZVBELN_YCHH,\n" +
                 "\t ZSTATUS_HH,\n" +
                 "\t CONTRACTID, \n" +
+                "\t BIZNO, \n" +
                  "\t MANDT \n" +
                 " FROM  ERP.ZSDT056 where ERDAT_SO between ADD_MONTHS(CURRENT_DATE, -3) AND CURRENT_DATE");
 
@@ -376,6 +401,7 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("ZVBELN_YCHH")
                                 +"$$"+ result.getString("ZSTATUS_HH")
                                 +"$$"+ result.getString("CONTRACTID")
+                                +"$$"+ result.getString("BIZNO")
                                 +"$$"+ result.getString("MANDT")
                                 + "\r\n");
 
@@ -423,6 +449,93 @@ public class HanaOrderComponent {
         return j;
     }
 
+
+    //C类
+    private int  createTmabcTxt(ResultSet result) throws Exception {
+        File file = null;
+        FileWriter fw = null;
+        Connection conn = null;
+        PreparedStatement pstm =null;
+        int j =0;
+        try {
+            long i =0;
+
+            //创建IO需求的条件，并声明输出路径
+            file = new File((Global.getTemdataPath()+"erpOrderByC/"));
+            log.info("erpOrderByC数据缓存路径：" + Global.getTemdataPath()+"erpOrderByC/");
+            if(!file.exists()){
+                file.mkdir();
+            }
+
+            file = new File(Global.getTemdataPath()+"erpOrderByC/"+j+".txt");
+            if(!file.exists()){
+                file.createNewFile();
+            }else {
+                //取得这个目录下的所有子文件对象
+                File[] files = new File(Global.getTemdataPath()+"erpOrderByC/").listFiles();
+                //遍历该目录下的文件对象
+
+                for (File f: files){
+                    f.delete();
+                }
+                file.delete();
+                file.createNewFile();
+            }
+            fw = new FileWriter(file);
+            Long startTime = System.currentTimeMillis();
+            while (result.next()){
+
+                fw.write(
+                        result.getString("MAABC")
+                                +"$$"+ result.getString("SPRAS")
+                                +"$$"+ result.getString("TMABC")
+                                +"$$"+ result.getString("MANDT")
+                                + "\r\n");
+
+                fw.flush();
+                i++;
+                if (i%50000==0){
+                    j++;
+                    //创建IO需求的条件，并声明输出路径
+                    file = new File(Global.getTemdataPath()+"erpOrderByC/"+j+".txt");
+                    if(!file.exists()){
+                        file.createNewFile();
+                    }else {
+                        file.delete();
+                        file.createNewFile();
+                    }
+                    fw = new FileWriter(file);
+
+                }
+            }
+            Long endTime = System.currentTimeMillis();
+            log.info("生成erpOrderByC-TXT用时：" + (endTime - startTime) + "毫秒");
+
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            fw.close();
+            if(pstm!=null){
+                try {
+                    pstm.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException(e);
+                }
+            }
+            if(conn!=null){
+                try {
+                    conn.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return j;
+    }
+
 //订单
     private int createSalesOrderTxt(ResultSet result) throws Exception {
         File file = null;
@@ -515,6 +628,7 @@ public class HanaOrderComponent {
                                 +"$$"+ result.getString("PSTYV")
                                 +"$$"+ result.getString("UEPOS")
                                 +"$$"+ result.getString("MAABC")
+                                +"$$"+ result.getString("ZCODE8")
                                 +"$$"+ result.getString("BSTKD_E")
                                 + "\r\n");
 
@@ -1165,6 +1279,49 @@ public class HanaOrderComponent {
         return result;
     }
 
+    //订单C类标识
+    private void runLoadTmabcTxt()throws Exception{
+        //生产表
+        Connection conn = null;
+        PreparedStatement pstm =null;
+        try{
+            conn = getMysqlConnection();
+            String sql = "TRUNCATE TABLE meta_hana_order_maabc";
+            pstm = conn.prepareStatement(sql);
+            pstm.execute();
+            String testSql = "LOAD DATA LOCAL INFILE 'testIO.txt' into table meta_hana_order_maabc fields terminated by '$$' lines terminated by '\\n'";
+            long beginTime=System.currentTimeMillis();
+            int rows=this.bulkLoadFromInputStream(testSql, mergeGetStream(new File((Global.getTemdataPath()+"erpOrderByC/"))));
+            long endTime=System.currentTimeMillis();
+            log.info("importing erpOrderByC := "+rows+" rows data into mysql and cost "+(endTime-beginTime)+" ms!");
+
+        }catch (Exception e){
+            String name ="meta_hana_order_maabc订单C类标识表同步异常";
+            userOrderAuthorService.sendMailHanaWarning(name);
+            e.printStackTrace();
+        }finally {
+            if(pstm!=null){
+                try {
+                    pstm.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException(e);
+                }
+            }
+            if(conn!=null){
+                try {
+                    conn.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+    }
+
+
+
  //电子单签收状态
  public void runLoadDeliverSignature () throws Exception{
         //生产表

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/IAnalysisSysUserService.java

@@ -20,20 +20,29 @@ public interface IAnalysisSysUserService {
      */
     public SyncLog analysisSysDivisionUser();
 
+    /**
+     * @description: 处理应用服务本部的人，只给门店拜访权限
+     * @param: []
+     * @return: com.dgtly.sync.domain.SyncLog
+     * @author: njs
+     * @date: 2025/5/8 14:02
+     */
+     public SyncLog analysisSysApplicationServiceUser();
+
     /**
      * 解析厨卫部门数据
      * @param packageId
      * @return
      */
     /*public SyncLog analysisSysCwUser(String packageId);*/
-    
+
     /**
      * @description: 解析雅士利部门数据
      * @param: [packageId]
      * @return: com.dgtly.sync.domain.SyncLog
-     * @author: lhy      
+     * @author: lhy
      * @date: 2022/4/18 11:05
-     */ 
+     */
     public SyncLog analysisSysYSLUser(String packageId);
     /**
      * @description: 解析除ysl,diy,cw外用户数据

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -505,6 +505,170 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
 
     }
 
+    /**
+     * @description: 处理应用服务本部的人，只给门店拜访权限
+     * @param: []
+     * @return: com.dgtly.sync.domain.SyncLog
+     * @author: njs
+     * @date: 2025/5/8 14:02
+     */
+    @Override
+    public SyncLog analysisSysApplicationServiceUser() {
+        //解析逻辑件DIY用户逻辑.jpg
+        MetaEmployee param = new MetaEmployee();
+        param.setBusinessUnit("应用服务本部");
+        Long l = new Date().getTime();
+        String packageId = l.toString();
+        List<MetaEmployee> MetaEmployees = MetaEmployeeDiyMapper.selectMetaEmployeeDiyCopy1List(param);
+        SyncLog syncLog = new SyncLog();
+        syncLog.setSyncType("sysuserApplicationService");
+        syncLog.setStartTime(new Date());
+        Set<String> loginNameList = sysUserService.selectAllUserLoginName();
+        syncLog.setTotalCount((long)MetaEmployees.size());
+        List<SyncFailDetail> failDetails = new ArrayList<>();
+        long successCount = 0;
+        long failCount = 0;
+        Long deptId = Long.parseLong(configService.selectConfigByKey("libang.user.applicationService.deptid"));
+        Long roleId = Long.parseLong(configService.selectConfigByKey("libang.user.applicationService.roleid"));
+        Long[] roleIds = {roleId};
+        Map<Integer,Map<String,Map<String,String>>>  salesTreeMap = getDiySalesOrgTree();
+        if(MetaEmployees.size()>0){
+            for(MetaEmployee m:MetaEmployees) {
+                try {
+
+                    /** =============用户基本信息构建 start===============*/
+                    SysUser user = new SysUser();
+                    user.setCompanyId(1L);
+                    user.setDeptId(deptId);
+                    user.setLoginName(m.getLoginName());
+                    user.setUserName(m.getName());
+                    user.setEmail(m.getEmail());
+                    user.setPhonenumber(m.getMobile());
+                    String sex = "" + (Integer.parseInt(m.getSex()) - 1);
+                    user.setSex(sex);
+                    user.setRoleIds(roleIds);
+                    if (m.getStatus() == 0) {
+                        user.setStatus("1");
+                        user.setDelFlag("2");
+                    } else {
+                        user.setStatus("0");
+                    }
+                    /** =============用户基本信息构建 end===============*/
+
+
+                    /**======== 构建diy用户扩展信息表 start===============*/
+                    SysUserExt userExt = new SysUserExt();
+                    userExt.setBossEmployeeId(m.getBossEmployeeId());
+                    userExt.setBossName(m.getBossName());
+                    userExt.setSapEmployeeId(m.getSapEmployeeId());
+                    userExt.setPostCode(m.getEmployeePost());
+                    userExt.setDuty(m.getDuty());
+                    userExt.setDutyName(m.getDutyName());
+                    String postName = m.getEmployeePostName();
+                    userExt.setPostName(postName);
+                    userExt.setSalesLevel("applicationService_level");
+                    userExt.setOrgName(m.getStext3());
+                    userExt.setOrgCode(m.getObjid3());
+                    if (StringUtils.isEmpty(userExt.getOrgCode())){
+                        log.error("应用服务本部用户对应的销售部未找到！当前用户信息： " + m.getLoginName() + " ， 销售部名称： " + userExt.getOrgName());
+                        SyncFailDetail syncFailDetail = new SyncFailDetail();
+                        syncFailDetail.setPackageId(packageId);
+                        syncFailDetail.setFailReason("应用服务本部用户对应的销售部未找到！当前用户信息： " + m.getLoginName() + " ， 销售部名称： " + userExt.getOrgName());
+                        syncFailDetail.setDataJson(JSONObject.toJSONString(m));
+                        syncFailDetail.setFailLevel("1");
+                        syncFailDetail.setExceptionType("not found dept");
+                        failDetails.add(syncFailDetail);
+                        failCount++;
+                        user.setSysUserExt(userExt);
+                        user.setUpdateTime(new Date());
+                        this.save(user,m);
+                        continue;
+                    }
+
+                    /**======== 构建diy用户扩展信息表 end===============*/
+                    loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
+                    if (loginNameList.contains(user.getLoginName().toUpperCase())) {
+                        /**  更新 */
+                        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+                        if("1".equals(sysUser.getIsSync())){
+                            continue;
+                        }
+                        if(!userExt.getSalesLevel().equals(sysUser.getSysUserExt().getSalesLevel())){
+                            sysUserService.deleteByLoginName(user.getLoginName());
+                        }
+                        System.out.println("解析应用服务本部用户不一致情况原/新"+sysUser.getSysUserExt().getPostCode()+"/"+userExt.getPostCode());
+                        SysUserRole role=new SysUserRole();
+                        role.setUserId(sysUser.getUserId());
+                        userRoleMapper.deleteUserRoleInfo(role);
+                        user.setUserId(sysUser.getUserId());
+                        insertUserRole(user);
+
+                        if(!"applicationService_level".equals(sysUser.getSysUserExt().getSalesLevel())){
+                            user.setSysUserExt(userExt);
+                        }
+                        user.setUpdateTime(new Date());
+                        sysUserService.updateUserInfoAndSalesExt(user);
+                    } else {
+                        /**  插入 */
+                        //修改密码并加密
+                        user.setPassword(m.getLoginName());
+                        user.setSalt(ShiroSaltUtil.randomSalt());
+                        user.setPassword(EncryptPassWordClass.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
+                        user.setSysUserExt(userExt);
+                        sysUserService.insertUserAndSalesExt(user);
+                        successCount++;
+                    }
+                }catch (OutOfScopeDIYException|NotFountOrgCodeException|OutOfDIYPostNameException|OutOfLeveLException|NotOrgNameException e){
+                    /**
+                     * 警告类异常
+                     */
+                    SyncFailDetail syncFailDetail = new SyncFailDetail();
+                    syncFailDetail.setPackageId(packageId);
+                    syncFailDetail.setFailReason(e.getMessage());
+                    syncFailDetail.setDataJson(JSONObject.toJSONString(m));
+                    syncFailDetail.setFailLevel("0");
+                    syncFailDetail.setExceptionType(e.getClass().getSimpleName());
+                    failDetails.add(syncFailDetail);
+                    failCount++;
+                }catch (Exception e) {
+                    /**
+                     * 错误异常
+                     */
+                    SyncFailDetail syncFailDetail = new SyncFailDetail();
+                    syncFailDetail.setPackageId(packageId);
+                    syncFailDetail.setFailReason(e.getMessage());
+                    syncFailDetail.setDataJson(JSONObject.toJSONString(m));
+                    syncFailDetail.setFailLevel("1");
+                    syncFailDetail.setExceptionType(e.getClass().getSimpleName());
+                    failDetails.add(syncFailDetail);
+                    e.printStackTrace();
+                    log.error("解析应用服务本部用户出错", e);
+                    failCount++;
+                }
+            }
+            syncLog.setSuccessCount(successCount);
+            syncLog.setFaileCount(failCount);
+        }else{
+            syncLog.setSuccessCount(0L);
+            syncLog.setFaileCount(0L);
+        }
+        try{
+            syncLog.setPackageId(packageId);
+            syncLog.setEndTime(new Date());
+            if(failDetails.size()>0){
+                syncFailDetailMapper.batchInsertSyncFailDetail(failDetails);
+            }
+        }catch (Exception e){
+            log.error("解析应用服务本部用户插入解析日志出错",e);
+            e.printStackTrace();
+            throw new BusinessException("解析应用服务本部用户插入解析日志出错",e);
+        }finally {
+            syncLogService.insertSyncLog(syncLog);
+        }
+        return syncLog;
+
+    }
+
 
     /**
      * 解析CW用户数据  异步执行

suishenbang-sync/suishenbang-sync-common/src/main/resources/mapper/sync/MetaEmployeeMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dgtly.sync.mapper.MetaEmployeeMapper">
-    
+
     <resultMap type="MetaEmployee" id="MetaEmployeeResult">
         <result property="name"    column="name"    />
         <result property="loginName"    column="login_name"    />
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMetaEmployeeDiyCopy1List" parameterType="MetaEmployee" resultMap="MetaEmployeeResult">
         <include refid="selectMetaEmployeeVo"/>
-        <where>  
+        <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="loginName != null  and loginName != ''"> and login_name like concat('%', #{loginName}, '%')</if>
             <if test="email != null  and email != ''"> and email = #{email}</if>
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="businessUnit != null  and businessUnit != ''"> and business_unit = #{businessUnit}</if>
         </where>
     </select>
-    
+
     <select id="selectMetaEmployeeDiyCopy1ById" parameterType="String" resultMap="MetaEmployeeResult">
         <include refid="selectMetaEmployeeVo"/>
         where name = #{name}
@@ -126,6 +126,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectMetaEmployeetClueReporting" parameterType="MetaEmployee" resultMap="MetaEmployeeResult">
         <include refid="selectMetaEmployeeVo"/>
         where 1=1
-        and  business_unit not in ('YSL','DIY','12城北区事业部','36城事业部','BMD事业部','12城中区事业部','12城南区事业部')
+        and  business_unit not in ('YSL','DIY','12城北区事业部','36城事业部','BMD事业部','12城中区事业部','12城南区事业部','应用服务本部')
     </select>
-</mapper>
+</mapper>

suishenbang-sync/suishenbang-sync-manager/src/main/java/com/dgtly/sync/controller/SyncController.java

@@ -71,6 +71,7 @@ public class SyncController {
             //analysisSysUserService.analysisSysCwUser(null);
             analysisSysUserService.analysisSysYSLUser(null);
             analysisSysUserService.analysisSysDivisionUser();
+            analysisSysUserService.analysisSysApplicationServiceUser();
             analysisSysUserService.analysisSysClueReporting();
         }catch (Exception e){
             log.error("解析用户出错",e);

suishenbang-sync/suishenbang-sync-manager/src/main/java/com/dgtly/sync/controller/SyncLogController.java

@@ -23,7 +23,7 @@ import com.dgtly.common.core.page.TableDataInfo;
 
 /**
  * 同步解析日志Controller
- * 
+ *
  * @author qxp
  * @date 2020-07-14
  */
@@ -113,6 +113,7 @@ public class SyncLogController extends BaseController
             //analysisSysUserService.analysisSysCwUser(null);
             analysisSysUserService.analysisSysYSLUser(null);
             analysisSysUserService.analysisSysDivisionUser();
+            analysisSysUserService.analysisSysApplicationServiceUser();
             analysisSysUserService.analysisSysClueReporting();
         }catch (Exception e){
             logger.error("解析用户出错",e);