提交

jiangping

2024-07-12 2ce20c4dd9df60435afe5e6820103a37cf7f684a

提交

 admin/src/views/business/crmInterfaceLog.vue

@@ -50,8 +50,8 @@
        </el-table-column>
        <el-table-column label="平台" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.plat == 0">海康安防平台</span>
            <span v-if="row.plat == 1">ERP系统</span>
            <span v-if="row.plat == 0">志邦CRM平台</span>
            <span v-if="row.plat == 1">志邦短信通道</span>
          </template>
        </el-table-column>
        <el-table-column prop="request" label="请求参数" min-width="100px">

 admin/src/views/business/iamInterfaceLog.vue

@@ -50,8 +50,7 @@
        </el-table-column>
        <el-table-column label="平台" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.plat == 0">海康安防平台</span>
            <span v-if="row.plat == 1">ERP系统</span>
            <span v-if="row.plat == 0">志邦IAM平台</span>
          </template>
        </el-table-column>
        <el-table-column prop="request" label="请求参数" min-width="100px">

 admin/src/views/business/interfaceLog.vue

@@ -50,8 +50,7 @@
        </el-table-column>
        <el-table-column label="平台" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.plat == 0">海康安防平台</span>
            <span v-if="row.plat == 1">ERP系统</span>
            <span v-if="row.plat == 0">志邦中台</span>
          </template>
        </el-table-column>
        <el-table-column prop="request" label="请求参数" min-width="100px">

 admin/src/views/business/shop.vue

@@ -2,31 +2,31 @@
  <TableLayout :permissions="['business:shop:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="部门名称" prop="name">
      <el-form-item label="" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入部门名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="上级组织" prop="parentId">
      <el-form-item label="" prop="parentId">
        <el-input v-model="searchForm.parentName" placeholder="请输入上级组织名称/编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select v-model="searchForm.status" @change="search" clearable placeholder="状态">
          <el-option label="停用" value="1"></el-option>
      <el-form-item label="" prop="status">
        <el-select v-model="searchForm.status" style="width: 130px"   @change="search" clearable placeholder="状态">
          <el-option label="停用" value="0"></el-option>
          <el-option label="正常" value="1"></el-option>
          <el-option label="已删除" value="2"></el-option>
          <el-option label="已删除" value="-1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="组织编码" prop="code">
      <el-form-item label="" prop="code">
        <el-input v-model="searchForm.code" placeholder="请输入组织编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="一级组织类型" prop="type">
        <el-select v-model="searchForm.type" @change="search" clearable placeholder="一级组织类型">
      <el-form-item label="" prop="type">
        <el-select v-model="searchForm.type" @change="search" style="width: 130px"  clearable placeholder="一级组织类型">
          <el-option label="HR" value="1"></el-option>
          <el-option label="加盟商" value="2"></el-option>
          <el-option label="虚拟组织" value="3"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="二级组织类型" prop="type">
        <el-select v-model="searchForm.secondType" @change="search" clearable placeholder="二级组织类型">
      <el-form-item label="" prop="type">
        <el-select v-model="searchForm.secondType" @change="search" style="width: 130px"  clearable placeholder="二级组织类型">
          <el-option label="S" value="1"></el-option>
          <el-option label="F" value="2"></el-option>
          <el-option label="店面" value="3"></el-option>
@@ -34,8 +34,8 @@
          <el-option label="虚拟店面" value="5"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="部门属性" prop="attribute">
        <el-select v-model="searchForm.attribute" @change="search" clearable placeholder="部门属性">
      <el-form-item label="" prop="attribute">
        <el-select v-model="searchForm.attribute" @change="search" style="width: 130px"  clearable placeholder="部门属性">
          <el-option label="实体店面" value="1"></el-option>
          <el-option label="虚拟店面" value="2"></el-option>
          <el-option label="电商部" value="3"></el-option>
@@ -43,19 +43,19 @@
          <el-option label="财务部" value="5"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="省份名称" prop="provinceName">
      <el-form-item label="" prop="provinceName">
        <el-input v-model="searchForm.provinceName" placeholder="请输入省份名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="城市名称" prop="cityName">
      <el-form-item label="" prop="cityName">
        <el-input v-model="searchForm.cityName" placeholder="请输入城市名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="区县名称" prop="areaName">
      <el-form-item label="" prop="areaName">
        <el-input v-model="searchForm.areaName" placeholder="请输入区县名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="品类编码" prop="unitCode">
      <el-form-item label="" prop="unitCode">
        <el-input v-model="searchForm.unitCode" placeholder="请输入品类编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="客户类型编码" prop="siteCode">
      <el-form-item label="" prop="siteCode">
        <el-input v-model="searchForm.siteCode" placeholder="请输入客户类型编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <section>
