huning 4 週間 前
コミット
febafd70f8

+ 4 - 7
new-react-admin-ui/src/pages/dashboard/DashboardList.tsx

@@ -3,6 +3,8 @@ import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
 import "./styles.css";
 import { Card, CardContent } from '@mui/material';
 import { Title } from 'react-admin';
+import OrderIndex from './OrderIndex';
+
 
 const DashboardList = () => {
     
@@ -78,16 +80,12 @@ const DashboardList = () => {
 
                             <TabPanel>
                                 <div style={{ padding: '20px' }}>
-                                    <h3>キャパシティ設定</h3>
-                                    <p>这里是キャパシティ設定的内容</p>
+                                    <OrderIndex />
                                 </div>
                             </TabPanel>
 
                             <TabPanel>
-                                <div style={{ padding: '20px' }}>
-                                    <h3>過去ログ</h3>
-                                    <p>这里是過去ログ的内容</p>
-                                </div>
+                                <OrderIndex />
                             </TabPanel>
 
                             <TabPanel>
@@ -110,5 +108,4 @@ const DashboardList = () => {
         </Card>
     );
 };
-
 export default DashboardList;

+ 4 - 1
new-react-admin-ui/src/services/permissionService.ts

@@ -242,4 +242,7 @@ class PermissionService {
 }
 
 // 导出单例实例
-export const permissionService = new PermissionService();
+export const permissionService = new PermissionService();
+
+// 导出request函数供外部使用
+export { request };

+ 62 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java

@@ -0,0 +1,62 @@
+package com.ruoyi.web.controller.system;
+
+import jakarta.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.domain.SysOrder;
+import com.ruoyi.system.service.ISysOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 岗位信息操作处理
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/order")
+public class SysOrderController extends BaseController
+{
+    @Autowired
+    private ISysOrderService orderService;
+
+    /**
+     * 获取订单选择框列表
+     */
+    @Anonymous
+    @GetMapping("/orderselect")
+    public AjaxResult orderselect()
+    {
+        List<SysOrder> order = orderService.selectOrderAll();
+        return success(order);
+    }
+
+    @GetMapping("/orderDateselect")
+    public AjaxResult selectOrderDate(SysOrder order)
+    {
+        List<SysOrder> list = orderService.selectOrderDate(order);
+        return success(list);
+    }
+
+    /**
+     * 保存
+     */
+    @PostMapping("/orderDateupdate")
+    @Log(title = "保存", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult updatedashBoard(@RequestBody SysOrder order)
+    {
+        return toAjax(orderService.updatedashBoard(order));
+    }
+}

+ 1 - 1
ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:postgresql://localhost:5432/postgres?characterEncoding=utf8&ssl=false&stringtype=unspecified
+                url: jdbc:postgresql://localhost:5432/postgres_zzl?characterEncoding=utf8&ssl=false&stringtype=unspecified
                 username: postgres
                 password: 123456Aa
             # 从库数据源

+ 2 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,6 +115,8 @@ public class SecurityConfig
                     // 静态资源,可匿名访问
                     .requestMatchers(HttpMethod.GET, "/", "/*.html", "/**.html", "/**.css", "/**.js", "/profile/**").permitAll()
                     .requestMatchers("/swagger-ui.html", "/v3/api-docs/**", "/swagger-ui/**", "/druid/**").permitAll()
+                    // 数据库检查接口,允许匿名访问
+                    .requestMatchers("/system/dbcheck/**").permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })

+ 222 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java

