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

接口调整

Browse Source
This commit is contained in:
pengjie 2023-03-24 17:33:44 +08:00
parent 842d72d2bc
commit 3f9a5fefd3
50 changed files with 394 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java
View File

@ -12,7 +12,9 @@ import com.zhgd.xmgl.modules.basicdata.mapper.AttendanceDevMapper;
import com.zhgd.xmgl.modules.basicdata.service.IAttendanceDevSyncService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService;
import com.zhgd.xmgl.util.HttpUtil;
import com.zhgd.xmgl.util.ParamEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
@ -39,16 +41,20 @@ public class AsyncAttendance {
/**
* 同步考勤设备信息
* @param requestUrl
* @param type
* @param attendanceDev
*/
@Async("countAttendanceExecutor")
public void syncAttendanceDev(String requestUrl, AttendanceDev attendanceDev) {
public void syncAttendanceDev(Integer type, AttendanceDev attendanceDev) {
String requestUrl = buildRequestUrl(type, attendanceDev.getProduceId());
if (requestUrl == null) {
return;
}
try {
JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(attendanceDev));
// 推送同步信息
String result = HttpUtil.doPost(requestUrl, jsonObject.toString());
int state = result == null ? 0 : 1;
int state = StringUtils.isBlank(result) ? 0 : 1;
// 记录推送信息
AttendanceDevSync attendanceDevSync = new AttendanceDevSync();
attendanceDevSync.setMainId(attendanceDev.getCode());
@ -72,25 +78,19 @@ public class AsyncAttendance {
public void syncAttendanceWorker(Integer type, WorkerInfo workerInfo) {
try {
// 查询人员项目/工程对应的设备厂商信息
List<String> productList = attendanceDevMapper.getProductList(workerInfo, "ignoreDataScope");
List<Integer> productIdList = attendanceDevMapper.getProductList(workerInfo, "ignoreDataScope");
List<AttendanceDev> attendanceDevList = attendanceDevMapper.getList(workerInfo, "ignoreDataScope");
for (String product : productList) {
SystemDictData data = systemDictDataService.getOne(Wrappers.<SystemDictData>lambdaQuery()
.eq(SystemDictData::getDictLabel, type).eq(SystemDictData::getDictType, product));
if (data == null) {
for (Integer productId : productIdList) {
String requestUrl = buildRequestUrl(type, productId);
if (requestUrl == null) {
continue;
}
String requestUrl = data.getRemark();
JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(workerInfo));
jsonObject.put("attendDevList", JSONArray.parseArray(JSON.toJSONString(
attendanceDevList.stream().filter(a -> a.getProduceName().equals(product)).collect(Collectors.toList()))));
attendanceDevList.stream().filter(a -> a.getProduceId().equals(productId)).collect(Collectors.toList()))));
// 推送同步信息
String result = HttpUtil.doPost(requestUrl, jsonObject.toString());
int state = 1;
if (result == null) {
//请求未成功,记录状态
state = 0;
}
int state = StringUtils.isBlank(result) ? 0 : 1;
// 记录推送信息
AttendanceDevSync attendanceDevSync = new AttendanceDevSync();
attendanceDevSync.setMainId(workerInfo.getId().toString());
@ -106,4 +106,22 @@ public class AsyncAttendance {
log.error("推送考勤人员数据出现异常");
}
}
/**
*
* @param type 请求类型
* @param productId 厂商ID
* @return
*/
private String buildRequestUrl(Integer type, Integer productId) {
SystemDictData prefix = systemDictDataService.getOne(Wrappers.<SystemDictData>lambdaQuery()
.eq(SystemDictData::getDictLabel, productId).eq(SystemDictData::getDictType, ParamEnum.SysDictType.ATTEND_DEV_PRODUCE.getValue()));
SystemDictData suffix = systemDictDataService.getOne(Wrappers.<SystemDictData>lambdaQuery()
.eq(SystemDictData::getDictLabel, type).eq(SystemDictData::getDictType, ParamEnum.SysDictType.ATTEND_SYNC_API.getValue()));
if (prefix == null || suffix == null || prefix.getStatus() != 1 || suffix.getStatus() != 1) {
return null;
} else {
return prefix.getRemark() + suffix.getRemark();
}
}
}

26
src/main/java/com/zhgd/xmgl/config/FaceRunner.java
View File

@ -41,20 +41,20 @@ public class FaceRunner implements CommandLineRunner {
String os = System.getProperty("os.name");
log.info("服务器系统" + os);
//如果是Windows系统
if (os.toLowerCase().startsWith("win") || os.toLowerCase().startsWith("linux")) {
String sdkKey = "";
if (os.toLowerCase().startsWith("linux")) {
sdkKey = linuxSdkKey;
} else {
sdkKey = winsSdkKey;
}
//log.info(HCNetSDKPath.DLL_PATH+"dll");
log.info(dllPath);
faceEngine = new FaceEngine(dllPath);
//激活引擎
int errorCode = faceEngine.activeOnline(appId, sdkKey);
if (os.toLowerCase().startsWith("win") || os.toLowerCase().startsWith("linux")) {
String sdkKey = "";
if (os.toLowerCase().startsWith("linux")) {
sdkKey = linuxSdkKey;
} else {
sdkKey = winsSdkKey;
}
//log.info(HCNetSDKPath.DLL_PATH+"dll");
log.info(dllPath);
faceEngine = new FaceEngine(dllPath);
//激活引擎
int errorCode = faceEngine.activeOnline(appId, sdkKey);
if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
log.info("引擎激活失败,errorCode:" + errorCode);
}

12
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java
View File

@ -201,4 +201,16 @@ public class BaseMenuController {
public Result<Set<Long>> queryByRole(@RequestBody Map<String,Object> map) {
return Result.success(baseMenuService.roleMenu(MapUtils.getString(map,"roleId")));
}
/**
* 用户查询自身路由列表
* @return
*/
@OperLog(operModul = "系统菜单管理", operType = "查询", operDesc = "用户查询自身路由列表")
@ApiOperation(value = "用户查询自身路由列表", notes = "用户查询自身路由列表" , httpMethod="GET")
@GetMapping(value = "/queryRouter")
public Result<Set<String>> queryRouter() {
return Result.success(baseMenuService.queryRouter());
}
}

25
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java
View File

@ -11,7 +11,6 @@ import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
import com.zhgd.xmgl.modules.basicdata.entity.ModuleTemplate;
import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService;
import com.zhgd.xmgl.modules.basicdata.service.IModuleTemplateService;
import com.zhgd.xmgl.util.ParamEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@ -200,11 +199,16 @@ public class BaseModuleController {
@GetMapping(value = "/queryBySelf")
public Result<Map<String, List<BaseModule>>> queryBySelf() {
List<BaseModule> list = baseModuleService.queryBySelf();
if (list == null || list.size() == 0) {
return null;
}
Map<String, List<BaseModule>> map = new HashMap<>();
map.put("important", list.stream().filter(m -> m.getIsImportantModule().equals("1")).collect(Collectors.toList()));
map.put("module1", list.stream().filter(m -> m.getLabelName().equals(ParamEnum.ModuleLabel.SAFE.getDesc())).collect(Collectors.toList()));
map.put("module2", list.stream().filter(m -> m.getLabelName().equals(ParamEnum.ModuleLabel.QUALITY.getDesc())).collect(Collectors.toList()));
map.put("module3", list.stream().filter(m -> m.getLabelName().equals(ParamEnum.ModuleLabel.WISDOM.getDesc())).collect(Collectors.toList()));
map.put("important", list.stream().filter(m -> m.getIsImportantModule().equals(1)).collect(Collectors.toList()));
List<String> titles = baseModuleService.getTitles();
for (String title : titles) {
map.put(title, list.stream().filter(m -> m.getLabelName().equals(title)
&& m.getIsImportantModule() == 0).collect(Collectors.toList()));
}
return Result.success(map);
}
@ -228,4 +232,15 @@ public class BaseModuleController {
result.setResult(moduleIds);
return result;
}
/**
* 通过登录用户查询
* @return
*/
@OperLog(operModul = "系统模块管理", operType = "查询", operDesc = "获取所有模块标签")
@ApiOperation(value = "获取所有模块标签", notes = "获取所有模块标签" , httpMethod="GET")
@GetMapping(value = "/queryTitle")
public Result<List<String>> queryTitle() {
return Result.success(baseModuleService.getTitles());
}
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentController.java
View File

@ -64,6 +64,7 @@ public class GovernmentController {
Result<IPage<Government>> result = new Result<IPage<Government>>();
QueryWrapper<Government> queryWrapper = QueryGenerator.initPageQueryWrapper(Government.class, map);
Page<Government> page = PageUtil.getPage(map);
queryWrapper.orderByDesc("create_time");
IPage<Government> pageList = governmentService.selectPage(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java
View File

@ -136,7 +136,7 @@ public class HardWareCallbackController {
public Result<Object> addEnvironmentAlarm(@RequestBody AiMonitorAlarm aiMonitorAlarm) {
// 查询字典类型确认报警类型
List<SystemDictData> systemDictDataList = iSystemDictDataService.getByType(ParamEnum.SysDictType.AI_ALARM_TYPE.getValue());
List<SystemDictData> dictData = systemDictDataList.stream().filter(d -> d.getDictLabel().equals(aiMonitorAlarm.getType().toString())).collect(Collectors.toList());
List<SystemDictData> dictData = systemDictDataList.stream().filter(d -> d.getDictLabel().equals(aiMonitorAlarm.getType())).collect(Collectors.toList());
if (dictData.size() == 0) {
return Result.error("报警类型错误!");
}

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemConfigController.java
View File

@ -53,13 +53,11 @@ public class SystemConfigController {
})
@PostMapping(value = "/page")
public Result<IPage<SystemConfig>> queryPageList(@RequestBody Map<String, Object> map) {
Result<IPage<SystemConfig>> result = new Result<IPage<SystemConfig>>();
QueryWrapper<SystemConfig> queryWrapper = QueryGenerator.initPageQueryWrapper(SystemConfig.class, map);
Page<SystemConfig> page = PageUtil.getPage(map);
queryWrapper.orderByDesc("config_id");
IPage<SystemConfig> pageList = systemConfigService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
return Result.success(pageList);
}
/**

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictDataController.java
View File

@ -149,7 +149,6 @@ public class SystemDictDataController {
result.success("删除成功!");
}
}
return result;
}

11
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java
View File

@ -51,9 +51,9 @@ public class GovEngineeringController {
@ApiImplicitParams({
@ApiImplicitParam(name = "engineeringCode", value = "工程编码", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "engineeringType", value = "工程类别", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "state", value = "工程状态(1:未开工;)", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "examineState", value = "1:待审批;2:审批驳回;3:审批通过;", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "engineeringType", value = "工程类别", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "state", value = "工程状态(1:未开工;)", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "examineState", value = "1:待审批;2:审批驳回;3:审批通过;", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"),
@ -61,13 +61,10 @@ public class GovEngineeringController {
})
@PostMapping(value = "/page")
public Result<IPage<Engineering>> queryPageList(@RequestBody Map<String, Object> map) {
Result<IPage<Engineering>> result = new Result<IPage<Engineering>>();
QueryWrapper<Engineering> wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map);
Page<Engineering> page = PageUtil.getPage(map);
IPage<Engineering> pageList = engineeringService.getPageList(page, wrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
return Result.success(pageList);
}
/**

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

@ -51,6 +51,7 @@ public class GovEnterpriseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "creditCode", value = "社会信用代码", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "enterpriseName", value = "企业名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "mainType", value = "企业主体类型", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "pageNo", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer")
})

5
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java
View File

@ -49,13 +49,10 @@ public class EngineeringController {
})
@PostMapping(value = "/page")
public Result<IPage<Engineering>> queryPageList(@RequestBody Map<String, Object> map) {
Result<IPage<Engineering>> result = new Result<IPage<Engineering>>();
LambdaQueryWrapper<Engineering> wrapper = Wrappers.<Engineering>lambdaQuery();
Page<Engineering> page = PageUtil.getPage(map);
IPage<Engineering> pageList = engineeringService.getPageList(page, wrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
return Result.success(pageList);
}
/**

11
src/main/java/com/zhgd/xmgl/modules/basicdata/dto/MenuTreeDto.java
View File

@ -13,11 +13,11 @@ import java.util.List;
@ApiModel(value = "树形菜单信息(DTO)", description = "MenuTreeDto")
public class MenuTreeDto extends TreeDto{
@ApiModelProperty(value = "菜单图标")
private String normalIcon;
@ApiModelProperty(value = "页面路径")
private String component;
@ApiModelProperty(value = "菜单选中时图标")
private String checkIcon;
@ApiModelProperty(value = "菜单路由")
private String path;
@ApiModelProperty(value = "菜单类型,0:模块 1:菜单;2:按钮")
private Integer type;
@ -28,6 +28,9 @@ public class MenuTreeDto extends TreeDto{
@ApiModelProperty(value = "父级ID")
private Long parentId;
@ApiModelProperty(value = "详细信息")
private Meta meta;
@ApiModelProperty(value = "子级菜单信息")
private List<MenuTreeDto> children;

35
src/main/java/com/zhgd/xmgl/modules/basicdata/dto/Meta.java Normal file
View File

@ -0,0 +1,35 @@
package com.zhgd.xmgl.modules.basicdata.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author pengj
* @date 2023/3/22 17:18
*/
@Data
public class Meta {
@ApiModelProperty(value = "菜单选中状态")
private Boolean state = false;
@ApiModelProperty(value = "菜单图标")
private String icon;
@ApiModelProperty(value = "菜单选中时图标")
private String checkIcon;
@ApiModelProperty(value = "菜单名称")
private String title;
private String isLink = "";
private Boolean isHide = false;
private Boolean isFull = false;
private Boolean isAffix = true;
private Boolean isKeepAlive = true;
}

3
src/main/java/com/zhgd/xmgl/modules/basicdata/dto/MonitorTreeDto.java
View File

@ -18,4 +18,7 @@ public class MonitorTreeDto extends TreeDto{
@ApiModelProperty(value = "父级ID")
private String parentId;
@ApiModelProperty(value = "详细信息")
private Meta meta;
}

7
src/main/java/com/zhgd/xmgl/modules/basicdata/dto/TreeDto.java
View File

@ -8,9 +8,6 @@ import lombok.Data;
@ApiModel(value = "树形通用数据信息(DTO)", description = "TreeDto")
public class TreeDto {
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "主键")
private Long name;
}

8
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/AttendanceDev.java
View File

@ -72,9 +72,9 @@ public class AttendanceDev implements Serializable {
private String projectSn;
/**
* 厂商名称
* 厂商ID
*/
@Excel(name = "厂商名称", width = 15)
@ApiModelProperty(value = "厂商名称")
private String produceName;
@Excel(name = "厂商ID", width = 15)
@ApiModelProperty(value = "厂商ID")
private Integer produceId;
}

6
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseMenu.java
View File

@ -71,10 +71,10 @@ public class BaseMenu implements Serializable {
private String appPath;
/**
* 菜单标题
* 菜单图标
*/
@Excel(name = "菜单标题", width = 15)
@ApiModelProperty(value = "菜单标题")
@Excel(name = "菜单图标", width = 15)
@ApiModelProperty(value = "菜单图标")
private String icon;
@ApiModelProperty(value = "打开方式:0:_self窗口内,1:_blank新窗口")

2
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseModule.java
View File

@ -120,7 +120,7 @@ public class BaseModule implements Serializable {
*/
@Excel(name = "是否是重要模块(重要模块展示在最前端）", width = 15)
@ApiModelProperty(value = "是否是重要模块(重要模块展示在最前端）")
private java.lang.String isImportantModule;
private java.lang.Integer isImportantModule;
/**
* 风格名称 ：1:标准版; 2：星璇版本; 3：衢州版本
*/

8
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Enterprise.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.basicdata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@ -135,4 +136,11 @@ public class Enterprise implements Serializable {
*/
@ApiModelProperty(value = "所属国企名称")
private String authorityEnterprise;
/**
* 企业类型
*/
@TableField(exist = false)
@ApiModelProperty(value = "企业类型")
private String mainTypeName;
}

8
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EnterpriseMain.java
View File

@ -48,6 +48,14 @@ public class EnterpriseMain implements Serializable {
@Excel(name = "企业主体类型(1:建设;2:监理;3:施工;4:勘察;5:设计;)", width = 15)
@ApiModelProperty(value = "企业主体类型(1:建设;2:监理;3:施工;4:勘察;5:设计;)")
private Integer mainType;
/**
* 企业主体类型名称
*/
@TableField(exist = false)
@ApiModelProperty(value = "企业主体类型名称")
private String mainTypeName;
/**
* 企业sn
*/

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

@ -18,7 +18,7 @@ import java.util.List;
@DataScope
public interface AttendanceDevMapper extends BaseMapper<AttendanceDev> {
List<String> getProductList(WorkerInfo workerInfo, String ignore);
List<Integer> getProductList(WorkerInfo workerInfo, String ignore);
List<AttendanceDev> getList(WorkerInfo workerInfo, String ignore);
}

8
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java
View File

@ -1,11 +1,10 @@
package com.zhgd.xmgl.modules.basicdata.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* @Description: 系统资源-模块表
@ -16,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface BaseModuleMapper extends BaseMapper<BaseModule> {
List<String> getTitles();
}

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java
View File

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* @Description: 企业主体
* @author： pds
@ -13,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface EnterpriseMainMapper extends BaseMapper<EnterpriseMain> {
List<EnterpriseMain> getList(String dictType, String enterpriseSn);
}

5
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMapper.java
View File

@ -1,6 +1,9 @@
package com.zhgd.xmgl.modules.basicdata.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
import org.apache.ibatis.annotations.Mapper;
@ -17,6 +20,8 @@ import java.util.List;
@Mapper
public interface EnterpriseMapper extends BaseMapper<Enterprise> {
Page<Enterprise> pageList(Page page, @Param(Constants.WRAPPER) Wrapper<Enterprise> wrapper);
EnterpriseVo getDetailById(@Param("enterpriseId") Long enterpriseId);
List<Enterprise> listByMainType(@Param("mainType") Integer mainType, @Param("governmentSn") String governmentSn);

4
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AttendanceDevMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.AttendanceDevMapper">
<select id="getProductList" resultType="java.lang.String">
SELECT produce_name FROM attendance_dev WHERE project_sn = #{workerInfo.projectSn} AND engineering_sn = #{workerInfo.engineeringSn} GROUP BY produce_name
<select id="getProductList" resultType="java.lang.Integer">
SELECT produce_id FROM attendance_dev WHERE project_sn = #{workerInfo.projectSn} AND engineering_sn = #{workerInfo.engineeringSn} GROUP BY produce_id
</select>
<select id="getList" resultType="com.zhgd.xmgl.modules.basicdata.entity.AttendanceDev">

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
View File

@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.BaseModuleMapper">
<select id="getTitles" resultType="java.lang.String">
SELECT label_name FROM base_module where is_important_module = 0 group by label_name order by label_sort_num
</select>
</mapper>

6
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml
View File

@ -2,4 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMainMapper">
<select id="getList" resultType="com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain">
SELECT m.*, d.dict_value as mainTypeName FROM enterprise_main m
LEFT JOIN system_dict_data d
ON m.main_type = d.dict_label AND d.dict_type = #{dictType}
WHERE m.enterprise_sn = #{enterpriseSn}
</select>
</mapper>

12
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMapper.xml
View File

@ -3,8 +3,8 @@
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMapper">
<select id="getDetailById" resultType="com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo">
SELECT c.*, u.account, u.show_password, u.user_tel, u.real_name, u.email FROM enterprise c
LEFT JOIN system_user u ON c.enterprise_id = u.sn AND u.account_type = 3 AND u.is_manager = 1
SELECT c.*, u.account, u.show_password as password, u.user_tel as phone, u.real_name, u.email FROM enterprise c
LEFT JOIN system_user u ON c.enterprise_sn = u.sn AND u.account_type = 3 AND u.is_manager = 1
WHERE c.enterprise_id = #{enterpriseId}
</select>
@ -12,4 +12,12 @@
SELECT c.* FROM enterprise c INNER JOIN enterprise_main m ON c.enterprise_sn = m.enterprise_sn
WHERE c.government_sn = #{governmentSn} AND m.main_type = #{mainType}
</select>
<select id="pageList" resultType="com.zhgd.xmgl.modules.basicdata.entity.Enterprise">
SELECT e.*, GROUP_CONCAT(d.dict_value) as mainTypeName FROM enterprise e
LEFT JOIN enterprise_main m ON e.enterprise_sn = m.enterprise_sn
LEFT JOIN system_dict_data d ON m.main_type = d.dict_label AND d.dict_type = 'enterprise_main'
${ew.customSqlSegment}
GROUP BY e.enterprise_sn
</select>
</mapper>

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

@ -3,7 +3,7 @@
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.ProjectMapper">
<select id="getPageList" resultType="com.zhgd.xmgl.modules.basicdata.dto.ProjectDto">
SELECT p.project_name, u.account, u.show_password, u.email, u.user_tel, g.government_name FROM project p
SELECT p.project_id, p.project_name, u.account, u.show_password, u.email, u.user_tel, g.government_name FROM project p
INNER JOIN system_user u ON p.project_sn = u.sn AND u.is_manager = 1
LEFT JOIN government g ON p.government_sn = g.government_sn
${ew.customSqlSegment}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java
View File

@ -50,4 +50,6 @@ public interface IBaseMenuService extends IService<BaseMenu> {
List<MenuTreeDto> myTreeMenu(Long moduleId);
Set<Long> roleMenu(String roleId);
Set<String> queryRouter();
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java
View File

@ -21,4 +21,6 @@ public interface IBaseModuleService extends IService<BaseModule> {
List<BaseModule> queryBySelf();
boolean removeInfo(String id);
List<String> getTitles();
}

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEnterpriseMainService.java
View File

@ -1,7 +1,9 @@
package com.zhgd.xmgl.modules.basicdata.service;
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
import java.util.List;
/**
* @Description: 企业主体
@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IEnterpriseMainService extends IService<EnterpriseMain> {
List<EnterpriseMain> getList(String enterpriseSn);
}

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/AiMonitorAlarmServiceImpl.java
View File

@ -79,7 +79,7 @@ public class AiMonitorAlarmServiceImpl extends ServiceImpl<AiMonitorAlarmMapper,
List<SystemDictData> dictDataList = systemDictDataService.getByType(ParamEnum.SysDictType.AI_ALARM_TYPE.getValue());
Page<AiMonitorAlarm> aiMonitorAlarmPage = baseMapper.pageList(page, wrapper);
aiMonitorAlarmPage.getRecords().stream().forEach(a -> {
List<SystemDictData> dictData = dictDataList.stream().filter(d -> d.getDictLabel() == a.getType())
List<SystemDictData> dictData = dictDataList.stream().filter(d -> d.getDictLabel().equals(a.getType()))
.collect(Collectors.toList());
if (dictData.size() > 0) {
a.setTypeName(dictData.get(0).getDictValue());
@ -93,7 +93,7 @@ public class AiMonitorAlarmServiceImpl extends ServiceImpl<AiMonitorAlarmMapper,
List<Map<String, Object>> list = baseMapper.getCountGroupByType(deviceCode);
List<SystemDictData> dictDataList = systemDictDataService.getByType(ParamEnum.SysDictType.AI_ALARM_TYPE.getValue());
list.stream().forEach(m -> {
List<SystemDictData> data = dictDataList.stream().filter(d -> d.getDictLabel() == Integer.parseInt(m.get("type").toString())).collect(Collectors.toList());
List<SystemDictData> data = dictDataList.stream().filter(d -> d.getDictLabel().equals(Integer.parseInt(m.get("type").toString()))).collect(Collectors.toList());
if (data.size() > 0) {
m.put("typeName", data.get(0).getDictValue());
}

20
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/AttendanceDevServiceImpl.java
View File

@ -1,10 +1,8 @@
package com.zhgd.xmgl.modules.basicdata.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.xmgl.async.AsyncAttendance;
import com.zhgd.xmgl.modules.basicdata.entity.AttendanceDev;
import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData;
import com.zhgd.xmgl.modules.basicdata.mapper.AttendanceDevMapper;
import com.zhgd.xmgl.modules.basicdata.service.IAttendanceDevService;
import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService;
@ -20,9 +18,6 @@ import org.springframework.stereotype.Service;
@Service
public class AttendanceDevServiceImpl extends ServiceImpl<AttendanceDevMapper, AttendanceDev> implements IAttendanceDevService {
@Autowired
private ISystemDictDataService systemDictDataService;
@Autowired
private AsyncAttendance asyncAttendance;
@ -32,10 +27,7 @@ public class AttendanceDevServiceImpl extends ServiceImpl<AttendanceDevMapper, A
boolean flag = this.save(attendanceDev);
if (flag) {
// 推送新增的考勤设备信息
SystemDictData data = systemDictDataService.getOne(Wrappers.<SystemDictData>lambdaQuery()
.eq(SystemDictData::getDictType, attendanceDev.getProduceName())
.eq(SystemDictData::getDictLabel, 1));
asyncAttendance.syncAttendanceDev(data.getRemark(), attendanceDev);
asyncAttendance.syncAttendanceDev(1, attendanceDev);
}
return flag;
}
@ -46,10 +38,7 @@ public class AttendanceDevServiceImpl extends ServiceImpl<AttendanceDevMapper, A
boolean flag = this.updateById(attendanceDev);
if (flag) {
// 推送修改的考勤设备信息
SystemDictData data = systemDictDataService.getOne(Wrappers.<SystemDictData>lambdaQuery()
.eq(SystemDictData::getDictType, attendanceDev.getProduceName())
.eq(SystemDictData::getDictLabel, 2));
asyncAttendance.syncAttendanceDev(data.getRemark(), attendanceDev);
asyncAttendance.syncAttendanceDev(2, attendanceDev);
}
return flag;
}
@ -60,10 +49,7 @@ public class AttendanceDevServiceImpl extends ServiceImpl<AttendanceDevMapper, A
boolean flag = this.removeById(attendanceDev.getId());
if (flag) {
// 推送删除的考勤设备信息
SystemDictData data = systemDictDataService.getOne(Wrappers.<SystemDictData>lambdaQuery()
.eq(SystemDictData::getDictType, attendanceDev.getProduceName())
.eq(SystemDictData::getDictLabel, 3));
asyncAttendance.syncAttendanceDev(data.getRemark(), attendanceDev);
asyncAttendance.syncAttendanceDev(3, attendanceDev);
}
return flag;
}

22
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
View File

@ -75,7 +75,7 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
List<BaseMenu> baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getModuleId,
baseModules.stream().map(m -> m.getModuleId()).collect(Collectors.toList())));
menuList.addAll(TreeUtil.formatMenu(baseMenus));
// 查询相对应的菜单
// 查询相对应的按钮权限
List<BaseAction> baseAction = baseActionMapper.selectList(Wrappers.<BaseAction>lambdaQuery().in(BaseAction::getMenuId,
baseMenus.stream().map(m -> m.getMenuId()).collect(Collectors.toList())));
menuList.addAll(TreeUtil.formatAction(baseAction));
@ -121,6 +121,26 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
return ids;
}
@Override
public Set<String> queryRouter() {
// 查询当前账号所属政务下的模块
List<BaseModule> baseModules = baseModuleService.queryBySelf();
if (baseModules.size() == 0) {
return null;
}
Set<String> routers = new HashSet<>();
for (BaseModule baseModule : baseModules) {
routers.add(baseModule.getModulePath());
}
// 查询相对应的菜单
List<BaseMenu> baseMenus = baseMenuMapper.selectList(Wrappers.<BaseMenu>lambdaQuery().in(BaseMenu::getModuleId,
baseModules.stream().map(m -> m.getModuleId()).collect(Collectors.toList())));
for (BaseMenu baseMenu : baseMenus) {
routers.add(baseMenu.getPath());
}
return routers;
}
@Override
public Map<String, Object> getProjectModuleAndMenu(Map<String, Object> map) {
map.put("styleType",getStyleType(MapUtils.getString(map,"projectSn")));

12
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
View File

@ -51,9 +51,9 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
List<SystemDictData> moduleType = systemDictDataService.getByType(ParamEnum.SysDictType.MODULE_TYPE.getValue());
List<SystemDictData> moduleStyleType = systemDictDataService.getByType(ParamEnum.SysDictType.MODULE_STYLE_TYPE.getValue());
for (BaseModule baseModule : pageList.getRecords()) {
SystemDictData typeData = moduleType.stream().filter(m -> m.getDictLabel() == baseModule.getModuleType()).findFirst().get();
SystemDictData typeData = moduleType.stream().filter(m -> m.getDictLabel().equals(baseModule.getModuleType())).findFirst().get();
baseModule.setModuleTypeName(typeData == null ? "" : typeData.getDictValue());
SystemDictData styleData = moduleStyleType.stream().filter(m -> m.getDictLabel() == baseModule.getStyleType()).findFirst().get();
SystemDictData styleData = moduleStyleType.stream().filter(m -> m.getDictLabel().equals(baseModule.getStyleType())).findFirst().get();
baseModule.setStyleTypeName(styleData == null ? "" : styleData.getDictValue());
}
return pageList;
@ -77,6 +77,9 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
List<Long> ids = moduleTemplateService.list(Wrappers.<ModuleTemplate>lambdaQuery()
.eq(ModuleTemplate::getModuleType, user.getAccountType())
.eq(ModuleTemplate::getGovernmentSn, governmentSn)).stream().map(b -> b.getModuleId()).collect(Collectors.toList());
if (ids.size() == 0) {
return null;
}
return this.list(Wrappers.<BaseModule>lambdaQuery()
.in(BaseModule::getModuleId, ids).orderByDesc(BaseModule::getIsImportantModule).orderByAsc(BaseModule::getLabelSortNum, BaseModule::getPriority));
}
@ -88,4 +91,9 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
baseMenuMapper.delete(Wrappers.<BaseMenu>lambdaQuery().eq(BaseMenu::getModuleId, id));
return this.removeById(id);
}
@Override
public List<String> getTitles() {
return baseMapper.getTitles();
}
}

12
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
View File

@ -59,8 +59,8 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
List<SystemDictData> engineeringTypes = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_TYPE.getValue());
List<SystemDictData> engineeringStates = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_STATE.getValue());
pageList.getRecords().stream().forEach(s -> {
List<SystemDictData> type = engineeringTypes.stream().filter(e -> e.getDictLabel() == s.getEngineeringType()).collect(Collectors.toList());
List<SystemDictData> state = engineeringStates.stream().filter(e -> e.getDictLabel() == s.getState()).collect(Collectors.toList());
List<SystemDictData> type = engineeringTypes.stream().filter(e -> e.getDictLabel().equals(s.getEngineeringType())).collect(Collectors.toList());
List<SystemDictData> state = engineeringStates.stream().filter(e -> e.getDictLabel().equals(s.getState())).collect(Collectors.toList());
if (type.size() > 0) {
s.setEngineeringTypeName(type.get(0).getDictValue());
}
@ -168,10 +168,10 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
List<EngineeringMain> opEnt = engineeringMains.stream().filter(m -> m.getEngineeringSn().equals(stat.getEngineeringSn())
&& m.getType() == 2).collect(Collectors.toList());
stat.setOpEnt(opEnt.size() == 0 ? "" : opEnt.get(0).getEnterpriseName());
SystemDictData stateData = state.stream().filter(m -> m.getDictLabel().equals(stat.getState().toString())).findFirst().get();
stat.setState(stateData == null ? "" : stateData.getDictValue());
SystemDictData styleData = type.stream().filter(m -> m.getDictLabel().equals(stat.getEngineeringType().toString())).findFirst().get();
stat.setEngineeringType(styleData == null ? "" : styleData.getDictValue());
SystemDictData stateData = state.stream().filter(m -> m.getDictLabel().equals(stat.getState())).findFirst().get();
stat.setStateName(stateData == null ? "" : stateData.getDictValue());
SystemDictData styleData = type.stream().filter(m -> m.getDictLabel().equals(stat.getEngineeringType())).findFirst().get();
stat.setEngineeringTypeName(styleData == null ? "" : styleData.getDictValue());
}
return engineeringStatPage;
}

7
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseMainServiceImpl.java
View File

@ -3,10 +3,13 @@ package com.zhgd.xmgl.modules.basicdata.service.impl;
import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMainMapper;
import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseMainService;
import com.zhgd.xmgl.util.ParamEnum;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
/**
* @Description: 企业主体
* @author： pds
@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class EnterpriseMainServiceImpl extends ServiceImpl<EnterpriseMainMapper, EnterpriseMain> implements IEnterpriseMainService {
@Override
public List<EnterpriseMain> getList(String enterpriseSn) {
return baseMapper.getList(ParamEnum.SysDictType.ENTERPRISE_MAIN.getValue(), enterpriseSn);
}
}

23
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java
View File

@ -2,10 +2,10 @@ package com.zhgd.xmgl.modules.basicdata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.basicdata.entity.*;
import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMapper;
@ -17,6 +17,7 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
import com.zhgd.xmgl.security.SecurityUtil;
import com.zhgd.xmgl.util.CommonUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -51,9 +52,21 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
@Override
public Page<Enterprise> pageList(Map<String, Object> map) {
Integer mainType = MapUtils.getInteger(map, "mainType");
String enterpriseName = MapUtils.getString(map, "enterpriseName");
String creditCode = MapUtils.getString(map, "creditCode");
Page<Enterprise> page = PageUtil.getPage(map);
QueryWrapper<Enterprise> wrapper = QueryGenerator.initPageQueryWrapper(Enterprise.class, map);
return this.page(page, wrapper);
QueryWrapper<Enterprise> wrapper = Wrappers.<Enterprise>query();
if (StringUtils.isNotBlank(creditCode)) {
wrapper.like("e.credit_code", creditCode);
}
if (StringUtils.isNotBlank(enterpriseName)) {
wrapper.like("e.enterprise_name", enterpriseName);
}
if (mainType != null) {
wrapper.eq("m.main_type", mainType);
}
return baseMapper.pageList(page, wrapper);
}
@Override
@ -86,7 +99,6 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
}
}
return flag;
}
@Override
@ -115,8 +127,7 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
@Override
public EnterpriseVo getDetailById(Long enterpriseId) {
EnterpriseVo enterpriseVo = baseMapper.getDetailById(enterpriseId);
List<EnterpriseMain> enterpriseMains = enterpriseMainService.list(Wrappers.<EnterpriseMain>lambdaQuery()
.eq(EnterpriseMain::getEnterpriseSn, enterpriseVo.getEnterpriseSn()));
List<EnterpriseMain> enterpriseMains = enterpriseMainService.getList(enterpriseVo.getEnterpriseSn());
List<EnterpriseMainLicense> enterpriseMainLicenses = enterpriseMainLicenseService.list(Wrappers.<EnterpriseMainLicense>lambdaQuery()
.eq(EnterpriseMainLicense::getEnterpriseSn, enterpriseVo.getEnterpriseSn()));
for (EnterpriseMain enterpriseMain : enterpriseMains) {

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java
View File

@ -77,6 +77,7 @@ public class GovernmentServiceImpl extends ServiceImpl<GovernmentMapper, Governm
this.save(government);
SystemUser systemUser = new SystemUser();
systemUser.setAccount(governmentVo.getAccount());
systemUser.setPassword(governmentVo.getPassword());
systemUser.setShowPassword(governmentVo.getPassword());
systemUser.setCreateTime(new Date());
systemUser.setSn(government.getGovernmentSn());
@ -111,7 +112,7 @@ public class GovernmentServiceImpl extends ServiceImpl<GovernmentMapper, Governm
.eq(SystemUser::getSn, government.getGovernmentSn())
.eq(SystemUser::getIsManager, true));
governmentDto.setAccount(systemUser.getAccount());
governmentDto.setPassword(systemUser.getPassword());
governmentDto.setPassword(systemUser.getShowPassword());
return governmentDto;
}
}

16
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/MonitorDevServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.xmgl.modules.basicdata.dto.Meta;
import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto;
import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
import com.zhgd.xmgl.modules.basicdata.entity.Project;
@ -50,8 +51,9 @@ public class MonitorDevServiceImpl extends ServiceImpl<MonitorDevMapper, Monitor
List<MonitorTreeDto> monitorTreeDtos = new ArrayList<>();
projectList.stream().forEach(p -> {
MonitorTreeDto monitorTreeDto = new MonitorTreeDto();
monitorTreeDto.setId(p.getProjectId());
monitorTreeDto.setName(p.getProjectName());
Meta meta = new Meta();
meta.setTitle(p.getProjectName());
monitorTreeDto.setName(p.getProjectId());
monitorTreeDto.setType(1);
List<MonitorTreeDto> engineeringChildren = getEngineeringList(engineeringList, p.getProjectSn(), null, monitorDevList);
List<MonitorTreeDto> projectMonitor = buildMonitorTree(1, p.getProjectSn(), monitorDevList);
@ -95,8 +97,9 @@ public class MonitorDevServiceImpl extends ServiceImpl<MonitorDevMapper, Monitor
List<MonitorDev> monitorDevs = monitorDevList;
engineeringList.stream().forEach(e -> {
MonitorTreeDto monitorTreeDto = new MonitorTreeDto();
monitorTreeDto.setId(e.getId());
monitorTreeDto.setName(e.getEngineeringName());
Meta meta = new Meta();
meta.setTitle(e.getEngineeringName());
monitorTreeDto.setName(e.getId());
monitorTreeDto.setParentId(parentId);
monitorTreeDto.setType(2);
monitorTreeDto.setChildren(buildMonitorTree(2, e.getEngineeringSn(), monitorDevs));
@ -116,8 +119,9 @@ public class MonitorDevServiceImpl extends ServiceImpl<MonitorDevMapper, Monitor
List<MonitorTreeDto> monitorTreeDtos = new ArrayList<>();
children.stream().forEach(p -> {
MonitorTreeDto monitorTreeDto = new MonitorTreeDto();
monitorTreeDto.setId(p.getMonitorId());
monitorTreeDto.setName(p.getName());
Meta meta = new Meta();
meta.setTitle(p.getName());
monitorTreeDto.setName(p.getMonitorId());
monitorTreeDto.setParentId(parentId);
monitorTreeDto.setType(3);
monitorTreeDtos.add(monitorTreeDto);

7
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java
View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto;
import com.zhgd.xmgl.modules.basicdata.dto.ProjectDto;
@ -47,12 +46,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
public Page<ProjectDto> getPageList(Map<String, Object> map) {
SecurityUser user = SecurityUtil.getUser();
Page<Project> page = PageUtil.getPage(map);
QueryWrapper<Project> wrapper = QueryGenerator.initPageQueryWrapper(Project.class, map);
QueryWrapper<Project> wrapper = Wrappers.<Project>query();
wrapper.eq("p.government_sn", user.getSn());
Integer state = MapUtils.getInteger(map, "state");
if (state != null) {
wrapper.eq("p.state", state);
}
wrapper.eq("p.state", state);
return baseMapper.getPageList(page, wrapper);
}

10
src/main/java/com/zhgd/xmgl/modules/basicdata/statistics/EngineeringStat.java
View File

@ -27,7 +27,10 @@ public class EngineeringStat {
private Date endTime;
@ApiModelProperty(value = "工程状态(1:未开工;2:在建)")
private String state;
private Integer state;
@ApiModelProperty(value = "工程状态名称")
private String stateName;
@ApiModelProperty(value = "省")
private String province;
@ -42,7 +45,10 @@ public class EngineeringStat {
private String address;
@ApiModelProperty(value = "工程类别(1:房屋建筑;2:市政公用工程;3:轨道交通工程;4:公共建设项目;5:其他)")
private String engineeringType;
private Integer engineeringType;
@ApiModelProperty(value = "工程类别名称")
private String engineeringTypeName;
@ApiModelProperty(value = "建设单位")
private String buildEnt;

1
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -77,6 +77,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/xmgl/government/list").permitAll()
.antMatchers("/ent/enterprise/add").permitAll()
.antMatchers("/project/project/add").permitAll()
.antMatchers("/xmgl/systemDictData/list").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证
.and()

1
src/main/java/com/zhgd/xmgl/util/HttpUtil.java
View File

@ -18,6 +18,7 @@ public class HttpUtil {
HttpPost httpPost=new HttpPost(requestUrl);
// 设置超时时间
RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(400000).setConnectTimeout(400000).setConnectionRequestTimeout(400000).build();
// httpPost.setConfig(requestConfig);
// 设置http请求的请求体信息
StringEntity entity = new StringEntity(jsonObj, "UTF-8");
entity.setContentType("application/json");

29
src/main/java/com/zhgd/xmgl/util/ParamEnum.java
View File

@ -30,30 +30,6 @@ public class ParamEnum {
}
}
/**
* 模块标签类型
*/
public enum ModuleLabel {
SAFE(1, "安全监管"),
QUALITY(2, "质量监管"),
WISDOM(3, "智慧监管");
private Integer value;
private String desc;
public Integer getValue() {
return value;
}
public String getDesc() {
return desc;
}
ModuleLabel(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
}
/**
* 字典类型
@ -64,7 +40,10 @@ public class ParamEnum {
ENGINEERING_TYPE("engineering_type", "工程类型"),
ENGINEERING_STATE("engineering_state", "工程状态"),
AI_ALARM_TYPE("ai_alarm_type", "AI预警类型"),
ATTEND_DEV_PRODUCE("attend_dev_produce", "考勤设备厂商");
ENTERPRISE_MAIN("enterprise_main", "企业主体"),
ENTERPRISE_LICENSE("enterprise_license", "企业资质等级"),
ATTEND_DEV_PRODUCE("attend_dev_produce", "考勤设备厂商"),
ATTEND_SYNC_API("attend_sync_api", "考勤相关信息同步接口");
private String value;
private String desc;

37
src/main/java/com/zhgd/xmgl/util/TreeUtil.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.util;
import com.zhgd.xmgl.modules.basicdata.dto.MenuTreeDto;
import com.zhgd.xmgl.modules.basicdata.dto.Meta;
import com.zhgd.xmgl.modules.basicdata.entity.BaseAction;
import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu;
import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
@ -16,12 +17,16 @@ public class TreeUtil {
public List<MenuTreeDto> formatModule(List<BaseModule> baseModules) {
List<MenuTreeDto> list = new ArrayList<>();
MenuTreeDto node;
for (BaseModule menu : baseModules) {
for (BaseModule module : baseModules) {
node = new MenuTreeDto();
node.setId(menu.getModuleId());
node.setName(menu.getModuleName());
node.setNormalIcon(menu.getModuleIconNormal());
node.setCheckIcon(menu.getModuleIconChecked());
Meta meta = new Meta();
meta.setTitle(module.getModuleName());
meta.setIcon(module.getModuleIconNormal());
meta.setCheckIcon(module.getModuleIconChecked());
node.setMeta(meta);
node.setName(module.getModuleId());
node.setComponent(module.getModuleIconNormal());
node.setPath(module.getModulePath());
node.setType(0);
node.setParentId(0L);
list.add(node);
@ -34,9 +39,13 @@ public class TreeUtil {
MenuTreeDto node;
for (BaseMenu menu : baseMenus) {
node = new MenuTreeDto();
node.setId(menu.getMenuId());
node.setName(menu.getMenuName());
node.setNormalIcon(menu.getIcon());
Meta meta = new Meta();
meta.setIcon(menu.getIcon());
meta.setTitle(menu.getMenuName());
node.setMeta(meta);
node.setName(menu.getMenuId());
node.setComponent(menu.getPath());
node.setPath(menu.getPath());
node.setType(1);
node.setParentId(menu.getParentId());
node.setModuleId(menu.getModuleId());
@ -48,12 +57,14 @@ public class TreeUtil {
public List<MenuTreeDto> formatAction(List<BaseAction> baseActions) {
List<MenuTreeDto> list = new ArrayList<>();
MenuTreeDto node;
for (BaseAction menu : baseActions) {
for (BaseAction action : baseActions) {
node = new MenuTreeDto();
node.setId(menu.getActionId());
node.setName(menu.getActionName());
Meta meta = new Meta();
meta.setTitle(action.getActionName());
node.setMeta(meta);
node.setName(action.getActionId());
node.setType(2);
node.setParentId(menu.getMenuId());
node.setParentId(action.getMenuId());
list.add(node);
}
return list;
@ -79,7 +90,7 @@ public class TreeUtil {
if (iType != 2) {
for (MenuTreeDto menuTreeDto : trees) {
level = level + 1;
menuTreeDto.setChildren(build(menuTreeDtos, iType, menuTreeDto.getId(), level));
menuTreeDto.setChildren(build(menuTreeDtos, iType, menuTreeDto.getName(), level));
}
}
return trees;

20
src/main/resources/application-dev.properties
View File

@ -3,13 +3,13 @@ http.port=6023
server.port=6688
# 数据库配置
#182.90.224.147
spring.datasource.url=jdbc:mysql://182.90.224.147/wisdomsitezw?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsitezw?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
# 数据库加密配置
#spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
#spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
spring.datasource.username=root
spring.datasource.password=JXJ@admin
#spring.datasource.password=root
#spring.datasource.password=JXJ@admin
spring.datasource.password=root
# 文件存储路径
basePath=D:/itbgpImage/
@ -42,3 +42,17 @@ license.publicKeysStorePath=D:/license_demo/client/publicCerts.keystore
# admin中对应的地址及实例名
spring.boot.admin.client.instance.service-url=http://localhost:6023
spring.boot.admin.client.instance.name=dev
#视频监控API
artemisConfig.host=182.101.141.23:18443
artemisConfig.appKey=24017757
artemisConfig.appSecret=VJz0FbzmE6drPQ7egsBi
#opencv截取视频画面文件地址
opencv.filePath=D://opencv//
#虹软人脸识别
arcsoft.appId=13eRvuSeQYts8Tqcrqy4yFyg7h6XQqdUGkjJuh9ct2E2
arcsoft.sdkKey=GLc2xHQ7yAwNxrWctSgNgVqwYqMTbz9RKTWWHQNMdJPU
arcsoft.linux.sdkKey=
arcsoft.dllPath=D:/dll

56
src/main/resources/application-test.properties Normal file
View File

@ -0,0 +1,56 @@
# 端口配置
http.port=6023
server.port=6688
# 数据库配置
spring.datasource.url=jdbc:mysql://182.90.224.147:3306/wisdomsitezw?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
# 数据库加密配置
#spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
#spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
spring.datasource.username=root
spring.datasource.password=JXJ@admin
# 文件存储路径
basePath=D:/itbgpImage/
# mqtt主题
mqtt-scope=devTopic
#文件存储配置
spring.file-storage.default-platform=local
spring.file-storage.thumbnail-suffix=.jpg
spring.file-storage.minio[0].platform=minio-1
spring.file-storage.minio[0].enable-storage=true
spring.file-storage.minio[0].access-key=minioadmin
spring.file-storage.minio[0].secret-key=minioadmin
spring.file-storage.minio[0].end-point=http://182.90.224.147:9000
spring.file-storage.minio[0].bucket-name=wisdomisitezw
spring.file-storage.minio[0].domain=http://182.90.224.147:9000/wisdomisitezw/
spring.file-storage.minio[0].base-path=
#spring.file-storage.default-platform=local
#spring.file-storage.thumbnail-suffix=.jpg
#spring.file-storage.minio[0].platform=minio-1
#spring.file-storage.minio[0].enable-storage=true
#spring.file-storage.minio[0].access-key=minioadmin
#spring.file-storage.minio[0].secret-key=minioadmin
#spring.file-storage.minio[0].end-point=http://127.0.0.1:9000
#spring.file-storage.minio[0].bucket-name=wisdomisitezw
#spring.file-storage.minio[0].domain=http://127.0.0.1:9000/wisdomisitezw/
#spring.file-storage.minio[0].base-path=
#客户端 License相关配置
license.licensePath=D:/license_demo/client/license.lic
license.publicKeysStorePath=D:/license_demo/client/publicCerts.keystore
# admin中对应的地址及实例名
spring.boot.admin.client.instance.service-url=http://localhost:6023
spring.boot.admin.client.instance.name=dev
#视频监控API
artemisConfig.host=182.101.141.23:18443
artemisConfig.appKey=24017757
artemisConfig.appSecret=VJz0FbzmE6drPQ7egsBi
#opencv截取视频画面文件地址
opencv.filePath=D://opencv//
#虹软人脸识别
arcsoft.appId=13eRvuSeQYts8Tqcrqy4yFyg7h6XQqdUGkjJuh9ct2E2
arcsoft.sdkKey=GLc2xHQ7yAwNxrWctSgNgVqwYqMTbz9RKTWWHQNMdJPU
arcsoft.linux.sdkKey=
arcsoft.dllPath=D:/zhgd/dll

13
src/main/resources/application.properties
View File

@ -107,16 +107,3 @@ is-license=false
security.enable=true
#视频监控API
artemisConfig.host=182.101.141.23:18443
artemisConfig.appKey=24017757
artemisConfig.appSecret=VJz0FbzmE6drPQ7egsBi
#opencv截取视频画面文件地址
opencv.filePath=D://opencv//
#虹软人脸识别
arcsoft.appId=13eRvuSeQYts8Tqcrqy4yFyg7h6XQqdUGkjJuh9ct2E2
arcsoft.sdkKey=GLc2xHQ7yAwNxrWctSgNgVqwYqMTbz9RKTWWHQNMdJPU
arcsoft.linux.sdkKey=
arcsoft.dllPath=D:/idea/workspace/wisdomisitezw/src/main/resources/dll