Merge remote-tracking branch 'origin/dev' into dev

sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/enums/BusinessType.java

@@ -56,4 +56,8 @@ public enum BusinessType
      * 清空数据
      */
     CLEAN,
+    /**
+     * 查询
+     */
+    QUERY,
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java

@@ -1,10 +1,9 @@
-package com.bonus.sgzb.base;
+package com.bonus.sgzb;
 
 
 import com.bonus.sgzb.common.security.annotation.EnableCustomConfig;
 import com.bonus.sgzb.common.security.annotation.EnableRyFeignClients;
 import com.bonus.sgzb.common.swagger.annotation.EnableCustomSwagger2;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java

@@ -0,0 +1,30 @@
+package com.bonus.sgzb.largeScreen.controller;
+
+import com.bonus.sgzb.common.core.web.controller.BaseController;
+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 com.bonus.sgzb.largeScreen.service.ILargeScreenService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author 10488
+ * 大屏
+ */
+@RestController
+@RequestMapping("/largeScreen/home/")
+public class LargeScreenController extends BaseController {
+
+    @Resource(name = "ILargeScreenService")
+    private ILargeScreenService service;
+
+    @Log(title = "领料数据", businessType = BusinessType.QUERY)
+    @PostMapping("getMaterialReqData")
+    public AjaxResult getMaterialReqData() {
+        return service.getMaterialReqData();
+    }
+}

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java

@@ -0,0 +1,11 @@
+package com.bonus.sgzb.largeScreen.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author 10488
+ * 大屏
+ */
+@Repository("LargeScreenMapper")
+public interface LargeScreenMapper {
+}

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java

@@ -0,0 +1,18 @@
+package com.bonus.sgzb.largeScreen.service;
+
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
+
+/**
+ * @author 10488
+ * 大屏
+ */
+public interface ILargeScreenService {
+
+    /**
+     * @return AjaxResult
+     * @description 领料数据
+     * @author cwchen
+     * @date 2023/12/11 15:34
+     */
+    AjaxResult getMaterialReqData();
+}

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java

@@ -0,0 +1,31 @@
+package com.bonus.sgzb.largeScreen.service.impl;
+
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
+import com.bonus.sgzb.largeScreen.mapper.LargeScreenMapper;
+import com.bonus.sgzb.largeScreen.service.ILargeScreenService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+
+/**
+ * @author 10488
+ * 大屏
+ */
+@Service("ILargeScreenService")
+public class LargeScreenServiceImpl implements ILargeScreenService {
+
+    @Resource(name = "LargeScreenMapper")
+    private LargeScreenMapper mapper;
+
+    @Override
+    public AjaxResult getMaterialReqData() {
+        HashMap<Object, Object> map = new HashMap<>(2);
+        int a = 1/0;
+        // 施工工具今日出库
+        map.put("num", 330);
+        // 工器具今日出库
+        map.put("num2", 201);
+        return AjaxResult.success(map);
+    }
+}

sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml

@@ -0,0 +1,7 @@
+<?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.bonus.sgzb.largeScreen.mapper.LargeScreenMapper">
+
+</mapper>