@@ -78,6 +78,7 @@
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="组织名称" min-width="120px"></el-table-column>
        <el-table-column prop="code" label="组织编码" min-width="120px"></el-table-column>
        <el-table-column prop="type" label="一级类型" min-width="80px">
          <template scope="{row}">
            <span v-if="row.type == 1">HR</span>
@@ -107,7 +108,7 @@
          <template scope="{row}">
            <span v-if="row.status == 0" style="color: red">停用</span>
            <span v-if="row.status == 1" style="color: green">正常</span>
            <span v-if="row.status == 2" style="color: grey">已删除</span>
            <span v-if="row.status == -1" style="color: grey">已删除</span>
          </template>
        </el-table-column>
         <el-table-column prop="namePath" label="组织路径" min-width="200px"></el-table-column>

 admin/src/views/business/shopTree.vue

@@ -25,7 +25,8 @@
          @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="组织名称" min-width="300px"></el-table-column>
        <el-table-column prop="name" label="组织名称" fixed min-width="300px"></el-table-column>
        <el-table-column prop="code" label="组织编码" min-width="120px"></el-table-column>
        <el-table-column prop="type" label="一级类型" min-width="100px">
          <template scope="{row}">
            <span v-if="row.type == 1">HR</span>
@@ -55,12 +56,12 @@
          <template scope="{row}">
            <span v-if="row.status == 0" style="color: red">停用</span>
            <span v-if="row.status == 1" style="color: green">正常</span>
            <span v-if="row.status == 2" style="color: grey">已删除</span>
            <span v-if="row.status == -1" style="color: grey">已删除</span>
          </template>
        </el-table-column>
<!--

        <el-table-column prop="namePath" label="组织路径" min-width="200px"></el-table-column>
-->

<!--
        <el-table-column prop="syncDate" label="最后同步时间" min-width="120px"></el-table-column>
-->

 admin/src/views/business/shopUsers.vue

@@ -9,14 +9,14 @@
        <el-input v-model="searchForm.iamUsername" placeholder="请输入登录账号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="" prop="shopType">
        <el-select v-model="searchForm.shopType" @change="search" clearable placeholder="一级组织类型">
        <el-select v-model="searchForm.shopType" @change="search" style="width: 130px" clearable placeholder="一级组织类型">
          <el-option label="HR" value="1"></el-option>
          <el-option label="加盟商" value="2"></el-option>
          <el-option label="虚拟组织" value="3"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="shopSecType">
        <el-select v-model="searchForm.shopSecType" @change="search" clearable placeholder="二级组织类型">
        <el-select v-model="searchForm.shopSecType" @change="search" style="width: 130px"  clearable placeholder="二级组织类型">
          <el-option label="S" value="1"></el-option>
          <el-option label="F" value="2"></el-option>
          <el-option label="店面" value="3"></el-option>
@@ -25,10 +25,9 @@
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="status">
        <el-select v-model="searchForm.status" @keypress.enter.native="search" clearable placeholder="状态">
          <el-option label="正常" value="0"></el-option>
          <el-option label="禁用" value="1"></el-option>
          <el-option label="拉黑/冻结" value="2"></el-option>
        <el-select v-model="searchForm.status" @keypress.enter.native="search" style="width: 120px"  clearable placeholder="状态">
          <el-option label="停用" value="0"></el-option>
          <el-option label="正常" value="1"></el-option>
        </el-select>
      </el-form-item>
      <section>

 server/admin/src/main/java/com/doumee/api/business/PushController.java

@@ -47,7 +47,7 @@
            success = Constants.ONE;
            r = ApiResponse.failed("操作失败");
        }finally {
            zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo","IAM推送人员账号信息", token, uuid, timestamp, shopList,success, JSONObject.toJSONString(r));
            zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo",Constants.ONE,"IAM推送人员账号信息", token, uuid, timestamp, shopList,success, JSONObject.toJSONString(r));
        }
        return r;
    }