@@ -0,0 +1,222 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+public class SysOrder extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 部名 */
+    @Excel(name = "部名", cellType = ColumnType.NUMERIC)
+    private String depName;
+
+    /** 地区名 */
+    @Excel(name = "地区名")
+    private String regName;
+
+    /** 拠点コード */
+    @Excel(name = "拠点コード")
+    private String baseCode;
+
+    /** 拠点名 */
+    @Excel(name = "拠点名")
+    private String baseName;
+
+    /** 本日累積出荷数 */
+    @Excel(name = "本日累積出荷数")
+    private Integer shipNumber;
+
+    /** 本日累積出荷数 */
+    @Excel(name = "本日累積出荷数")
+    private Integer linkCap;
+
+    /** 本日累積出荷数 */
+    @Excel(name = "本日累積出荷数")
+    private Integer fixedCap;
+
+    /** ソーター識別数 */
+    @Excel(name = "ソーター識別数")
+    private Integer sorterNum;
+
+    /** リジェクト数 */
+    @Excel(name = "リジェクト数")
+    private Integer rejectNum;
+
+    /** SBS出荷数 */
+    @Excel(name = "SBS出荷数")
+    private Integer sbsNum;
+
+    /** 判別結果 */
+    @Excel(name = "判別結果")
+    private Integer resultNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "日付", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dateTm;
+
+    /** 更新者 */
+    @Excel(name = "更新者")
+    private String updateNm;
+
+
+    public String getDepName()
+    {
+        return depName;
+    }
+
+    public void setDepName(String depName)
+    {
+        this.depName = depName;
+    }
+
+    @NotBlank(message = "岗位编码不能为空")
+    public String getRegName()
+    {
+        return regName;
+    }
+
+    public void setRegName(String postCode)
+    {
+        this.regName = postCode;
+    }
+
+    @NotBlank(message = "岗位名称不能为空")
+    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
+    public String getBaseCode()
+    {
+        return baseCode;
+    }
+
+    public void setBaseCode(String baseCode)
+    {
+        this.baseCode = baseCode;
+    }
+
+    @NotNull(message = "显示顺序不能为空")
+    public String getBaseName()
+    {
+        return baseName;
+    }
+
+    public void setBaseName(String baseName)
+    {
+        this.baseName = baseName;
+    }
+
+    public Integer getShipNumber()
+    {
+        return shipNumber;
+    }
+
+    public void setShipNumber(Integer shipNumber)
+    {
+        this.shipNumber = shipNumber;
+    }
+
+    public Integer getLinkCap()
+    {
+        return linkCap;
+    }
+
+    public void setLinkCap(Integer linkCap)
+    {
+        this.linkCap = linkCap;
+    }
+
+    public Integer getFixedCap()
+    {
+        return fixedCap;
+    }
+
+    public void setgetFixedCap(Integer fixedCap)
+    {
+        this.fixedCap = fixedCap;
+    }
+
+    public Integer getSorterNum()
+    {
+        return sorterNum;
+    }
+
+    public void setSorterNum(Integer sorterNum)
+    {
+        this.sorterNum = sorterNum;
+    }
+
+    public Integer getRejectNum()
+    {
+        return rejectNum;
+    }
+
+    public void setRejectNum(Integer rejectNum)
+    {
+        this.rejectNum = rejectNum;
+    }
+
+    public Integer getSbsNum()
+    {
+        return sbsNum;
+    }
+
+    public void setSbsNum(Integer sbsNum)
+    {
+        this.sbsNum = sbsNum;
+    }
+
+    public Integer getResultNum()
+    {
+        return resultNum;
+    }
+
+    public void setResultNum(Integer resultNum)
+    {
+        this.resultNum = resultNum;
+    }
+
+    public String getUpdateNm()
+    {
+        return updateNm;
+    }
+
+    public void setUpdateNm(String updateNm)
+    {
+        this.updateNm = updateNm;
+    }
+
+    public Date getDateTm()
+    {
+        return dateTm;
+    }
+
+    public void setDateTm(Date dateTm)
+    {
+        this.dateTm = dateTm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("depName", getDepName())
+                .append("regName", getRegName())
+                .append("baseCode", getBaseCode())
+                .append("baseName", getBaseName())
+                .append("shipNumber", getShipNumber())
+                .append("linkCap", getLinkCap())
+                .append("fixedCap", getFixedCap())
+                .append("fixedCap", getSorterNum())
+                .append("rejectNum", getRejectNum())
+                .append("sbsNum", getSbsNum())
+                .append("sbsNum", getResultNum())
+                .append("updateNm", getUpdateNm())
+                .append("dateTm", getDateTm())
+                .toString();
+    }
+}

+ 13 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java

@@ -0,0 +1,13 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysOrder;
+
+import java.util.List;
+
+public interface SysOrderMapper {
+    public List<SysOrder> selectOrderAll();
+
+    public List<SysOrder> selectOrderDate(SysOrder order);
+
+    public int updatedashBoard(SysOrder order);
+}

+ 28 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java

@@ -0,0 +1,28 @@
+package com.ruoyi.system.service;
+
+//import com.ruoyi.system.domain.SysInvoice;
+import com.ruoyi.system.domain.SysOrder;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 角色业务层
+ *
+ * @author ruoyi
+ */
+public interface ISysOrderService
+{
+
+    /**
+     * 查询所有角色
+     *
+     * @return 角色列表
+     */
+    public List<SysOrder> selectOrderAll();
+
+    public List<SysOrder> selectOrderDate(SysOrder order);
+
+    public int updatedashBoard(SysOrder order);
+
+}

+ 47 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java

@@ -0,0 +1,47 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.SysOrder;
+import com.ruoyi.system.mapper.SysOrderMapper;
+import com.ruoyi.system.service.ISysOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 岗位信息 服务层处理
+ *
+ * @author ruoyi
+ */
+@Service
+public class SysOrderServiceImpl implements ISysOrderService
+{
+
+    @Autowired
+    private SysOrderMapper orderMapper;
+
+    /**
+     * 查询所有岗位
+     *
+     * @return 岗位列表
+     */
+    @Override
+    public List<SysOrder> selectOrderAll()
+    {
+        return orderMapper.selectOrderAll();
+    }
+
+    @Override
+    public List<SysOrder> selectOrderDate(SysOrder order)
+    {
+        return orderMapper.selectOrderDate(order);
+    }
+
+    @Override
+    public int updatedashBoard(SysOrder order)
+    {
+        return orderMapper.updatedashBoard(order);
+    }
+
+}
+