yangys
2024-10-30 d51367b0fe1a062d3eae47e3f7555ab3e56e6a08
修改程序名称为smartman-api
已修改2个文件
已删除2个文件
58 ■■■■ 文件已修改
smart-man-boot/src/main/java/com/qianwen/smartman/common/config/ForestConfig.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CommonConstant.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/forestClient/PerfForestClient.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/service/impl/EmployeeSendServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/common/config/ForestConfig.java
文件已删除
smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/CommonConstant.java
@@ -2,8 +2,8 @@
public interface CommonConstant {
    public static final String SERIAL_CONFIG_ADDRESS = "serial.config.address";
    public static final String DMP_CONFIG_NAME = "system.dmp.url";
    public static final String APPLICATION_NAME = "blade-api";
    //public static final String DMP_CONFIG_NAME = "system.dmp.url";
    public static final String APPLICATION_NAME = "smartman-api";
    public static final String SWORD_NAME = "sword";
    public static final String SABER_NAME = "saber";
    public static final String DEFAULT_PARAM_PASSWORD = "account.initPassword";
smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/forestClient/PerfForestClient.java
文件已删除
smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/service/impl/EmployeeSendServiceImpl.java
@@ -9,22 +9,24 @@
import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.smis.dto.MachineExtDTO;
import com.qianwen.smartman.modules.smis.service.IMachineService;
import com.qianwen.smartman.modules.perf.forestClient.PerfForestClient;
//import com.qianwen.smartman.modules.perf.forestClient.PerfForestClient;
import com.qianwen.smartman.modules.perf.service.IEmployeeSendService;
import com.qianwen.smartman.modules.sync.constant.QyWechatConstant;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
/**
 * 鍙兘璇ョ被娌℃湁鐢ㄤ簡
 */
@Service
public class EmployeeSendServiceImpl implements IEmployeeSendService {
    private static final Logger log = LoggerFactory.getLogger(EmployeeSendServiceImpl.class);
    private final IMachineService machineService;
    private final PerfForestClient forestClient;
    //private final PerfForestClient forestClient;
    public EmployeeSendServiceImpl(final IMachineService machineService, final PerfForestClient forestClient) {
    public EmployeeSendServiceImpl(final IMachineService machineService) {//, final PerfForestClient forestClient
        this.machineService = machineService;
        this.forestClient = forestClient;
        //this.forestClient = forestClient;
    }
    
@@ -38,7 +40,7 @@
                String dmpId = this.machineService.queryDateTypeState(wId);
                if (Func.isNotBlank(dmpId)) {
                    try {
                        String employeeOnOff = this.forestClient.perfEmployeeOnOff(ext.getExtendId(), dmpId);
                        String employeeOnOff = "{}";//yangys 鍘绘帀浜嗭紝241030this.forestClient.perfEmployeeOnOff(ext.getExtendId(), dmpId);
                        JSONObject jsonObject = JSON.parseObject(employeeOnOff);
                        Boolean success = jsonObject.getBoolean(QyWechatConstant.CALLBACK_RESULT);
                        if (Boolean.FALSE.equals(success)) {