Merge branch 'master' of 39.100.151.123:hwq/micro (e0a1c1a3) · Commits · without_auth / meibuyu-micro

src/Service/Interfaces/BaseInfoServiceInterface.php

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -66,44 +66,44 @@ interface BaseInfoServiceInterface
	* 根据id获取单个数据		* 根据id获取单个数据
	* @param int $id 货币id		* @param int $id 货币id
	* @param array $columns 要显示的字段默认全部 ['id', 'name', 'code', 'symbol']		* @param array $columns 要显示的字段默认全部 ['id', 'name', 'code', 'symbol']
	* @return array		* @return array\|null
	*/		*/
	public function getCurrencyById($id, array $columns = ['id', 'name', 'code', 'symbol']): array;		public function getCurrencyById($id, array $columns = ['id', 'name', 'code', 'symbol']);

	/**		/**
	* 根据id获取单个数据		* 根据id获取单个数据
	* @param int $id		* @param int $id
	* @param array $columns 要显示的字段默认全部		* @param array $columns 要显示的字段默认全部
	* @return array		* @return array\|null
	*/		*/
	public function getCountryById($id, array $columns = ['*']): array;		public function getCountryById($id, array $columns = ['*']);

	/**		/**
	* 获取单个团队数据		* 获取单个团队数据
	* @param int $id		* @param int $id
	* @param array $relations 支持的关联关系 ['leader', 'sites', "users", "parent", "children"] 分别代表负责人、团队下的站点、团队成员、父级团队，再级团队		* @param array $relations 支持的关联关系 ['leader', 'sites', "users", "parent", "children"] 分别代表负责人、团队下的站点、团队成员、父级团队，再级团队
	* @param array $columns 要显示的字段默认['id', 'pid', "name", "leader_user_id", "leader_user_id", "department_id"]		* @param array $columns 要显示的字段默认['id', 'pid', "name", "leader_user_id", "leader_user_id", "department_id"]
	* @return array		* @return array\|null
	*/		*/
	public function getTeamById($id, array $relations = [], array $columns = ['id', 'pid', "name", "leader_user_id", "leader_user_id", "department_id"]): array;		public function getTeamById($id, array $relations = [], array $columns = ['id', 'pid', "name", "leader_user_id", "leader_user_id", "department_id"]);

	/**		/**
	* 获取单个站点数据		* 获取单个站点数据
	* @param int $id		* @param int $id
	* @param array $relations $relations 支持的关联关系 ['team', 'country'] 分别代表团队、国家、		* @param array $relations $relations 支持的关联关系 ['team', 'country'] 分别代表团队、国家、
	* @param array $columns 要显示的字段默认['id', "name", "url", "country_id", "team_id"]		* @param array $columns 要显示的字段默认['id', "name", "url", "country_id", "team_id"]
	* @return array		* @return array\|null
	*/		*/
	public function getSiteById($id, array $relations = [], array $columns = ['id', "name", "url", "country_id", "team_id"]): array;		public function getSiteById($id, array $relations = [], array $columns = ['id', "name", "url", "country_id", "team_id"]);

	/**		/**
	* 根据团队id获取对应的站点列表		* 根据团队id获取对应的站点列表
	* @param int $teamId 团队id		* @param int $teamId 团队id
	* @param array $relations $relations 支持的关联关系 ['team', 'country'] 分别代表团队、国家、		* @param array $relations $relations 支持的关联关系 ['team', 'country'] 分别代表团队、国家、
	* @param array $columns 要显示的字段默认['id', "name", "url", "country_id", "team_id"]		* @param array $columns 要显示的字段默认['id', "name", "url", "country_id", "team_id"]
	* @return array		* @return array\|null
	*/		*/
	public function getSiteListByTeamId($teamId, array $relations = [], array $columns = ['id', "name", "url", "country_id", "team_id"]): array;		public function getSiteListByTeamId($teamId, array $relations = [], array $columns = ['id', "name", "url", "country_id", "team_id"]);

	/**		/**
	* 返回所有货币数据		* 返回所有货币数据

src/Service/Interfaces/MessageTemplateServiceInterface.php

0 → 100644

+20 −0

Original line number	Original line	Diff line number	Diff line
			<?php
			/**
			* Created by PhpStorm.
			* User: 姜克保
			* Date: 2020/5/20
			* Time: 15:48
			*/

			namespace Meibuyu\Micro\Service\Interfaces;

			interface MessageTemplateServiceInterface
			{
			/**
			* 返回替换后的模板内容
			* @param int $template_id 模板id
			* @param array $replace 替换内容（注意顺序）
			* @return string
			*/
			public function getMessage(int $template_id, array $replace = []): string;
			}

src/Service/Interfaces/WebSocketServiceInterface.php

0 → 100644

+13 −0

Original line number	Original line	Diff line number	Diff line
			<?php
			/**
			* Created by PhpStorm.
			* User: 姜克保
			* Date: 2020/5/20
			* Time: 15:48
			*/

			namespace Meibuyu\Micro\Service\Interfaces\DingTalk;

			interface WebSocketServiceInterface
			{
			}

src/Tools/ExcelImporter.php

+31 −5

Original line number	Original line	Diff line number	Diff line
	@@ -121,14 +121,15 @@ class ExcelImporter
	* @param $errorCount		* @param $errorCount
	* @throws \PhpOffice\PhpSpreadsheet\Exception		* @throws \PhpOffice\PhpSpreadsheet\Exception
	*/		*/
	public function checkRequire($requires, $errorCount)		public function checkRequire($requires, &$errorCount)
	{		{
	foreach ($requires as $k => $v) {		foreach ($requires as $k => $v) {
	if ($v === '') {		if (!$v \|\| $v === '') {
	$this->setErrorMessage($k . "不能为空", $errorCount);		$this->setErrorMessage($k . "不能为空", $errorCount);
	continue;		return false;
	}		}
	}		}
			return true;
	}		}

	/**		/**
	@@ -137,14 +138,15 @@ class ExcelImporter
	* @param $errorCount		* @param $errorCount
	* @throws \PhpOffice\PhpSpreadsheet\Exception		* @throws \PhpOffice\PhpSpreadsheet\Exception
	*/		*/
	public function checkNumeric($data, $errorCount)		public function checkNumeric($data, &$errorCount)
	{		{
	foreach ($data as $k => $v) {		foreach ($data as $k => $v) {
	if (!is_numeric($v)) {		if (!is_numeric($v)) {
	$this->setErrorMessage("{$k}只能是数字", $errorCount);		$this->setErrorMessage("{$k}只能是数字", $errorCount);
	continue;		return false;
	}		}
	}		}
			return true;
	}		}

	/**		/**
	@@ -228,4 +230,28 @@ class ExcelImporter
	return $this->errorColumn;		return $this->errorColumn;
	}		}

			/**
			* 对比不同的数据,返回是否有不同
			* @param array $list
			* @param array $data
			* @return bool
			*/
			public static function checkDiffVal(array $list, array $data)
			{
			foreach ($list as $key => $val) {
			if (isset($data[$key]) && $data[$key]) {
			if (is_array($val)) {
			if (self::checkDiffVal($val, $data[$key])) {
			return true;
			}
			} else {
			if ($list[$key] !== $data[$key]) {
			return true;
			}
			}
			}
			}
			return false;
			}

	}		}