From 6c993037fd99c12c49eecc623296cb5ebf9d599d Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 19 Sep 2023 09:09:18 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/mqtt/server/MqttCustomerClient.java | 16 ++++++++++++---- .../java/com/zhgd/xmgl/async/AsyncAiAnalyse.java | 9 +++++++-- .../EntProgressReportRecordController.java | 8 +++++--- .../government/GovEnterpriseController.java | 1 + .../government/GovInspectRecordController.java | 1 + .../GovProgressReportRecordController.java | 8 +++++--- .../government/GovWorkerStatController.java | 1 + .../project/ProgressReportRecordController.java | 8 +++++--- .../basicdata/mapper/xml/EngineeringMapper.xml | 2 +- .../service/impl/PolicyServiceImpl.java | 8 ++++---- .../service/impl/SystemUserServiceImpl.java | 1 + .../wisdom/mapper/xml/WorkerInfoMapper.xml | 2 +- 12 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zhgd/mqtt/server/MqttCustomerClient.java b/src/main/java/com/zhgd/mqtt/server/MqttCustomerClient.java index a6d98db..d48f334 100644 --- a/src/main/java/com/zhgd/mqtt/server/MqttCustomerClient.java +++ b/src/main/java/com/zhgd/mqtt/server/MqttCustomerClient.java @@ -5,7 +5,9 @@ import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - + +import java.util.List; + /** * @author yangkai * @description mqtt客户端 @@ -66,8 +68,14 @@ public class MqttCustomerClient { * @param topic * @param pushMessage */ - public void pushlish(String topic,String pushMessage){ - pushlish(0,false,topic,pushMessage); + public void publish(String topic,String pushMessage){ + publish(1,false,topic,pushMessage); + } + + public void publish(List userIds, String topic, String pushMessage){ + userIds.stream().forEach(u -> { + publish(1,false,topic + u,pushMessage); + }); } /** @@ -78,7 +86,7 @@ public class MqttCustomerClient { * @param topic 主题 * @param pushMessage 消息体 */ - public void pushlish(int qos,boolean retained,String topic,String pushMessage){ + public void publish(int qos,boolean retained,String topic,String pushMessage){ MqttMessage message=new MqttMessage(); message.setQos(qos); message.setRetained(retained); diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java b/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java index 93e8db0..167e6a9 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.async; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.mqtt.server.MqttCustomerClient; import com.zhgd.xmgl.modules.basicdata.entity.*; import com.zhgd.xmgl.modules.basicdata.service.IMessageRecordService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; @@ -34,6 +35,9 @@ public class AsyncAiAnalyse { @Autowired private IMessageRecordService messageRecordService; + @Autowired + private MqttCustomerClient mqttCustomerClient; + @Value("${mqtt-scope}") private String scope; @@ -89,8 +93,8 @@ public class AsyncAiAnalyse { } @Async("taskExecutor") - public void pushPolicy(String govSn, Policy policy) { - List userIds = systemUserService.getUserIdsByGovAndType(govSn, policy.getAcceptType()); + public void pushPolicy(String sn, Policy policy) { + List userIds = systemUserService.getUserIdsByGovAndType(sn, policy.getAcceptType()); if (userIds.size() == 0) { return; } @@ -105,5 +109,6 @@ public class AsyncAiAnalyse { messageRecord.setLastTime(createTime); messageRecord.setTitle(title); messageRecordService.saveOrUpdateInfo(messageRecord, userIds); +// mqttCustomerClient.publish(userIds,"wisdomSite/message/", JSON.toJSONString(messageRecord)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java index 26e36f0..0616451 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord; import com.zhgd.xmgl.modules.safety.service.IProgressReportRecordService; import io.swagger.annotations.Api; @@ -47,12 +48,13 @@ public class EntProgressReportRecordController { @OperLog(operModul = "工程进度上报记录管理", operType = "分页查询", operDesc = "分页列表查询工程进度上报记录信息") @ApiOperation(value = " 分页列表查询工程进度上报记录信息", notes = "分页列表查询工程进度上报记录信息", httpMethod = "POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "current", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"), - @ApiImplicitParam(name = "size", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer") + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/page") - public Result> queryPageList(Page page, @ApiIgnore @RequestBody Map map) { + public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map); + Page page = PageUtil.getPage(map); IPage pageList = progressReportRecordService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java index 40d66c0..ea4af2a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java @@ -73,6 +73,7 @@ public class GovEnterpriseController { public Result> queryPageList(@RequestBody Enterprise enterprise) { SecurityUser user = SecurityUtil.getUser(); enterprise.setGovernmentSn(user.getSn()); + enterprise.setState(1); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(enterprise); List list = enterpriseService.list(queryWrapper); return Result.success(list); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java index 0288500..ce0bce4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java @@ -288,6 +288,7 @@ public class GovInspectRecordController { if (inspectRecordEntity == null) { result.error500("未找到对应实体"); } else { + inspectRecord.setDeadline(inspectRecordEntity.getDeadline()); boolean ok = inspectRecordsService.examine(inspectRecord); if (ok) { result.success("审批成功!"); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java index 1a2bf1c..cc2631b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord; import com.zhgd.xmgl.modules.safety.service.IProgressReportRecordService; import io.swagger.annotations.Api; @@ -47,12 +48,13 @@ public class GovProgressReportRecordController { @OperLog(operModul = "工程进度上报记录管理", operType = "分页查询", operDesc = "分页列表查询工程进度上报记录信息") @ApiOperation(value = " 分页列表查询工程进度上报记录信息", notes = "分页列表查询工程进度上报记录信息", httpMethod = "POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "current", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"), - @ApiImplicitParam(name = "size", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer") + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/page") - public Result> queryPageList(Page page, @ApiIgnore @RequestBody Map map) { + public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map); + Page page = PageUtil.getPage(map); IPage pageList = progressReportRecordService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java index 5ca8d3e..d582056 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java @@ -109,6 +109,7 @@ public class GovWorkerStatController { if (StringUtils.isNotBlank(engineering.getEngineeringName())) { wrapper.like(Engineering::getEngineeringName, engineering.getEngineeringName()); } + wrapper.eq(Engineering::getExamineState, 3); return Result.success(engineeringService.engineeringStat(page, wrapper)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java index 623839e..1f944fa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord; import com.zhgd.xmgl.modules.safety.service.IProgressReportRecordService; import io.swagger.annotations.Api; @@ -47,12 +48,13 @@ public class ProgressReportRecordController { @OperLog(operModul = "工程进度上报记录管理", operType = "分页查询", operDesc = "分页列表查询工程进度上报记录信息") @ApiOperation(value = " 分页列表查询工程进度上报记录信息", notes = "分页列表查询工程进度上报记录信息", httpMethod = "POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "current", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"), - @ApiImplicitParam(name = "size", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer") + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/page") - public Result> queryPageList(Page page, @ApiIgnore @RequestBody Map map) { + public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map); + Page page = PageUtil.getPage(map); IPage pageList = progressReportRecordService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml index 5ba4d53..0f9b440 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml @@ -20,7 +20,7 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java index 8491ae8..41df5f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java @@ -13,7 +13,10 @@ import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.basicdata.entity.Policy; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.PolicyMapper; -import com.zhgd.xmgl.modules.basicdata.service.*; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; +import com.zhgd.xmgl.modules.basicdata.service.IGovernmentService; +import com.zhgd.xmgl.modules.basicdata.service.IPolicyService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.basicdata.vo.PolicyVo; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; @@ -47,9 +50,6 @@ public class PolicyServiceImpl extends ServiceImpl impleme @Autowired private AsyncAiAnalyse asyncAiAnalyse; - @Autowired - private IMessageRecordService messageRecordService; - @Override public Page fromMePageList(Page page, Wrapper wrapper) { return baseMapper.fromMePageList(page, wrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 3f0d138..810e7e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -75,6 +75,7 @@ public class SystemUserServiceImpl extends ServiceImpl wrapper = Wrappers.query(); SecurityUser user = SecurityUtil.getUser(); wrapper.eq("u.account_type", user.getAccountType()); + wrapper.eq("u.state", 1); if (systemUser.getSn() == null) { wrapper.eq("u.sn", user.getSn()); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml index 67b268b..a5347f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml @@ -53,7 +53,7 @@