From 585f330c22a4c0006edef63949e01197ab955274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Fri, 13 Sep 2024 15:54:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E7=9C=8B=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jhgk/DmYdjh.java | 9 +-- .../controller/kban/KbanController.java | 65 +++++++++++++++++++ .../com/dsic/gj_erp/controller/kban/dto.java | 9 +++ .../controller/yuyin/YuyinController.java | 32 +++++++++ .../dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java | 11 ++++ .../dsic/gj_erp/service/zyjh/ZyjhService.java | 30 +++++++++ .../com/dsic/gj_erp/wsclient/Message.java | 16 ++++- .../gj_erp/wsclient/WebSocketService.java | 9 +-- .../gj_erp/wsclient/handler/HeartHandler.java | 1 + src/main/resources/application-ws.yml | 2 +- .../resources/mappers/jhgk/DmYdjhMapper.xml | 34 ++++++++++ 11 files changed, 208 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/kban/dto.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/yuyin/YuyinController.java diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index eb503de..b1e9139 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -380,12 +380,13 @@ public class DmYdjh implements Serializable { HXFK("52"), QGPG("61"), QGFK("62"), + //7预留其他工序 + + //坡口,曲面,打磨 + PK("81"), QM("82"),DM("83"), + WC("99")//完成 ; @Getter public String code; } - - public static void main(String[] args) { - - } } diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java new file mode 100644 index 0000000..eb3d562 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java @@ -0,0 +1,65 @@ +package com.dsic.gj_erp.controller.kban; + +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.service.zyjh.ZyjhService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("kban") +@AllArgsConstructor +public class KbanController { + + private final ZyjhService zyjhService; + + /** + * 各垮计划完成情况 + */ + @GetMapping("gxjhwcqk") + public ResultBean gxjhwcqk(){ + List> gxjhwcqk = zyjhService.gxjhwcqk(); + return new ResultBean<>(gxjhwcqk); + } + + /** + * 各月份产量(吨) + */ + @GetMapping("gyfcl") + public ResultBean gyfcl(){ + return new ResultBean<>(zyjhService.gyfcl()); + } + + /** + * 计划完成情况(吨) + */ + @GetMapping("jhwcqk") + public ResultBean jhwcqk(){ + return new ResultBean<>(zyjhService.jhwcqk()); + } + + /** + * 各垮产量 + */ + @GetMapping("gekuachaliang") + public ResultBean gekuachaliang(){ + return new ResultBean<>(zyjhService.gekuachaliang()); + } + + /** + * 考勤情况 + */ + @GetMapping("kq") + public ResultBean kq(){ + Map map=new HashMap<>(); + map.put("出勤",283); + map.put("请假",15); + map.put("缺勤",2); + return new ResultBean<>(map); + } +} diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/dto.java b/src/main/java/com/dsic/gj_erp/controller/kban/dto.java new file mode 100644 index 0000000..b17aeca --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/kban/dto.java @@ -0,0 +1,9 @@ +package com.dsic.gj_erp.controller.kban; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class dto { +} diff --git a/src/main/java/com/dsic/gj_erp/controller/yuyin/YuyinController.java b/src/main/java/com/dsic/gj_erp/controller/yuyin/YuyinController.java new file mode 100644 index 0000000..a3c04fc --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/yuyin/YuyinController.java @@ -0,0 +1,32 @@ +package com.dsic.gj_erp.controller.yuyin; + +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.wsclient.WebSocketClientComponent; +import com.dsic.gj_erp.wsclient.WebSocketService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.socket.WebSocketSession; + +@RestController +@RequestMapping("yuyin") +@RequiredArgsConstructor +public class YuyinController { + + private final WebSocketService socketService; + + private final WebSocketClientComponent clientComponent; + + /** + * 重连语音上报websocket服务器 + */ + @GetMapping("recon") + public ResultBean recon(){ + WebSocketSession session = socketService.getSession(); + if (session==null){ + clientComponent.init(); + } + return new ResultBean<>(); + } +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java index 112f245..f8173c1 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java @@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.pgd.*; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -36,4 +38,13 @@ public interface DmYdjhMapper extends BaseMapper { List getSljh1(@Param("begin") String begin, @Param("end") String end); List getPwjh1(@Param("begin") String begin, @Param("end") String end); List getQgjh1(@Param("begin") String begin, @Param("end") String end); + + @MapKey("kw") + Map gekuachaliang(String from,String to,String zt); + + List> jhwcqk(String from,String to); + + List> gyfcl(); + + List> gxjhwcqk(String from,String to); } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 58634a8..9def921 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -1,5 +1,7 @@ package com.dsic.gj_erp.service.zyjh; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,9 +10,37 @@ import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao; import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + @Service public class ZyjhService extends ServiceImpl { + public List> gxjhwcqk(){ + DateTime date = DateUtil.lastMonth(); + String from= DateUtil.beginOfMonth(date).toString("yyyy/MM/dd"); + String to =DateUtil.endOfMonth(date).toString("yyyy/MM/dd"); + return baseMapper.gxjhwcqk(from,to); + } + + public List> gyfcl(){ + return baseMapper.gyfcl(); + } + + public List> jhwcqk(){ + DateTime date = DateUtil.lastMonth(); + String from= DateUtil.beginOfMonth(date).toString("yyyy/MM/dd"); + String to =DateUtil.endOfMonth(date).toString("yyyy/MM/dd"); + return baseMapper.jhwcqk(from,to); + } + + public Map gekuachaliang(){ + DateTime date = DateUtil.lastMonth(); + String from= DateUtil.beginOfMonth(date).toString("yyyy/MM/dd"); + String to =DateUtil.endOfMonth(date).toString("yyyy/MM/dd"); + return baseMapper.gekuachaliang(from,to,"11"); + } + public void updateForSl(ShangLiao sl){ LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() .set(DmYdjh::getSlycldw, sl.getYdjh().getSlycldw()) diff --git a/src/main/java/com/dsic/gj_erp/wsclient/Message.java b/src/main/java/com/dsic/gj_erp/wsclient/Message.java index 0000627..9f5f84c 100644 --- a/src/main/java/com/dsic/gj_erp/wsclient/Message.java +++ b/src/main/java/com/dsic/gj_erp/wsclient/Message.java @@ -17,6 +17,13 @@ public class Message { @JSONField(serialize = false) private Instructions instructions; + public CodeEnum getCodeEx(){ + if (this.codeEx==null){ + this.formatCodeToEnum(); + } + return this.codeEx; + } + public static Message reg(String id){ Message message = new Message(); message.setCode(CodeEnum.REG.getCode()); @@ -46,6 +53,10 @@ public class Message { } } + public void formatCodeToEnum(){ + this.formatCodeToEnum(this.code); + } + public void formatCodeToEnum(@NonNull int code){ for (CodeEnum e:CodeEnum.values()){ if (e.getCode()==code){ @@ -60,7 +71,7 @@ public class Message { return e; } } - return null; + return CodeEnum.DEFAULT; } @Getter @@ -70,6 +81,9 @@ public class Message { ZX(3000), RESULT(9002), HEART(9003), + ERROR(3001), + TIP(3002), + DEFAULT(0) ; private final int code; diff --git a/src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java b/src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java index 375d287..e1fd638 100644 --- a/src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java +++ b/src/main/java/com/dsic/gj_erp/wsclient/WebSocketService.java @@ -1,6 +1,5 @@ package com.dsic.gj_erp.wsclient; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.dsic.gj_erp.wsclient.handler.ZxHandler; import lombok.RequiredArgsConstructor; @@ -50,7 +49,7 @@ public class WebSocketService extends TextWebSocketHandler { @Override protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { - System.out.println("Received: " + message.getPayload()); + log.info("语音上报:{}",message.getPayload()); Message msg= JSONObject.parseObject(message.getPayload(),Message.class); switch (msg.getCodeEx()){ case REG: @@ -59,9 +58,11 @@ public class WebSocketService extends TextWebSocketHandler { case ZX: zxHandler.execute(msg); break; - - } } + public WebSocketSession getSession(){ + return this.session; + } + } diff --git a/src/main/java/com/dsic/gj_erp/wsclient/handler/HeartHandler.java b/src/main/java/com/dsic/gj_erp/wsclient/handler/HeartHandler.java index 42387ba..efbff54 100644 --- a/src/main/java/com/dsic/gj_erp/wsclient/handler/HeartHandler.java +++ b/src/main/java/com/dsic/gj_erp/wsclient/handler/HeartHandler.java @@ -23,6 +23,7 @@ public class HeartHandler implements IHandlerService{ } CronUtil.schedule("*/30 * * * * *", (Task) () -> { try { + System.out.println("心跳"); webSocketService.sendMessage(message.toString()); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/resources/application-ws.yml b/src/main/resources/application-ws.yml index e7f3638..2e17433 100644 --- a/src/main/resources/application-ws.yml +++ b/src/main/resources/application-ws.yml @@ -9,5 +9,5 @@ ws: maxHttpContentLength: 1048576 maxFramePayloadLength: 1048576 client: - url: ws://127.0.0.1:9000 + url: ws://192.168.13.9:9000 id: abc \ No newline at end of file diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 320e58b..8e70fd0 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -1,3 +1,4 @@ + @@ -74,6 +75,38 @@ + + + + + + + + + update pgd_tzjh set zt='01'