From 8a9c176c6809079ecaa100284b155bdbb8fed516 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Fri, 9 Aug 2024 14:59:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=83=A8=E7=AE=A1=E7=90=86bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D=EF=BC=8C=E9=A2=84=E8=AD=A6=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/BusinessConstants.java | 3 + .../exportVo/QueryConstructionExportVo.java | 41 ++++++++++++ .../exportVo/WarnHistoryExportVo.java | 29 +++++++++ .../common/entity/bracelet/vo/PersonVo.java | 5 ++ .../entity/bracelet/vo/QueryConstruction.java | 4 +- .../common/entity/bracelet/vo/WarnInfoVo.java | 26 ++++++++ .../controller/ExportFileController.java | 63 +++++++++++++++++++ .../QueryConstructionController.java | 14 +++++ .../controller/WarnHistoryController.java | 39 ++++++++++++ .../mapper/QueryConstructionMapper.java | 9 +++ .../bracelet/mapper/WarnHistoryMapper.java | 23 +++++++ .../service/IQueryConstructionService.java | 9 +++ .../bracelet/service/IWarnHistoryService.java | 20 ++++++ .../impl/QueryConstructionServiceImpl.java | 51 +++++++++++++++ .../bracelet/service/impl/WarnHistorympl.java | 38 +++++++++++ .../mapper/bracelet/BaseProjectMapper.xml | 2 +- .../bracelet/QueryConstructionMapper.xml | 32 +++++++--- .../mapper/bracelet/WarnHistoryMapper.xml | 44 +++++++++++++ 18 files changed, 442 insertions(+), 10 deletions(-) create mode 100644 bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/QueryConstructionExportVo.java create mode 100644 bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/WarnHistoryExportVo.java create mode 100644 bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/WarnHistoryController.java create mode 100644 bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/WarnHistoryMapper.java create mode 100644 bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IWarnHistoryService.java create mode 100644 bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/WarnHistorympl.java create mode 100644 bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/WarnHistoryMapper.xml diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java index 1961e29..768a735 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java @@ -18,6 +18,9 @@ public class BusinessConstants { /** 资源类型 1-人员*/ public static final String RESOURCE_TYPE_USER = "1"; + /** 资源类型 6-临时人员*/ + public static final String RESOURCE_TYPE_USERTEMP = "6"; + public final static String XLSX = ".xlsx"; public final static String XLS = ".xls"; diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/QueryConstructionExportVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/QueryConstructionExportVo.java new file mode 100644 index 0000000..94a0688 --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/QueryConstructionExportVo.java @@ -0,0 +1,41 @@ +package com.bonus.common.entity.bracelet.exportVo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @className:QueryConstructionExportVo + * @version:1.0 + * @description:施工记录导出-vo + */ +@Data +public class QueryConstructionExportVo { + + @Excel(name = "序号", width = 10.0,height = 20.0, orderNum = "0") + private String id; + + @Excel(name = "工程名称", width = 20.0,height = 15.0,orderNum = "1") + private String proName; + + @Excel(name = "项目部名称", width = 20.0,height = 15.0,orderNum = "2") + private String departName; + + @Excel(name = "施工班组", width = 20.0,height = 15.0,orderNum = "3") + private String teamName; + + @Excel(name = "班组负责人", width = 20.0,height = 15.0,orderNum = "4") + private String teamLeader; + + @Excel(name = "班组施工人数", width = 20.0,height = 15.0,orderNum = "5") + private int teamNum; + + @Excel(name = "临时人数", width = 20.0,height = 15.0,orderNum = "6") + private int tempNum; + + @Excel(name = "施工时间", width = 20.0,height = 15.0,orderNum = "7") + private String lyTime; + + @Excel(name = "施工预警次数", width = 20.0,height = 15.0,orderNum = "8") + private int warnNum; + +} diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/WarnHistoryExportVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/WarnHistoryExportVo.java new file mode 100644 index 0000000..143f944 --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/exportVo/WarnHistoryExportVo.java @@ -0,0 +1,29 @@ +package com.bonus.common.entity.bracelet.exportVo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * @className:WarnHistoryExportVo + * @version:1.0 + * @description:预警历史记录导出-vo + */ +@Data +public class WarnHistoryExportVo { + + @Excel(name = "序号", width = 10.0,height = 20.0, orderNum = "0") + private String id; + + @Excel(name = "设备类型", width = 20.0,height = 15.0,orderNum = "1") + private String devTypeName; + + @Excel(name = "设备名称", width = 20.0,height = 15.0,orderNum = "2") + private String devName; + + @Excel(name = "预警时间", width = 20.0,height = 15.0,orderNum = "3") + private String warnTime; + + @Excel(name = "预警内容", width = 20.0,height = 15.0,orderNum = "4") + private String warnContent; + +} diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonVo.java index c89f880..30c35f5 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonVo.java @@ -106,6 +106,11 @@ public class PersonVo implements Serializable { */ private Integer certificateNum; + /** + * 资源类型 + */ + private String sourceType; + /** * 删除的文件ID */ diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/QueryConstruction.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/QueryConstruction.java index 78cc7e8..488ec38 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/QueryConstruction.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/QueryConstruction.java @@ -37,8 +37,8 @@ public class QueryConstruction extends BaseEntity @Excel(name = "班组负责人") private String teamLeader; - /** 班组负责人 */ - @Excel(name = "班组负责人") + /** 班组负责人电话 */ + @Excel(name = "班组负责人电话") private String teamPhone; /** 班组施工人数 */ diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/WarnInfoVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/WarnInfoVo.java index 86610f8..3001fb5 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/WarnInfoVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/WarnInfoVo.java @@ -1,9 +1,13 @@ package com.bonus.common.entity.bracelet.vo; +import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * @className:BallWarnVo @@ -27,4 +31,26 @@ public class WarnInfoVo { private String base64Url; /**人员姓名*/ private String name; + + /** 班组id */ + @Excel(name = "班组id") + private Long teamId; + + /** 请求参数 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map params; + + public Map getParams() + { + if (params == null) + { + params = new HashMap<>(); + } + return params; + } + + public void setParams(Map params) + { + this.params = params; + } } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ExportFileController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ExportFileController.java index e07c484..695eb9c 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ExportFileController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ExportFileController.java @@ -61,6 +61,12 @@ public class ExportFileController { @Resource(name = "IDeviceLyRecordService") private IDeviceLyRecordService iDeviceLyRecordService; + @Autowired + private IQueryConstructionService iQueryConstructionService; + + @Resource(name = "IWarnHistoryService") + private IWarnHistoryService iWarnHistoryService; + @Autowired private IBaseProjectService iBaseProjectService; @@ -276,4 +282,61 @@ public class ExportFileController { log.error(e.toString(), e); } } + + @GetMapping("exportConstructionRecord") + public void exportConstructionRecord(HttpServletRequest request, HttpServletResponse response, QueryConstruction dto) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + List queryConstructionExportVoList = new ArrayList<>(); + List queryConstructionLists = iQueryConstructionService.selectConstructionList(dto); + for (int i = 0; i < queryConstructionLists.size(); i++) { + QueryConstructionExportVo exportVo = new QueryConstructionExportVo(); + QueryConstruction vo = queryConstructionLists.get(i); + BeanUtils.copyProperties(vo, exportVo); + exportVo.setId((i + 1) + ""); + exportVo.setTeamLeader(vo.getTeamLeader()+ "\\" +vo.getTeamPhone()); + exportVo.setLyTime(sdf.format(vo.getLyTime())); + queryConstructionExportVoList.add(exportVo); + } + ExportParams exportParams = new ExportParams("施工记录", "施工记录", ExcelType.XSSF); + exportParams.setStyle(ExcelStyleUtil.class); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, QueryConstructionExportVo.class, queryConstructionExportVoList); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("施工记录" + ".xlsx", "UTF-8")); + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + outputStream.close(); + workbook.close(); + } catch (Exception e) { + log.error(e.toString(), e); + } + } + + @GetMapping("exportWarnHistory") + public void exportWarnHistory(HttpServletRequest request, HttpServletResponse response, WarnInfoVo dto) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + List warnHistoryExportVoList = new ArrayList<>(); + List warnHistoryLists = iWarnHistoryService.getWarnLists(dto); + for (int i = 0; i < warnHistoryLists.size(); i++) { + WarnHistoryExportVo exportVo = new WarnHistoryExportVo(); + WarnInfoVo vo = warnHistoryLists.get(i); + BeanUtils.copyProperties(vo, exportVo); + exportVo.setId((i + 1) + ""); + exportVo.setWarnTime(sdf.format(vo.getWarnTime())); + warnHistoryExportVoList.add(exportVo); + } + ExportParams exportParams = new ExportParams("预警历史记录", "预警历史记录", ExcelType.XSSF); + exportParams.setStyle(ExcelStyleUtil.class); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, WarnHistoryExportVo.class, warnHistoryExportVoList); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("预警历史记录" + ".xlsx", "UTF-8")); + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + outputStream.close(); + workbook.close(); + } catch (Exception e) { + log.error(e.toString(), e); + } + } } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/QueryConstructionController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/QueryConstructionController.java index db1c799..ac1926d 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/QueryConstructionController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/QueryConstructionController.java @@ -8,6 +8,7 @@ import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.entity.bracelet.vo.PersonVo; import com.bonus.common.entity.bracelet.vo.QueryConstruction; import com.bonus.common.entity.bracelet.vo.SidebandDeviceVo; +import com.bonus.common.entity.bracelet.vo.WarnInfoVo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; @@ -91,4 +92,17 @@ public class QueryConstructionController extends BaseController } } + /** + * 施工预警信息列表 + * @param data + * @return + */ + @GetMapping("listWarn") + @SysLog(title = "综合查询", businessType = OperaType.QUERY, module = "综合查询->施工记录管理", details = "查询施工预警信息列表") + public TableDataInfo listWarn(QueryConstruction data) { + startPage(); + List list = constructionService.getWarnLists(data); + return getDataTable(list); + } + } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/WarnHistoryController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/WarnHistoryController.java new file mode 100644 index 0000000..57c00c8 --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/WarnHistoryController.java @@ -0,0 +1,39 @@ +package com.bonus.bracelet.controller; + +import com.bonus.bracelet.service.IDeviceLyRecordService; +import com.bonus.bracelet.service.IWarnHistoryService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.entity.bracelet.vo.EquipmentReqVo; +import com.bonus.common.entity.bracelet.vo.WarnInfoVo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @className:WarnHistoryController + * @description:预警历史记录-web层 + */ +@RestController +@RequestMapping("/warnHistory/") +@Slf4j +public class WarnHistoryController extends BaseController { + + @Resource(name = "IWarnHistoryService") + private IWarnHistoryService service; + + @GetMapping("listWarn") + @SysLog(title = "综合查询", businessType = OperaType.QUERY,module = "综合查询->预警历史记录",details ="查询预警历史列表") + public TableDataInfo listWarn(WarnInfoVo dto) { + startPage(); + List list = service.getWarnLists(dto); + return getDataTable(list); + } + +} diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/QueryConstructionMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/QueryConstructionMapper.java index 874a399..9f26e06 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/QueryConstructionMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/QueryConstructionMapper.java @@ -3,6 +3,7 @@ package com.bonus.bracelet.mapper; import com.bonus.common.entity.bracelet.vo.PersonVo; import com.bonus.common.entity.bracelet.vo.QueryConstruction; import com.bonus.common.entity.bracelet.vo.SidebandDeviceVo; +import com.bonus.common.entity.bracelet.vo.WarnInfoVo; import java.util.List; @@ -35,4 +36,12 @@ public interface QueryConstructionMapper */ List getTempLists(PersonVo data); + /** + * 施工预警信息列表 + * @param data + * @return + */ + List getWarnLists(QueryConstruction data); + + } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/WarnHistoryMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/WarnHistoryMapper.java new file mode 100644 index 0000000..236ce89 --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/WarnHistoryMapper.java @@ -0,0 +1,23 @@ +package com.bonus.bracelet.mapper; + +import com.bonus.common.entity.bracelet.vo.EquipmentReqVo; +import com.bonus.common.entity.bracelet.vo.WarnInfoVo; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @className:DeviceLyRecordMapper + * @description:设备领用记录-mapper + */ +@Repository(value = "WarnHistoryMapper") +public interface WarnHistoryMapper { + /** + * 预警历史记录列表 + * @param dto + * @return + */ + List getWarnLists(WarnInfoVo dto); + + +} diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IQueryConstructionService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IQueryConstructionService.java index 8e8295e..210938f 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IQueryConstructionService.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IQueryConstructionService.java @@ -3,6 +3,7 @@ package com.bonus.bracelet.service; import com.bonus.common.entity.bracelet.vo.PersonVo; import com.bonus.common.entity.bracelet.vo.QueryConstruction; import com.bonus.common.entity.bracelet.vo.SidebandDeviceVo; +import com.bonus.common.entity.bracelet.vo.WarnInfoVo; import java.util.List; @@ -33,4 +34,12 @@ public interface IQueryConstructionService * @return */ List getTempLists(PersonVo data); + + /** + * 施工预警信息列表 + * @param data + * @return + */ + List getWarnLists(QueryConstruction data); + } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IWarnHistoryService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IWarnHistoryService.java new file mode 100644 index 0000000..0555428 --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IWarnHistoryService.java @@ -0,0 +1,20 @@ +package com.bonus.bracelet.service; + +import com.bonus.common.entity.bracelet.vo.EquipmentReqVo; +import com.bonus.common.entity.bracelet.vo.WarnInfoVo; + +import java.util.List; + +/** + * @className:IWarnHistoryService + * @description:预警历史记录-serivice + */ +public interface IWarnHistoryService { + /** + * 预警历史记录列表 + * @param dto + * @return + */ + List getWarnLists(WarnInfoVo dto); + +} diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/QueryConstructionServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/QueryConstructionServiceImpl.java index 1928bb1..c20f1b8 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/QueryConstructionServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/QueryConstructionServiceImpl.java @@ -1,15 +1,26 @@ package com.bonus.bracelet.service.impl; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.bonus.bracelet.mapper.QueryConstructionMapper; import com.bonus.bracelet.service.IQueryConstructionService; +import com.bonus.common.core.constant.BusinessConstants; +import com.bonus.common.core.constant.HttpStatus; +import com.bonus.common.core.constant.SecurityConstants; +import com.bonus.common.core.domain.R; import com.bonus.common.core.utils.encryption.Sm4Utils; +import com.bonus.common.entity.bracelet.vo.BaseProject; import com.bonus.common.entity.bracelet.vo.PersonVo; import com.bonus.common.entity.bracelet.vo.QueryConstruction; +import com.bonus.common.entity.bracelet.vo.WarnInfoVo; +import com.bonus.system.api.RemoteFileService; +import com.bonus.system.api.domain.SysFile; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -26,6 +37,8 @@ public class QueryConstructionServiceImpl implements IQueryConstructionService @Autowired private QueryConstructionMapper constructionMapper; + @Resource + private RemoteFileService remoteFileService; /** * @@ -50,8 +63,12 @@ public class QueryConstructionServiceImpl implements IQueryConstructionService @Override public List getTeamLists(PersonVo data) { List list = new ArrayList<>(); + data.setSourceType(BusinessConstants.RESOURCE_TYPE_USER); try { list = constructionMapper.getTeamLists(data); + for (PersonVo vo : list) { + vo = handleData(vo); + } } catch (Exception e) { log.error(e.toString(), e); @@ -67,8 +84,42 @@ public class QueryConstructionServiceImpl implements IQueryConstructionService @Override public List getTempLists(PersonVo data) { List list = new ArrayList<>(); + data.setSourceType(BusinessConstants.RESOURCE_TYPE_USERTEMP); try { list = constructionMapper.getTempLists(data); + for (PersonVo vo : list) { + vo = handleData(vo); + } + + } catch (Exception e) { + log.error(e.toString(), e); + } + return list; + } + + public PersonVo handleData(PersonVo vo) { + vo.setIdCard(Sm4Utils.decode(vo.getIdCard())); + vo.setPhone(Sm4Utils.decode(vo.getPhone())); + R result = remoteFileService.getImgBase64(vo.getFilePath(), SecurityConstants.INNER); + if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) { + String jsonString = JSON.toJSONString(result.getData()); + JSONObject item = JSON.parseObject(jsonString); + String base64 = item.getString("url"); + vo.setBase64Url(base64); + } + return vo; + } + + /** + * 施工预警信息 + * @param data + * @return + */ + @Override + public List getWarnLists(QueryConstruction data) { + List list = new ArrayList<>(); + try { + list = constructionMapper.getWarnLists(data); } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/WarnHistorympl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/WarnHistorympl.java new file mode 100644 index 0000000..6ee8b43 --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/WarnHistorympl.java @@ -0,0 +1,38 @@ +package com.bonus.bracelet.service.impl; + +import com.bonus.bracelet.mapper.DeviceLyRecordMapper; +import com.bonus.bracelet.mapper.WarnHistoryMapper; +import com.bonus.bracelet.service.IDeviceLyRecordService; +import com.bonus.bracelet.service.IWarnHistoryService; +import com.bonus.common.core.utils.encryption.Sm4Utils; +import com.bonus.common.entity.bracelet.vo.EquipmentReqVo; +import com.bonus.common.entity.bracelet.vo.WarnInfoVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @className:DeviceLyRecordServiceImpl + * @description:设备领用记录-serviceImpl + */ +@Slf4j +@Service(value = "IWarnHistoryService") +public class WarnHistorympl implements IWarnHistoryService { + + @Resource(name = "WarnHistoryMapper") + private WarnHistoryMapper mapper; + + @Override + public List getWarnLists(WarnInfoVo dto) { + List list = new ArrayList<>(); + try { + list = mapper.getWarnLists(dto); + } catch (Exception e) { + log.error(e.toString(), e); + } + return list; + } +} diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml index 7f5e1e5..74704fd 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml @@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select tp.id as id,tp.name as name,tp.sex as sex,tp.id_card as idCard,tp.phone as phone,tp.aqm_code as aqmCode,tp.mj_code as mjCode + select tp.id as id,tp.name as name,tp.sex as sex,tp.id_card as idCard,tp.phone as phone, + tp.aqm_code as aqmCode,tp.mj_code as mjCode,sfs.file_path AS filePath,sfs.id AS fileId from t_work_team twt left join tb_people tp on twt.team_id = tp.team_id and tp.del_flag = 0 + left join sys_file_source sfs on tp.id = sfs.source_id AND sfs.source_type = #{sourceType} AND sfs.del_flag = 0 twt.team_id = #{teamId} and twt.del_flag = 0 AND INSTR(tp.name,#{name}) > 0 - AND INSTR(tp.sex,#{sex}) > 0 + AND tp.sex = #{sex} + + + \ No newline at end of file diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/WarnHistoryMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/WarnHistoryMapper.xml new file mode 100644 index 0000000..4e2e5d6 --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/WarnHistoryMapper.xml @@ -0,0 +1,44 @@ + + + + + + \ No newline at end of file