diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/face/ArcFaceHelper.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/face/ArcFaceHelper.java index e60bf95..3547435 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/face/ArcFaceHelper.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/face/ArcFaceHelper.java @@ -22,11 +22,11 @@ public class ArcFaceHelper { private static final String APP_ID = "52XE2dQBtdmMsfDMvyKmPCD1nGBSGQWQGUyJh5z9JhND"; /** - * x64 + * win */ private static final String WIN64_SDK_KEY = "GggpcEphVxXLXcpEZz6tdC19o3QhbuktDm3YTUhUGr7J"; /** - * linux_64 + * linux */ private static final String LINUX64_SDK_KEY = "GggpcEphVxXLXcpEZz6tdC19evqXbbhMyYt71DGLwnCp"; @@ -80,7 +80,7 @@ public class ArcFaceHelper { //初始化引擎 faceEngine.init(engineConfiguration); //人脸检测 - List lstFaceInfo = new ArrayList(); + List lstFaceInfo = new ArrayList<>(); faceEngine.detectFaces(imageInfo.getRgbData(), imageInfo.getWidth(), imageInfo.getHeight(), ImageFormat.CP_PAF_BGR24, lstFaceInfo); System.out.println("检测到人脸数:" + lstFaceInfo.size()); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java index c59a13e..3229904 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java @@ -123,7 +123,7 @@ public class BmWorkerWageCardController extends BaseController { * @return */ @PostMapping("/light/{id}") - @SysLog(title = "工资卡管理", businessType = OperaType.DELETE, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "更新人员红绿灯") + @SysLog(title = "更新人员红绿灯", businessType = OperaType.DELETE, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "更新人员红绿灯") public void light(@PathVariable("id") Integer id) { try { service.updateLightByWorkerId(id); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java index f8b89d9..cd05ff6 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java @@ -34,7 +34,7 @@ public class HomePageController extends BaseController { @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) @PostMapping("/getDataOverview") @SysLog(title = "数据概览", businessType = OperaType.QUERY, logType = 0, module = "首页->数据概览", details = "数据概览") - public AjaxResult getDataOverview(@Validated @RequestBody HomePagePo o) { + public AjaxResult getDataOverview(HomePagePo o) { try { return service.getDataOverview(o); } catch (Exception e) { @@ -49,9 +49,9 @@ public class HomePageController extends BaseController { * @return */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) - @PostMapping("/getWorkerAtt") + @GetMapping("/getWorkerAtt") @SysLog(title = "人员考勤", businessType = OperaType.QUERY, logType = 0, module = "首页->人员考勤", details = "人员考勤") - public AjaxResult getWorkerAtt(@Validated @RequestBody HomePagePo o) { + public AjaxResult getWorkerAtt(HomePagePo o) { try { return service.getWorkerAtt(o); } catch (Exception e) { @@ -66,9 +66,9 @@ public class HomePageController extends BaseController { * @return */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) - @PostMapping("/getProjectMsg") + @GetMapping("/getProjectMsg") @SysLog(title = "工程信息", businessType = OperaType.QUERY, logType = 0, module = "首页->工程信息", details = "工程信息") - public AjaxResult getProjectMsg(@Validated @RequestBody HomePagePo o) { + public AjaxResult getProjectMsg(HomePagePo o) { try { return service.getProjectMsg(o); } catch (Exception e) { @@ -83,9 +83,9 @@ public class HomePageController extends BaseController { * @return */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) - @PostMapping("/getEinWorkerDistribution") + @GetMapping("/getEinWorkerDistribution") @SysLog(title = "在场人员", businessType = OperaType.QUERY, logType = 0, module = "首页->在场人员", details = "在场人员") - public AjaxResult getEinWorkerDistribution(@Validated @RequestBody HomePagePo o) { + public AjaxResult getEinWorkerDistribution(HomePagePo o) { try { return service.getEinWorkerDistribution(o); } catch (Exception e) { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java new file mode 100644 index 0000000..13b9d2c --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java @@ -0,0 +1,167 @@ +package com.bonus.bmw.controller; + +import com.bonus.bmw.domain.po.HomePagePo; +import com.bonus.bmw.domain.vo.HomePageSubProVo; +import com.bonus.bmw.service.HomePageSubService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.InnerAuth; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +/** +* 首页 - 子页面 +* @author fly +*/ +@RestController +@RequestMapping("/homePageSub") +public class HomePageSubController extends BaseController { + /** + * 服务对象 + */ + @Autowired + private HomePageSubService service; + + /** + * 首页-子页面-总工程详情 + * @param o + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) + @GetMapping("/getMainProMsg") + @SysLog(title = "总工程详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "总工程详情") + public TableDataInfo getMainProMsg(HomePagePo o) { + try { + startPage(); + List list = service.getMainProMsg(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 首页-子页面-工程详情 + * @param o + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) + @GetMapping("/getProMsg") + @SysLog(title = "工程详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "工程详情") + public TableDataInfo getProMsg(HomePagePo o) { + try { + startPage(); + List list = service.getProMsg(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 首页-子页面-分包详情 + * @param o + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) + @GetMapping("/getSubMsg") + @SysLog(title = "分包详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "分包详情") + public TableDataInfo getSubMsg(HomePagePo o) { + try { + startPage(); + List list = service.getSubMsg(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + + /** + * 首页-子页面-班组详情 + * @param o + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) + @GetMapping("/getTeamMsg") + @SysLog(title = "班组详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "班组详情") + public TableDataInfo getTeamMsg(HomePagePo o) { + try { + startPage(); + List list = service.getTeamMsg(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + + /** + * 首页-子页面-人员详情 + * @param o + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) + @GetMapping("/getWorkerMsg") + @SysLog(title = "人员详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "人员详情") + public TableDataInfo getWorkerMsg(HomePagePo o) { + try { + startPage(); + List list = service.getWorkerMsg(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 首页-子页面-出场未结算详情 + * @param o + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) + @GetMapping("/getWorkerNotFileMsg") + @SysLog(title = "出场未结算详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "出场未结算详情") + public TableDataInfo getWorkerNotFileMsg(HomePagePo o) { + try { + startPage(); + List list = service.getWorkerNotFileMsg(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + /** + * 首页-子页面-单人详情页面 + * @param o + * @return + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) + @GetMapping("/getWorkerNotFileMsg") + @SysLog(title = "单人详情页面", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "单人详情页面") + public AjaxResult getWorkerMsgById(HomePagePo o) { + try { + return service.getWorkerMsgById(o); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/HomePagePo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/HomePagePo.java index bf675ba..10c4d19 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/HomePagePo.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/HomePagePo.java @@ -19,4 +19,40 @@ public class HomePagePo { private String currentDay; + private Integer mainProId; + + private String mainProName; + + private String proName; + + private String proType; + + private String volLevel; + + private String proStatus; + + private Integer subCompanyId; + + private String subComName; + + private String subName; + + private String teamName; + + private String workerName; + + private Integer lightStatus; + + private Integer startAge; + + private Integer endAge; + + private String sex; + + private Integer isAtt; + + private Integer lightStatusSeven; + + private Integer postId; + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageSubProVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageSubProVo.java new file mode 100644 index 0000000..29678d6 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/HomePageSubProVo.java @@ -0,0 +1,53 @@ +package com.bonus.bmw.domain.vo; + +import lombok.Data; + +@Data +public class HomePageSubProVo { + + /** + * 主项目id + */ + private Integer mainProId; + /** + * 主项目名称 + */ + private String mainProName; + /** + * 项目总数 + */ + private Integer proNum; + + private String proId; + private String proName; + private String subCompanyName; + private String proType; + private String volLevel; + private String proStatus; + private String einNum; + private String attNum; + private String yellowNum; + private String greenNum; + private String subNum; + private String teamNum; + + private String teamId; + private String teamName; + private String subId; + private String subName; + private String subCompanyId; + + private String workerId; + private String workerName; + private String sex; + private String age; + private String phone; + private String postName; + private String lightStatus; + private String isAtt; + + private String exitTime; + private String idNumber; + private String daysSinceExit; + +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java new file mode 100644 index 0000000..a3b6637 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java @@ -0,0 +1,62 @@ +package com.bonus.bmw.mapper; + +import com.bonus.bmw.domain.po.HomePagePo; +import com.bonus.bmw.domain.vo.*; +import com.bonus.common.core.web.domain.AjaxResult; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface HomePageSubMapper { + + /** + * 获取总工程详情 + * @param o + * @return + */ + List getMainProMsg(HomePagePo o); + + /** + * 获取工程详情 + * @param o + * @return + */ + List getProMsg(HomePagePo o); + + /** + * 获取分包详情 + * @param o + * @return + */ + List getSubMsg(HomePagePo o); + + /** + * 获取班组详情 + * @param o + * @return + */ + List getTeamMsg(HomePagePo o); + + /** + * 获取人员详情 + * @param o + * @return + */ + List getWorkerMsg(HomePagePo o); + + /** + * 获取出场未结算详情 + * @param o + * @return + */ + List getWorkerNotFileMsg(HomePagePo o); + + /** + * 获取单人详情页面 + * @param o + * @return + */ + PmWorker getWorkerMsgById(HomePagePo o); +} \ No newline at end of file diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java new file mode 100644 index 0000000..363818e --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java @@ -0,0 +1,59 @@ +package com.bonus.bmw.service; + +import com.bonus.bmw.domain.po.HomePagePo; +import com.bonus.bmw.domain.vo.HomePageSubProVo; +import com.bonus.common.core.web.domain.AjaxResult; + +import java.util.List; + +public interface HomePageSubService { + + /** + * 总工程详情 + * @param o + * @return + */ + List getMainProMsg(HomePagePo o); + + /** + * 工程详情 + * @param o + * @return + */ + List getProMsg(HomePagePo o); + + /** + * 分包详情 + * @param o + * @return + */ + List getSubMsg(HomePagePo o); + + /** + * 班组详情 + * @param o + * @return + */ + List getTeamMsg(HomePagePo o); + + /** + * 人员详情 + * @param o + * @return + */ + List getWorkerMsg(HomePagePo o); + + /** + * 出场未结算详情 + * @param o + * @return + */ + List getWorkerNotFileMsg(HomePagePo o); + + /** + * 单人详情页面 + * @param o + * @return + */ + AjaxResult getWorkerMsgById(HomePagePo o); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java new file mode 100644 index 0000000..bade41a --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java @@ -0,0 +1,65 @@ +package com.bonus.bmw.service.impl; + +import com.bonus.bmw.domain.po.HomePagePo; +import com.bonus.bmw.domain.vo.*; +import com.bonus.bmw.mapper.HomePageSubMapper; +import com.bonus.bmw.service.HomePageSubService; +import com.bonus.common.core.constant.Constants; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.system.api.model.UploadFileVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class HomePageSubServiceImpl implements HomePageSubService { + + @Autowired + private HomePageSubMapper mapper; + + @Autowired + private FileUploadUtils fileUploadUtils; + + + @Override + public List getMainProMsg(HomePagePo o) { + return mapper.getMainProMsg(o); + } + + @Override + public List getProMsg(HomePagePo o) { + return mapper.getProMsg(o); + } + + @Override + public List getSubMsg(HomePagePo o) { + return mapper.getSubMsg(o); + } + + @Override + public List getTeamMsg(HomePagePo o) { + return mapper.getTeamMsg(o); + } + + @Override + public List getWorkerMsg(HomePagePo o) { + return mapper.getWorkerMsg(o); + } + + @Override + public List getWorkerNotFileMsg(HomePagePo o) { + return mapper.getWorkerNotFileMsg(o); + } + + @Override + public AjaxResult getWorkerMsgById(HomePagePo o) { + PmWorker worker = mapper.getWorkerMsgById(o); + if (worker.getContractId() != null) { + List contractFile = fileUploadUtils.getFileList("", worker.getContractId().toString(), Constants.FILE_UPLOAD_CONTRACT, ""); + worker.setFiles(contractFile); + } + + return AjaxResult.success("查询成功", worker); + } +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java index 5c6ac88..ee45f62 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java @@ -93,7 +93,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{ //下发人脸到考勤机 urkSendService.sendUserToDevice(record.getId(),record.getProId(),"0"); } - return new AjaxResult(200, "添加成功"); + return new AjaxResult(200, "添加成功",record.getId()); } /** diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageMapper.xml index f8763a5..d0d00b1 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageMapper.xml @@ -5,13 +5,8 @@ - - - - -