@@ -71,7 +71,7 @@
            e.getMessage();
            r = ApiResponse.failed("操作失败");
        }finally {
            zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo","IAM推送人员账号信息", token, uuid, timestamp, upateUserModel,success, JSONObject.toJSONString(r));
            zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo",Constants.ONE,"IAM推送人员账号信息", token, uuid, timestamp, upateUserModel,success, JSONObject.toJSONString(r));
        }
        return r;
    }

 server/admin/src/main/java/com/doumee/timer/ZbomRedisResetBiz.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
package com.doumee.timer;

import com.doumee.biz.zbom.ZbomIAMService;
import com.doumee.service.business.InitService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.lang.reflect.Method;

/**
 * @author åˆå§‹åŒ–志邦各平台缓存字典值
 * @since 2023-07-26 11:44
 */
@Component("zbomDictDataTask")
public class ZbomRedisResetBiz implements JobService {
    private static final Logger log = LoggerFactory.getLogger(ZbomRedisResetBiz.class);

    @Autowired
    InitService initService;
    @Override
    public void run(String params,String module) {
        Method method = null;
        try {
            if(StringUtils.equals(module,"refreshZbomDictDataCache")){
                initService.refreshZbomDictDataCache();
            }else  if(StringUtils.equals(module,"orgInit")){

            }else
                log.info("\n ======== å®šæ—¶ä»»åŠ¡å·²æ‰§è¡Œï¼šzbomRedisResut.========"+module);
        } catch (Exception e) {
           e.printStackTrace();
        }
    }

}

 server/admin/src/main/java/com/doumee/timer/init/InitBizService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
package com.doumee.timer.init;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.InitService;
import com.doumee.service.business.ShopService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;

/**
 * å¿—邦组织信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/07/04 14:40
 */
@Service
public class InitBizService {

    @Autowired
    @Lazy
    private InitService initService;

    @PostConstruct
    public void clearImporting(){
        initService.clearImporting();
    }
    @PostConstruct
    public void refreshZbomDictDataCache(){
        initService.refreshZbomDictDataCache();
    }
    @PostConstruct
    public void cacheShopTree(){
//        redisTemplate.opsForValue().set(Constants.RedisKeys.SHOP_TREE,shopService.shopTree(null));
    }
}

 server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java

@@ -30,5 +30,5 @@
    void updateShopInfo(String token, String uuid, String timestamp, List<IamUpateShopModel> shopList);

    void updateUserInfo(String token, String uuid, String timestamp, IamUpateUserModel upateUserModel);
    void  saveInterfaceLog(String url,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone);
    void  saveInterfaceLog(String url,int type,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone);
}

 server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java

