From 0eb6d8607d501ef013c9b599be095ee8f83b6558 Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 21 Oct 2023 11:56:43 +0800 Subject: [PATCH 1/7] fixed --- app/common/controller/ImController.php | 2 +- {extend => app/common/service}/workerim/Events.php | 3 ++- .../service}/workerim/start_businessworker.php | 14 +++++++------- .../common/service}/workerim/start_gateway.php | 10 +++++----- .../common/service}/workerim/start_register.php | 4 ++-- start.php | 2 +- start_for_win.bat | 2 +- 7 files changed, 19 insertions(+), 18 deletions(-) rename {extend => app/common/service}/workerim/Events.php (94%) rename {extend => app/common/service}/workerim/start_businessworker.php (57%) rename {extend => app/common/service}/workerim/start_gateway.php (73%) rename {extend => app/common/service}/workerim/start_register.php (66%) diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php index 4322edf1d..17cf6cac4 100644 --- a/app/common/controller/ImController.php +++ b/app/common/controller/ImController.php @@ -17,7 +17,7 @@ class ImController extends BaseLikeAdminController public function __construct(App $app) { parent::__construct($app); - Gateway::$registerAddress = "172.19.97.179:1256"; + Gateway::$registerAddress = env('worker.address').':'.env('worker.port'); } //获取场景值 diff --git a/extend/workerim/Events.php b/app/common/service/workerim/Events.php similarity index 94% rename from extend/workerim/Events.php rename to app/common/service/workerim/Events.php index 996076ea4..2aa21425b 100644 --- a/extend/workerim/Events.php +++ b/app/common/service/workerim/Events.php @@ -1,7 +1,8 @@ name = 'PushBusinessWorker'; $worker->count = 4; // 服务注册地址 -$worker->registerAddress = '172.19.97.179:1256'; +$worker->registerAddress = env('worker.address').':'.env('worker.port'); // 注册服务类 -$worker->eventHandler = 'workerim\Events'; +$worker->eventHandler = 'app\common\service\workerim\Events'; // 如果不是在根目录启动，则运行runAll方法 if(!defined('GLOBAL_START')) diff --git a/extend/workerim/start_gateway.php b/app/common/service/workerim/start_gateway.php similarity index 73% rename from extend/workerim/start_gateway.php rename to app/common/service/workerim/start_gateway.php index 7437e0276..5c653259f 100644 --- a/extend/workerim/start_gateway.php +++ b/app/common/service/workerim/start_gateway.php @@ -4,26 +4,26 @@ use \Workerman\Worker; use \GatewayWorker\Gateway; // 自动加载类 -require_once __DIR__ . '/../../vendor/autoload.php'; +require_once __DIR__ . '/../../../../vendor/autoload.php'; // gateway 进程，这里使用Text协议，可以用telnet测试 $gateway = new Gateway("Websocket://0.0.0.0:8282"); // gateway名称，status方便查看 -$gateway->name = 'worker_task_im'; +$gateway->name = env('worker.work_name'); // gateway进程数，一般设置2个就足够 $gateway->count = 4; // 本机ip，分布式部署时使用内网ip -$gateway->lanIp = '172.19.97.179'; +$gateway->lanIp = env('worker.address'); // 内部通讯起始端口，假如$gateway->count=2，起始端口为2900 // 则一般会使用3900 3901 3902 3903 4个端口作为内部通讯端口 -$gateway->startPort = 3900; +$gateway->startPort = env('worker.start_port'); // 服务注册地址 -$gateway->registerAddress = '172.19.97.179:1256'; +$gateway->registerAddress = env('worker.address').':'.env('worker.port'); // 心跳间隔 $gateway->pingInterval = 20; diff --git a/extend/workerim/start_register.php b/app/common/service/workerim/start_register.php similarity index 66% rename from extend/workerim/start_register.php rename to app/common/service/workerim/start_register.php index 5d4854240..aa0d8b34f 100644 --- a/extend/workerim/start_register.php +++ b/app/common/service/workerim/start_register.php @@ -3,10 +3,10 @@ use \Workerman\Worker; use \GatewayWorker\Register; // 自动加载类 -require_once __DIR__ . '/../../vendor/autoload.php'; +require_once __DIR__ . '/../../../../vendor/autoload.php'; // register 必须是text协议，切记不能将register端口开放给外网 -$register = new Register('text://172.19.97.179:1256'); +$register = new Register('text://'.env('worker.address').':'.env('worker.port')); // 如果不是在根目录启动，则运行runAll方法 if(!defined('GLOBAL_START')) diff --git a/start.php b/start.php index c29a03638..72b64ee8f 100644 --- a/start.php +++ b/start.php @@ -29,7 +29,7 @@ define('GLOBAL_START', 1); require_once __DIR__ . '/vendor/autoload.php'; // 加载所有Applications/*/start.php，以便启动所有服务 -foreach(glob(__DIR__.'/extend/workerim/start*.php') as $start_file) +foreach(glob(__DIR__.'/app/common/service/workerim/start*.php') as $start_file) { require_once $start_file; } diff --git a/start_for_win.bat b/start_for_win.bat index 604c848f8..bbcd605c6 100644 --- a/start_for_win.bat +++ b/start_for_win.bat @@ -1,3 +1,3 @@ CHCP 65001 -php extend\workerim\start_register.php extend\workerim\start_gateway.php extend\workerim\start_businessworker.php +php app\common\service\workerim\start_register.php app\common\service\workerim\start_gateway.php app\common\service\workerim\start_businessworker.php pause \ No newline at end of file From 3c79f88de1d54be5257e7f55464cd5acefdc6233 Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 21 Oct 2023 13:51:09 +0800 Subject: [PATCH 2/7] fixed --- app/common/service/workerim/start_businessworker.php | 2 +- app/common/service/workerim/start_gateway.php | 8 ++++---- app/common/service/workerim/start_register.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/common/service/workerim/start_businessworker.php b/app/common/service/workerim/start_businessworker.php index 99f51d8cf..07d89103e 100644 --- a/app/common/service/workerim/start_businessworker.php +++ b/app/common/service/workerim/start_businessworker.php @@ -17,7 +17,7 @@ $worker->name = 'PushBusinessWorker'; $worker->count = 4; // 服务注册地址 -$worker->registerAddress = env('worker.address').':'.env('worker.port'); +$worker->registerAddress = '172.19.97.179:1256'; // 注册服务类 $worker->eventHandler = 'app\common\service\workerim\Events'; diff --git a/app/common/service/workerim/start_gateway.php b/app/common/service/workerim/start_gateway.php index 5c653259f..b925962ed 100644 --- a/app/common/service/workerim/start_gateway.php +++ b/app/common/service/workerim/start_gateway.php @@ -10,20 +10,20 @@ require_once __DIR__ . '/../../../../vendor/autoload.php'; $gateway = new Gateway("Websocket://0.0.0.0:8282"); // gateway名称，status方便查看 -$gateway->name = env('worker.work_name'); +$gateway->name = 'worker_task_im'; // gateway进程数，一般设置2个就足够 $gateway->count = 4; // 本机ip，分布式部署时使用内网ip -$gateway->lanIp = env('worker.address'); +$gateway->lanIp = '172.19.97.179'; // 内部通讯起始端口，假如$gateway->count=2，起始端口为2900 // 则一般会使用3900 3901 3902 3903 4个端口作为内部通讯端口 -$gateway->startPort = env('worker.start_port'); +$gateway->startPort = 3900; // 服务注册地址 -$gateway->registerAddress = env('worker.address').':'.env('worker.port'); +$gateway->registerAddress = '172.19.97.179:1256'; // 心跳间隔 $gateway->pingInterval = 20; diff --git a/app/common/service/workerim/start_register.php b/app/common/service/workerim/start_register.php index aa0d8b34f..d2da32b52 100644 --- a/app/common/service/workerim/start_register.php +++ b/app/common/service/workerim/start_register.php @@ -6,7 +6,7 @@ use \GatewayWorker\Register; require_once __DIR__ . '/../../../../vendor/autoload.php'; // register 必须是text协议，切记不能将register端口开放给外网 -$register = new Register('text://'.env('worker.address').':'.env('worker.port')); +$register = new Register('text://172.19.97.179:1256'); // 如果不是在根目录启动，则运行runAll方法 if(!defined('GLOBAL_START')) From e1d6aced4c0e41bcd3e39d814ab43a6a307d77ae Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 21 Oct 2023 13:56:01 +0800 Subject: [PATCH 3/7] fixed --- app/common/controller/ImController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php index 17cf6cac4..4322edf1d 100644 --- a/app/common/controller/ImController.php +++ b/app/common/controller/ImController.php @@ -17,7 +17,7 @@ class ImController extends BaseLikeAdminController public function __construct(App $app) { parent::__construct($app); - Gateway::$registerAddress = env('worker.address').':'.env('worker.port'); + Gateway::$registerAddress = "172.19.97.179:1256"; } //获取场景值 From ea0ddac967c213df651e518fdd44fa5886404bd4 Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 21 Oct 2023 14:09:42 +0800 Subject: [PATCH 4/7] fixed --- vendor/workerman/gateway-worker/src/BusinessWorker.php | 2 +- vendor/workerman/gateway-worker/src/Gateway.php | 2 +- vendor/workerman/gateway-worker/src/Lib/Gateway.php | 2 +- vendor/workerman/gatewayclient/Gateway.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/workerman/gateway-worker/src/BusinessWorker.php b/vendor/workerman/gateway-worker/src/BusinessWorker.php index a87831f2f..bf9bea5c0 100644 --- a/vendor/workerman/gateway-worker/src/BusinessWorker.php +++ b/vendor/workerman/gateway-worker/src/BusinessWorker.php @@ -43,7 +43,7 @@ class BusinessWorker extends Worker * * @var string|array */ - public $registerAddress = '127.0.0.1:1236'; + public $registerAddress = '172.19.97.179:1256'; /** * 事件处理类，默认是 Event 类 diff --git a/vendor/workerman/gateway-worker/src/Gateway.php b/vendor/workerman/gateway-worker/src/Gateway.php index 205dc42db..48453b95a 100644 --- a/vendor/workerman/gateway-worker/src/Gateway.php +++ b/vendor/workerman/gateway-worker/src/Gateway.php @@ -83,7 +83,7 @@ class Gateway extends Worker * * @var string|array */ - public $registerAddress = '127.0.0.1:1236'; + public $registerAddress = '172.19.97.179:1256'; /** * 是否可以平滑重启，gateway 不能平滑重启，否则会导致连接断开 diff --git a/vendor/workerman/gateway-worker/src/Lib/Gateway.php b/vendor/workerman/gateway-worker/src/Lib/Gateway.php index a027bc49b..e3caa176e 100644 --- a/vendor/workerman/gateway-worker/src/Lib/Gateway.php +++ b/vendor/workerman/gateway-worker/src/Lib/Gateway.php @@ -34,7 +34,7 @@ class Gateway * * @var string|array */ - public static $registerAddress = '127.0.0.1:1236'; + public static $registerAddress = '172.19.97.179:1256'; /** * 秘钥 diff --git a/vendor/workerman/gatewayclient/Gateway.php b/vendor/workerman/gatewayclient/Gateway.php index f79f81fda..f3ea69040 100644 --- a/vendor/workerman/gatewayclient/Gateway.php +++ b/vendor/workerman/gatewayclient/Gateway.php @@ -36,7 +36,7 @@ class Gateway * * @var string|array */ - public static $registerAddress = '127.0.0.1:1236'; + public static $registerAddress = '172.19.97.179:1256'; /** * 秘钥 From 5c4a77fc9caeefbcf0e0273323fb087af7ed273b Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 21 Oct 2023 14:11:55 +0800 Subject: [PATCH 5/7] fixed --- vendor/workerman/gateway-worker/src/BusinessWorker.php | 2 +- vendor/workerman/gateway-worker/src/Gateway.php | 2 +- vendor/workerman/gateway-worker/src/Lib/Gateway.php | 2 +- vendor/workerman/gatewayclient/Gateway.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/workerman/gateway-worker/src/BusinessWorker.php b/vendor/workerman/gateway-worker/src/BusinessWorker.php index bf9bea5c0..a87831f2f 100644 --- a/vendor/workerman/gateway-worker/src/BusinessWorker.php +++ b/vendor/workerman/gateway-worker/src/BusinessWorker.php @@ -43,7 +43,7 @@ class BusinessWorker extends Worker * * @var string|array */ - public $registerAddress = '172.19.97.179:1256'; + public $registerAddress = '127.0.0.1:1236'; /** * 事件处理类，默认是 Event 类 diff --git a/vendor/workerman/gateway-worker/src/Gateway.php b/vendor/workerman/gateway-worker/src/Gateway.php index 48453b95a..205dc42db 100644 --- a/vendor/workerman/gateway-worker/src/Gateway.php +++ b/vendor/workerman/gateway-worker/src/Gateway.php @@ -83,7 +83,7 @@ class Gateway extends Worker * * @var string|array */ - public $registerAddress = '172.19.97.179:1256'; + public $registerAddress = '127.0.0.1:1236'; /** * 是否可以平滑重启，gateway 不能平滑重启，否则会导致连接断开 diff --git a/vendor/workerman/gateway-worker/src/Lib/Gateway.php b/vendor/workerman/gateway-worker/src/Lib/Gateway.php index e3caa176e..a027bc49b 100644 --- a/vendor/workerman/gateway-worker/src/Lib/Gateway.php +++ b/vendor/workerman/gateway-worker/src/Lib/Gateway.php @@ -34,7 +34,7 @@ class Gateway * * @var string|array */ - public static $registerAddress = '172.19.97.179:1256'; + public static $registerAddress = '127.0.0.1:1236'; /** * 秘钥 diff --git a/vendor/workerman/gatewayclient/Gateway.php b/vendor/workerman/gatewayclient/Gateway.php index f3ea69040..f79f81fda 100644 --- a/vendor/workerman/gatewayclient/Gateway.php +++ b/vendor/workerman/gatewayclient/Gateway.php @@ -36,7 +36,7 @@ class Gateway * * @var string|array */ - public static $registerAddress = '172.19.97.179:1256'; + public static $registerAddress = '127.0.0.1:1236'; /** * 秘钥 From 332c7ed49401d422e8651ab70e6967be39fc67cc Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 21 Oct 2023 17:58:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=BA=AF=E6=BA=90?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B0=83=E7=94=A8=E7=9A=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=86=9C=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/InformationController.php | 63 ++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php index 8b8f544d0..b90edc704 100644 --- a/app/api/controller/InformationController.php +++ b/app/api/controller/InformationController.php @@ -4,12 +4,16 @@ namespace app\api\controller; use app\common\model\informationg\UserInformationg; use app\common\logic\BaseLogic; +use app\common\model\informationg\UserInformationgDemand; use app\common\model\task\Task; use app\common\model\task_template\TaskTemplate; use app\common\model\user\User; +use think\response\Json; class InformationController extends BaseApiController { + public array $notNeedLogin = ['farmerInfo']; + public function list() { $param = Request()->param(); @@ -128,4 +132,63 @@ class InformationController extends BaseApiController } return $this->success('成功'); } + + //获取农户信息，该接口溯源系统调用 + public function farmerInfo(): Json + { + //获取参数 + $params = $this->request->get(['user_id']); + if(empty($params['user_id'])){ + return $this->fail('参数错误'); + } + //获取农户信息 + $farmerInfo = UserInformationg::where('id', $params['user_id'])->field('id,create_user_id,company_id,name,phone,area_id,street_id,village_id,brigade_id,area_id area_name,street_id street_name,village_id village_name,brigade_id brigade_name')->find()->toArray(); + unset($farmerInfo['area_id'],$farmerInfo['street_id'],$farmerInfo['village_id'],$farmerInfo['brigade_id']); + $data = UserInformationgDemand::field('id,category_child,data')->where('information_id', $params['user_id'])->where('category_id',6)->where('category_child','in','7,32')->order('id', 'desc')->select()->toArray(); + //是否是种植户 + $farmerInfo['is_zz_user'] = false; + //是否是水产养殖户 + $farmerInfo['is_sc_user'] = false; + //是否是家禽养殖户 + $farmerInfo['is_jq_user'] = false; + //是否是大型动物养殖户 + $farmerInfo['is_dw_user'] = false; + //土地总面积 + $farmerInfo['total_land_area'] = 0; + //池塘总面积 + $farmerInfo['total_pond_area'] = 0; + //家禽养殖场总面积 + $farmerInfo['total_henhouse_area'] = 0; + //动物养殖场总面积 + $farmerInfo['total_pasture_area'] = 0; + foreach($data as $v){ + if($v['category_child'] == 7){ + $farmerInfo['is_zz_user'] = true; + $farmerInfo['total_land_area'] += floatval($v['data']['area']); + $farmerInfo['land_detail'][] = [ + 'land_id' => $v['id'], + 'land_area' => $v['data']['area'], + 'land_notes' => $v['data']['notes'], + ]; + } + if($v['category_child'] == 32){ + if($v['data']['breeding_type'] == 1){//水产 + $farmerInfo['is_sc_user'] = true; + $farmerInfo['total_pond_area'] += floatval($v['data']['area']); + $farmerInfo['pond_detail'][] = [ + 'pond_id' => $v['id'], + 'pond_area' => $v['data']['area'], + 'pond_notes' => $v['data']['notes'], + ]; + }elseif ($v['data']['breeding_type'] == 2) {//脯乳动物 + $farmerInfo['is_jq_user'] = true; + $farmerInfo['total_henhouse_area'] += floatval($v['data']['area']); + }elseif ($v['data']['breeding_type'] == 3){//家禽 + $farmerInfo['is_dw_user'] = true; + $farmerInfo['total_pasture_area'] += floatval($v['data']['area']); + } + } + } + return $this->success('请求成功',$farmerInfo); + } } From f6a207cb61bddc6f877d5acb158cd7ededcf0fdf Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 23 Oct 2023 09:32:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BA=AF=E6=BA=90?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AF=B7=E6=B1=82=E4=BE=9B=E9=94=80=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=86=9C=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/InformationController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php index b90edc704..2768cdd58 100644 --- a/app/api/controller/InformationController.php +++ b/app/api/controller/InformationController.php @@ -137,7 +137,7 @@ class InformationController extends BaseApiController public function farmerInfo(): Json { //获取参数 - $params = $this->request->get(['user_id']); + $params = $this->request->post(['user_id']); if(empty($params['user_id'])){ return $this->fail('参数错误'); }