|
|
@@ -8,6 +8,7 @@ import com.jzg.commons.core.page.HttpResult;
|
|
|
import com.jzg.commons.entity.dto.JyxConfigAdd;
|
|
|
import com.jzg.commons.entity.dto.JyxConfigEnd;
|
|
|
import com.jzg.commons.entity.dto.JyxConfigParam;
|
|
|
+import com.jzg.commons.entity.po.EsmInsCompany;
|
|
|
import com.jzg.commons.entity.po.JyxBlame;
|
|
|
import com.jzg.commons.entity.po.JyxConfig;
|
|
|
import com.jzg.commons.entity.po.jyxSetting;
|
|
|
@@ -17,6 +18,7 @@ import com.jzg.commons.util.ConvertUtils;
|
|
|
import com.jzg.commons.util.StringUtils;
|
|
|
import com.jzg.constants.ConstantsParent;
|
|
|
import com.jzg.mapper.JyxConfigMapper;
|
|
|
+import com.jzg.service.EsmInsCompanyService;
|
|
|
import com.jzg.service.JyxBlameService;
|
|
|
import com.jzg.service.JyxConfigService;
|
|
|
import com.jzg.service.jyxSettingService;
|
|
|
@@ -48,6 +50,9 @@ public class JyxConfigServiceImpl extends ServiceImpl<JyxConfigMapper, JyxConfig
|
|
|
@Autowired
|
|
|
private JyxBlameService blameService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private EsmInsCompanyService esmInsCompanyService;
|
|
|
+
|
|
|
|
|
|
|
|
|
@Override
|
|
|
@@ -110,7 +115,10 @@ public class JyxConfigServiceImpl extends ServiceImpl<JyxConfigMapper, JyxConfig
|
|
|
}
|
|
|
});
|
|
|
CompletableFuture.allOf(blameFuture, settingFuture).join();
|
|
|
-
|
|
|
+ EsmInsCompany byId = esmInsCompanyService.getById(jyxConfigVo.getCompany());
|
|
|
+ if(Objects.nonNull(byId)){
|
|
|
+ jyxConfigVo.setCompanyName(byId.getNameSimple());
|
|
|
+ }
|
|
|
return HttpResult.ok(jyxConfigVo);
|
|
|
} catch (Exception e) {
|
|
|
log.error("查询配置失败", e);
|