#

Junjie

2024-12-23 15f34a34c9588bc7b46dce8ee217e274adee38fa

#

 pom.xml

@@ -44,7 +44,7 @@
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
            <version>${mysql-driver.version}</version>
            <version>5.1.46</version>
        </dependency>
        <dependency>
            <groupId>com.microsoft.sqlserver</groupId>

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -347,48 +347,6 @@
    }

    /**
     * 获取PLC2数据
     */
    @GetMapping("/plc2/auth")
    @ManagerAuth
    public R getMapFromPlc2() {
        try {
            String mapFilename = "plc2.json";
            String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//获取文件路径
            File file = new File(fileName);
            StringBuffer stringBuffer = new StringBuffer();
            if (file.isFile() && file.exists()) {
                InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
                BufferedReader br = new BufferedReader(isr);
                String lineTxt = null;
                while ((lineTxt = br.readLine()) != null) {
                    stringBuffer.append(lineTxt);
                }
                br.close();
            }

            //解析json地图数据
            ArrayList arrayList = JSON.parseObject(stringBuffer.toString(), ArrayList.class);
            List<List<MapNode>> lists = new ArrayList<>();
            //重建数据格式
            for (int i = 0; i < arrayList.size(); i++) {
                Object obj = arrayList.get(i);
                List<MapNode> list = JSON.parseArray(obj.toString(), MapNode.class);
                for (int j = 0; j < list.size(); j++) {
                    MapNode mapNode = list.get(j);
                    list.set(j, mapNode);
                }
                lists.add(list);
            }
            return R.ok().add(lists);
        } catch (Exception e) {
            e.printStackTrace();
        }

        return R.error();
    }

    /**
     * 重置redis中的地图，将占用的库位全部解除
     */
    @GetMapping("/map/resetMap/auth")

 src/main/resources/application.yml

@@ -7,11 +7,13 @@
  application:
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.4.125:1433;databasename=tzskasrs
    username: sa
#    password: Zoneyung@zy56$
    password: sa@123
    hikari:
      validation-timeout: 3000
      connection-test-query: select 1
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://127.0.0.1:3306/wms_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: root
  mvc:
    static-path-pattern: /**
  redis:

 src/main/resources/map_10.json

File was deleted

 src/main/resources/map_4.json

File was deleted

 src/main/resources/map_5.json

File was deleted

 src/main/resources/map_6.json

File was deleted

 src/main/resources/map_7.json

File was deleted

 src/main/resources/map_8.json

File was deleted

 src/main/resources/map_9.json

File was deleted

 src/main/resources/plc2.json

File was deleted