@@ -368,7 +368,7 @@
    }
    @Override
    @Async
    public  void  saveInterfaceLog(String url,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone){
    public  void  saveInterfaceLog(String url,int type,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone){
            Map<String,Object> map = new HashMap<>();
            map.put("token",token);
            map.put("uuid",uuid);
@@ -382,7 +382,7 @@
            log.setName(name);
            log.setIsdeleted(Constants.ZERO);
            log.setRequest(JSONObject.toJSONString(map));
            log.setType(Constants.ONE);
            log.setType(type);
            log.setSuccess(success);
            log.setRepose(respone);
            iamInterfaceLogMapper.insert(log);

 server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java

@@ -57,10 +57,10 @@
        if(StringUtils.isBlank(content)){
            return false;
        }
        String appkey ="581ba98d70ae2b85c4ecb9c785";
        String urlStr =  "http://wx.zhibang.com/api/QR/Face_UserSms?TenantId=2&smstype=6&" ;
//        String appkey = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_KEY);
//        String urlStr =  (String)redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_URL) ;
//        String appkey ="581ba98d70ae2b85c4ecb9c785";
//        String urlStr =  "http://wx.zhibang.com/api/QR/Face_UserSms?TenantId=2&smstype=6&" ;
        String appkey = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_KEY);
        String urlStr =  (String)redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_URL) ;
        try {
            StringBuffer sb = new StringBuffer(urlStr);
            Integer _t = (int) System.currentTimeMillis();
@@ -105,7 +105,7 @@
            log.setCreateDate(new Date());
            log.setUrl(url);
            log.setEditDate(log.getCreateDate());
            log.setPlat(Constants.ZERO);
            log.setPlat(Constants.ONE);
            log.setName(name);
            log.setIsdeleted(Constants.ZERO);
            log.setRequest(param);

 server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java

@@ -19,6 +19,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;

import java.util.Date;
@@ -36,6 +37,9 @@
public class ZbomZhongTaiServiceImpl implements ZbomZhongTaiService {
    @Autowired
    private InterfaceLogMapper interfaceLogMapper;
    @Autowired
    private RedisTemplate<String, Object> redisTemplate;

    /**
     * èŽ·å–用户登陆token
     * @param param
@@ -287,7 +291,8 @@
            Map<String,String> headers = new HashMap<>();
            headers.put(ZTConstants.HEADER_TOKEN,token);
            headers.put(ZTConstants.HEADER_USERTYPE,userType);
            res = HttpsUtil.postJsonWithHeaders(url,param,headers);
            String index = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_ZHONGTAI_API_URL);
            res = HttpsUtil.postJsonWithHeaders(index+url,param,headers);
            TypeReference typeReference =
                    new TypeReference<ZTBaseResponse<T>>(){};
            ZTBaseResponse<T>  result = JSONObject.parseObject(res, typeReference.getType());

 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java

@@ -10,8 +10,8 @@
    public static  String DEFAULT_PID = "1";//默认省市区pid=1表示取全中国
    public interface IntegerUrl{
        String USER_UPDATE_URL ="customer/api/sync";
        String USER_GET_TOKEN_URL ="http://api.dev.zbom.7zcloud.com/customer/api/login";
        String USER_LOGOUT_URL ="http://api.dev.zbom.7zcloud.com/customer/api/disable";
        String USER_GET_TOKEN_URL ="/customer/api/login";
        String USER_LOGOUT_URL ="/customer/api/disable";
        String CATALOG_LIST_URL ="/content/api/catalog";
        String CONTENT_LIST_URL ="/content/api/page";
        String CONTENT_INFO_URL ="/content/api/detail/";
@@ -21,7 +21,7 @@
        String LIKE_DO_URL ="/content/api/like";
        String COLLECT_LIST_URL ="/behavior/getFavorite";
        String LIKE_LIST_URL ="/behavior/getLike";
        String AREA_LIST_URL ="/admin/bAreaRegion/getChildren";
        String AREA_LIST_URL ="/base/admin/bAreaRegion/getChildren";
    }
    public interface IntegerName{
        String USER_UPDATE_NAME ="用户信息同步";

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -320,6 +320,7 @@


    public static final String WX_PLATFORM = "WX_PLATFORM";
    public static final String ZBOM_ZHONGTAI_API_URL = "ZBOM_ZHONGTAI_API_URL";
    public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
    public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
    public static final String WX_PLATFORM_SECRET = "WX_PLATFORM_SECRET";
@@ -363,6 +364,7 @@
       String ZBOM_CRM_API_KEY ="ZBOM_CRM_API_KEY";
       String ZBOM_CRM_API_URL ="ZBOM_CRM_API_URL";
       String ZBOM_SMS_API_KEY ="ZBOM_SMS_API_KEY";
       String ZBOM_ZHONGTAI_API_URL ="ZBOM_ZHONGTAI_API_URL";
       String ZBOM_SMS_API_URL ="ZBOM_SMS_API_URL";
       String IAM_APPKEY ="IAM_APPKEY";
       String SHOP_TREE ="SHOP_TREE";

 server/service/src/main/java/com/doumee/service/business/InitService.java

@@ -28,23 +28,23 @@
    @Lazy
    private SystemDictDataBiz  systemDictDataBiz;

    @PostConstruct
    public void clearImporting(){
        redisTemplate.delete(Constants.RedisKeys.IMPORTING_SHOP);
        redisTemplate.delete(Constants.RedisKeys.IMPORTING_USERS);
    }
    @PostConstruct
    public void initIamAppIdAndAppKey(){
    public void refreshZbomDictDataCache(){
        redisTemplate.opsForValue().set(Constants.RedisKeys.IAM_APPKEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_IAM_APPKEY).getCode());
        redisTemplate.opsForValue().set(Constants.RedisKeys.IAM_APPID,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_IAM_APPID).getCode());
        redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_CRM_API_KEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_CRM_API_KEY).getCode());
        redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_CRM_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_CRM_API_URL).getCode());
        redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_SMS_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_SMS_API_URL).getCode());
        redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_SMS_API_KEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_SMS_API_KEY).getCode());
        redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_ZHONGTAI_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_ZHONGTAI_API_URL).getCode());
    }
    @PostConstruct
    public void cacheShopTree(){
//        redisTemplate.opsForValue().set(Constants.RedisKeys.SHOP_TREE,shopService.shopTree(null));
    }


}