diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java new file mode 100644 index 00000000..02f4bf21 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java @@ -0,0 +1,42 @@ +package com.bonus.sgzb.app.controller; + +import com.bonus.sgzb.app.domain.CriticalData; +import com.bonus.sgzb.app.domain.ToDoList; +import com.bonus.sgzb.app.service.AppService; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.log.annotation.Log; +import com.bonus.sgzb.common.log.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author c liu + * @date 2023/12/11 + */ +@RestController +@RequestMapping("/app") +public class AppController { + @Autowired + private AppService service; + + @ApiOperation(value = "查询关键数据") + @Log(title = "关键数据", businessType = BusinessType.QUERY) + @GetMapping("/getCriticalData") + public AjaxResult getCriticalData() + { + CriticalData data = service.getCriticalData(); + return AjaxResult.success("操作成功",data); + } + + @ApiOperation(value = "查询待办事项") + @Log(title = "待办事项", businessType = BusinessType.QUERY) + @GetMapping("/getToDoList") + public AjaxResult getToDoList() + { + ToDoList data = service.getToDoList(); + return AjaxResult.success("操作成功",data); + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java new file mode 100644 index 00000000..f4fce101 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java @@ -0,0 +1,31 @@ +package com.bonus.sgzb.app.controller; + +import com.bonus.sgzb.app.domain.SysNotice; +import com.bonus.sgzb.app.service.SysNoticeService; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +@RestController +@RequestMapping("/sysNotice") +public class SysNoticeController { + @Autowired + private SysNoticeService service; + + @ApiOperation(value = "查询通知公告列表") + @GetMapping("/getList") + public AjaxResult getList() + { + List list = service.getList(); + return AjaxResult.success("操作成功",list); + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/CriticalData.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/CriticalData.java new file mode 100644 index 00000000..d7cc6d52 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/CriticalData.java @@ -0,0 +1,34 @@ +package com.bonus.sgzb.app.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="关键数据") +public class CriticalData { + /** + * 当日领料 + */ + @ApiModelProperty(value = "当日领料") + private int dayLeaseNum; + /** + * 当日退料 + */ + @ApiModelProperty(value = "当日退料") + private int dayBackNum; + /** + * 当日入库 + */ + @ApiModelProperty(value = "当日入库") + private int dayInputNum; + /** + * 当日出库 + */ + @ApiModelProperty(value = "当日出库") + private int dayOutNum; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/SysNotice.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/SysNotice.java new file mode 100644 index 00000000..03b369b4 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/SysNotice.java @@ -0,0 +1,65 @@ +package com.bonus.sgzb.app.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="通知公告") +public class SysNotice { + /** + * 公告ID + */ + @ApiModelProperty(value = "公告ID") + private Long noticeId; + /** + * 公告标题 + */ + @ApiModelProperty(value = "公告标题") + private String noticeTitle; + /** + * 公告类型（1通知 2公告） + */ + @ApiModelProperty(value = "公告类型（1通知 2公告）") + private String noticeType; + /** + * 公告内容 + */ + @ApiModelProperty(value = "公告内容") + private byte[] noticeContent; + private String noticeContentStr; + /** + * 公告状态（0正常 1关闭） + */ + @ApiModelProperty(value = "公告状态（0正常 1关闭）") + private String status; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private String updateTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/ToDoList.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/ToDoList.java new file mode 100644 index 00000000..4396498d --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/ToDoList.java @@ -0,0 +1,34 @@ +package com.bonus.sgzb.app.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="代办事项") +public class ToDoList { + /** + * 领料待审批 + */ + @ApiModelProperty(value = "领料待审批") + private int leaseNum; + /** + * 退料待审批 + */ + @ApiModelProperty(value = "退料待审批") + private int backNum; + /** + * 报废待审核 + */ + @ApiModelProperty(value = "报废待审核") + private int scrapNum; + /** + * 试验检验待审核 + */ + @ApiModelProperty(value = "试验检验待审核") + private int trialNum; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java new file mode 100644 index 00000000..6c1b53ba --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java @@ -0,0 +1,28 @@ +package com.bonus.sgzb.app.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Mapper +public interface AppMapper { + + int getDayLeaseNum(@Param("startTime") String startTime, @Param("endTime")String endTime); + + int getDayBackNum(@Param("startTime") String startTime, @Param("endTime")String endTime); + + int getDayInputNum(@Param("startTime") String startTime, @Param("endTime")String endTime); + + int getDayOutNum(@Param("startTime") String startTime, @Param("endTime")String endTime); + + int getLeaseNum(); + + int getBackNum(); + + int getScrapNum(); + + int getTrialNum(); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java new file mode 100644 index 00000000..464e96ee --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java @@ -0,0 +1,15 @@ +package com.bonus.sgzb.app.mapper; + +import com.bonus.sgzb.app.domain.SysNotice; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Mapper +public interface SysNoticeMapper { + List getList(); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java new file mode 100644 index 00000000..b7f05cdf --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java @@ -0,0 +1,15 @@ +package com.bonus.sgzb.app.service; + +import com.bonus.sgzb.app.domain.CriticalData; +import com.bonus.sgzb.app.domain.ToDoList; + +/** + * @author c liu + * @date 2023/12/11 + */ +public interface AppService { + + CriticalData getCriticalData(); + + ToDoList getToDoList(); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java new file mode 100644 index 00000000..8199bbc3 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java @@ -0,0 +1,13 @@ +package com.bonus.sgzb.app.service; + +import com.bonus.sgzb.app.domain.SysNotice; + +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +public interface SysNoticeService { + List getList(); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java new file mode 100644 index 00000000..619c4700 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java @@ -0,0 +1,52 @@ +package com.bonus.sgzb.app.service.impl; + +import com.bonus.sgzb.app.domain.CriticalData; +import com.bonus.sgzb.app.domain.ToDoList; +import com.bonus.sgzb.app.mapper.AppMapper; +import com.bonus.sgzb.app.service.AppService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Service("AppService") +public class AppServiceImpl implements AppService { + @Autowired + private AppMapper mapper; + + + @Override + public CriticalData getCriticalData() { + CriticalData data = new CriticalData(); + LocalDate current_date = LocalDate.now(); + String startTime = current_date + " 00:00:00"; + String endTime = current_date + " 23:59:59"; + int dayLeaseNum = mapper.getDayLeaseNum(startTime,endTime); + int dayBackNum = mapper.getDayBackNum(startTime,endTime); + int dayInputNum = mapper.getDayInputNum(startTime,endTime); + int dayOutNum = mapper.getDayOutNum(startTime,endTime); + data.setDayLeaseNum(dayLeaseNum); + data.setDayBackNum(dayBackNum); + data.setDayInputNum(dayInputNum); + data.setDayOutNum(dayOutNum); + return data; + } + + @Override + public ToDoList getToDoList() { + ToDoList data = new ToDoList(); + int leaseNum = mapper.getLeaseNum(); + int backNum = mapper.getBackNum(); + int scrapNum = mapper.getScrapNum(); + int trialNum = mapper.getTrialNum(); + data.setLeaseNum(leaseNum); + data.setBackNum(backNum); + data.setScrapNum(scrapNum); + data.setTrialNum(trialNum); + return data; + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java new file mode 100644 index 00000000..07376a64 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java @@ -0,0 +1,30 @@ +package com.bonus.sgzb.app.service.impl; + +import com.bonus.sgzb.app.domain.SysNotice; +import com.bonus.sgzb.app.mapper.SysNoticeMapper; +import com.bonus.sgzb.app.service.SysNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Base64; +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Service("SysNoticeService") +public class SysNoticeServiceImpl implements SysNoticeService { + @Autowired + private SysNoticeMapper mapper; + + @Override + public List getList() { + List list = mapper.getList(); + for (SysNotice bean : list){ + String noticeContent = Base64.getEncoder().encodeToString(bean.getNoticeContent()); + bean.setNoticeContentStr(noticeContent); + } + return list; + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java new file mode 100644 index 00000000..3e77e873 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -0,0 +1,27 @@ +package com.bonus.sgzb.base.controller; + +import com.bonus.sgzb.base.service.RepairService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author c liu + * @date 2023/12/11 + */ +@RestController +@RequestMapping("/repair") +public class RepairController { + @Autowired + private RepairService service; + +// @ApiOperation(value = "查询关键数据") +// @Log(title = "关键数据", businessType = BusinessType.QUERY) +// @GetMapping("/getCriticalData") +// public AjaxResult getCriticalData() +// { +// CriticalData data = service.getCriticalData(); +// return AjaxResult.success("操作成功",data); +// } + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java new file mode 100644 index 00000000..6c61c96d --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java @@ -0,0 +1,59 @@ +package com.bonus.sgzb.base.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="维修任务") +public class RepairTask { + /** + * 任务id + */ + @ApiModelProperty(value = "任务id") + private String taskId; + /** + * 维修单号 + */ + @ApiModelProperty(value = "维修单号") + private String repairCode; + /** + * 退料单位名称 + */ + @ApiModelProperty(value = "退料单位名称") + private String backUnit; + /** + * 退料工程名称 + */ + @ApiModelProperty(value = "退料工程名称") + private String backPro; + /** + * 维修机具类型 + */ + @ApiModelProperty(value = "维修机具类型") + private String type; + /** + * 任务创建人 + */ + @ApiModelProperty(value = "任务创建人") + private String createBy; + /** + * 任务创建时间 + */ + @ApiModelProperty(value = "任务创建时间") + private String createTime; + /** + * 退料单号 + */ + @ApiModelProperty(value = "退料单号") + private String backCode; + /** + * 维修状态 + */ + @ApiModelProperty(value = "维修状态") + private String repairStatus; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java new file mode 100644 index 00000000..39e16600 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -0,0 +1,13 @@ +package com.bonus.sgzb.base.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Mapper +public interface RepairMapper { + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java new file mode 100644 index 00000000..9faab51d --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java @@ -0,0 +1,10 @@ +package com.bonus.sgzb.base.service; + +/** + * @author c liu + * @date 2023/12/11 + */ +public interface RepairService { + + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java new file mode 100644 index 00000000..0ac22ba0 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -0,0 +1,18 @@ +package com.bonus.sgzb.base.service.impl; + +import com.bonus.sgzb.base.mapper.RepairMapper; +import com.bonus.sgzb.base.service.RepairService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Service("RepairService") +public class RepairServiceImpl implements RepairService { + @Autowired + private RepairMapper mapper; + + +} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml new file mode 100644 index 00000000..a0e88288 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml new file mode 100644 index 00000000..b377e82a --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml new file mode 100644 index 00000000..a98186fd --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml @@ -0,0 +1,19 @@ + + + + + + +