admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
pengjie 2023-09-19 09:09:18 +08:00
parent 3c9acb7ad1
commit 6c993037fd
12 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/zhgd/mqtt/server/MqttCustomerClient.java
View File

@ -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<String> 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);

9
src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java
View File

@ -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<String> userIds = systemUserService.getUserIdsByGovAndType(govSn, policy.getAcceptType());
public void pushPolicy(String sn, Policy policy) {
List<String> 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));
}
}

8
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java
View File

@ -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<IPage<ProgressReportRecord>> queryPageList(Page page, @ApiIgnore @RequestBody Map<String, Object> map) {
public Result<IPage<ProgressReportRecord>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
Page page = PageUtil.getPage(map);
IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java
View File

@ -73,6 +73,7 @@ public class GovEnterpriseController {
public Result<List<Enterprise>> queryPageList(@RequestBody Enterprise enterprise) {
SecurityUser user = SecurityUtil.getUser();
enterprise.setGovernmentSn(user.getSn());
enterprise.setState(1);
QueryWrapper<Enterprise> queryWrapper = QueryGenerator.initQueryWrapper(enterprise);
List<Enterprise> list = enterpriseService.list(queryWrapper);
return Result.success(list);

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java
View File

@ -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("审批成功!");

8
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java
View File

@ -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<IPage<ProgressReportRecord>> queryPageList(Page page, @ApiIgnore @RequestBody Map<String, Object> map) {
public Result<IPage<ProgressReportRecord>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
Page page = PageUtil.getPage(map);
IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java
View File

@ -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));
}

8
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java
View File

@ -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<IPage<ProgressReportRecord>> queryPageList(Page page, @ApiIgnore @RequestBody Map<String, Object> map) {
public Result<IPage<ProgressReportRecord>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
Page page = PageUtil.getPage(map);
IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
return Result.success(pageList);
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml
View File

@ -20,7 +20,7 @@
<select id="engineeringStat" resultType="com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat">
SELECT e.engineering_sn, e.engineering_name, e.province, e.city, e.district, e.address, e.state, e.engineering_type,
e.engineering_code, e.engineering_area, e.engineering_use, e.start_time, e.end_time
FROM engineering e WHERE e.examine_state = 3
FROM engineering e
${ew.customSqlSegment}
</select>

8
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java
View File

@ -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<PolicyMapper, Policy> impleme
@Autowired
private AsyncAiAnalyse asyncAiAnalyse;
@Autowired
private IMessageRecordService messageRecordService;
@Override
public Page<PolicyDto> fromMePageList(Page page, Wrapper<Policy> wrapper) {
return baseMapper.fromMePageList(page, wrapper);

1
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -75,6 +75,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
QueryWrapper<SystemUser> wrapper = Wrappers.<SystemUser>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 {

2
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerInfoMapper.xml
View File

@ -53,7 +53,7 @@
</select>
<select id="statGroupByWorkerType" resultType="com.zhgd.xmgl.modules.wisdom.statistics.WorkerAttributeStat">
SELECT worker_type attribute, COUNT(1) as workerNum FROM worker_info GROUP BY worker_type ORDER BY workerNum DESC
SELECT worker_type attribute, COUNT(1) as workerNum FROM worker_info WHERE person_type = 2 GROUP BY worker_type ORDER BY workerNum DESC
</select>
<select id="statGroupByRegister" resultType="com.zhgd.xmgl.modules.wisdom.statistics.WorkerAttributeStat">