接口

wang

2024-04-15 a3a40ee1800c25e280945e5ecbff7fed4b4cde2c

接口

 LoadGlassModule/src/main/java/com/mes/MesApplication.java

@@ -3,7 +3,7 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.transaction.annotation.Transactional;


//springboot 启动入口
@SpringBootApplication

 LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java

@@ -4,11 +4,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.mes.common.Result;
import com.mes.entity.Tempering;
import com.mes.entity.UpWorkstation;
import com.mes.service.LoadGlassService;
import com.mes.service.TemperingOverService;
import com.mes.service.TemperingService;


@RestController

 LoadGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java

File was deleted

 LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java

File was deleted

 LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java

File was deleted

 LoadGlassModule/src/main/java/com/mes/entity/Engineering.java

File was deleted

 LoadGlassModule/src/main/java/com/mes/entity/GlassFilms.java

File was deleted

 LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java

@@ -2,11 +2,15 @@

import com.mes.entity.userInfo.SysMenuItem;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

import java.util.List;

@Mapper
public interface SysMenuItemMapper {

     @Select("select * from `sys_menu_item` as a where a.state=1 order by a.menuId,a.listSort;")


     List<SysMenuItem> findAll() ;
}

 LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java

@@ -16,7 +16,9 @@

    User findOne(Integer id);

    @Select("select user_name FROM `user` where login_name=#{LoginName}  ")
    User findOneLoginName(String LoginName);

    @Select("select count(id) FROM `user` where login_name=#{userName} and password=#{password}  ")
    int  checkUser(@Param("userName") String userName,@Param("password") String password);


 LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java

@@ -1,21 +1,17 @@
package com.mes.service;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mes.entity.device.PLCAutoMes;
import com.mes.common.PlcTools.S7control;
import com.mes.entity.device.PlcParameterObject;
import com.google.common.primitives.Bytes;
import com.mes.entity.GlassInfo;

import com.mes.entity.UpWorkstation;
import com.mes.mapper.LoadGlassMapper;

@Service
public class LoadGlassService {
    @Autowired
    private com.mes.common.PlcTools.S7control s7control;
    
    private S7control s7control;
    private LoadGlassMapper LoadGlassMapper;
    PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
    //显示工位上的玻璃信息
@@ -25,7 +21,7 @@
    }
    //增加人工输入的工位玻璃信息
    public void insertGlass(UpWorkstation upwork) { 
        LoadGlassMapper.insertGlass(upwork.getPatternwidth(),upwork.getPatternheigth(),upwork.getPatternthickness(),upwork.getWorkstationid());
        LoadGlassMapper.insertGlass(upwork);
    }  
    //删除人工搬走的玻璃信息
    public void deleteGlass(int id) {
@@ -50,8 +46,8 @@
            s7control.WriteWord("DB100.10", (short)2);
        }else if(loadid1==loadid2){
            //当两个工位上的玻璃数相同时，判断哪个工位上的玻璃数更少,优先清空一个架子
            int glassnum1=plcmes.getPlcParameter("玻璃数").getValue();
            int glassnum2=plcmes.getPlcParameter("玻璃数").getValue();
            int glassnum1=Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue());
            int glassnum2=Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue());
            if(glassnum1>glassnum2){
                s7control.WriteWord("DB100.10", (short)2);
            }else{

 LoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java

@@ -7,7 +7,7 @@
import org.springframework.stereotype.Service;

@Service
@DS("user_info")
@DS("hangzhoumes")
public class SysErrorService {
    private final SysErrorMapper sysErrorMapper;


 LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java

@@ -9,7 +9,7 @@
import java.util.List;

@Service
@DS("user_info")
@DS("hangzhoumes")
public class SysMenuItemService {
    @Autowired
    SysMenuItemMapper sysMenuItemMapper;

 LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java

@@ -9,7 +9,7 @@
import java.util.List;

@Service
@DS("user_info")
@DS("hangzhoumes")
public class SysMenuService {
    @Autowired
    private SysMenuMapper sysMenuMapper;

 LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java

@@ -18,7 +18,7 @@
import java.util.List;

@Service
@DS("user_info")
@DS("hangzhoumes")
public class UserService {

    @Autowired

 LoadGlassModule/src/main/resources/application.yml

@@ -7,26 +7,11 @@
spring:
  datasource:
    dynamic:
      primary: user_info #设置默认的数据源或者数据源组,默认值即为master
      primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        user_info:
          url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
        hangzhoumes:
          url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        mm:
          url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        pp:
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

 LoadGlassModule/target/classes/application.yml

@@ -7,26 +7,11 @@
spring:
  datasource:
    dynamic:
      primary: user_info #设置默认的数据源或者数据源组,默认值即为master
      primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        user_info:
          url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
        hangzhoumes:
          url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        mm:
          url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        pp:
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

 UI-Project/package-lock.json

@@ -10,7 +10,7 @@
      "dependencies": {
        "@element-plus/icons-vue": "^2.1.0",
        "@vue-macros/reactivity-transform": "^0.3.23",
        "axios": "^1.5.1",
        "axios": "^1.6.8",
        "element-plus": "^2.4.0",
        "moment": "^2.30.1",
        "pinia": "^2.1.6",
@@ -877,11 +877,11 @@
      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
    },
    "node_modules/axios": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
      "version": "1.6.8",
      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.6.8.tgz",
      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
      "dependencies": {
        "follow-redirects": "^1.15.0",
        "follow-redirects": "^1.15.6",
        "form-data": "^4.0.0",
        "proxy-from-env": "^1.1.0"
      }
@@ -1103,15 +1103,9 @@
      }
    },
    "node_modules/follow-redirects": {
      "version": "1.15.3",
      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
      "funding": [
        {
          "type": "individual",
          "url": "https://github.com/sponsors/RubenVerborgh"
        }
      ],
      "version": "1.15.6",
      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz",
      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
      "engines": {
        "node": ">=4.0"
      },
@@ -2272,11 +2266,11 @@
      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
    },
    "axios": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
      "version": "1.6.8",
      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.6.8.tgz",
      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
      "requires": {
        "follow-redirects": "^1.15.0",
        "follow-redirects": "^1.15.6",
        "form-data": "^4.0.0",
        "proxy-from-env": "^1.1.0"
      }
@@ -2442,9 +2436,9 @@
      }
    },
    "follow-redirects": {
      "version": "1.15.3",
      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="
      "version": "1.15.6",
      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz",
      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
    },
    "form-data": {
      "version": "4.0.0",

 UI-Project/package.json

@@ -10,7 +10,7 @@
  "dependencies": {
    "@element-plus/icons-vue": "^2.1.0",
    "@vue-macros/reactivity-transform": "^0.3.23",
    "axios": "^1.5.1",
    "axios": "^1.6.8",
    "element-plus": "^2.4.0",
    "moment": "^2.30.1",
    "pinia": "^2.1.6",

 UI-Project/src/router/index.js

@@ -22,18 +22,18 @@
      children:[
        
        
        // {
        //   path: 'Temperedlayout',
        //   name: 'Temperedlayout',
        //   component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
        //   children:[
        //     {
        //      path: 'selectLayout',
        //       name: 'selectLayout',
        //       component: () => import('../views/TL/Temperedlayout/SelectLayout.vue'),
        //     }
        //  ]
        // },
        {
          path: 'Temperedlayout',
          name: 'Temperedlayout',
          component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
          children:[
            {
             path: 'selectLayout',
              name: 'selectLayout',
              component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
            }
         ]
        },
      
/*----------- 用户列表 ----------------*/
{

 UI-Project/src/utils/request.js

@@ -6,9 +6,9 @@
    baseURL: `http://${config.serverUrl}`,  // 注意！！ 这里是全局统一加上了 后端接口前缀 前缀，后端必须进行跨域配置！
    timeout: 5000
})

 
//

 
// request 拦截器
// 可以自请求发送前对请求做一些处理
// 比如统一加token，对请求参数统一加密
@@ -22,7 +22,7 @@
}, error => {
    return Promise.reject(error)
});

 
// response 拦截器
// 可以在接口响应后统一处理结果
request.interceptors.response.use(
@@ -43,7 +43,6 @@
        return Promise.reject(error)
    }
)


export default request

 
 
export default request

 UI-Project/src/views/Identify/identify.vue

@@ -59,6 +59,18 @@

<script>
import Swal from 'sweetalert2'
import request from "@/utils/request";


request.get("/TidyUpGlassModule/CurrentCutTerritory").then((res) => {
          if (res.code == 200) {
          console.log(res.data);
          } else {
          ElMessage.warning(res.msg)
          router.push("/login")
          }
          });

export default {
  data() {
    return {

 UI-Project/src/views/Returns/returns.vue

@@ -10,8 +10,28 @@
const dialogFormVisible = ref(false)
const add = ref(false)
const adda = ref(false)

const value = ref('')
import request from "@/utils/request"

request.post(`/LoadGlass/SelectAll`).then((res) => {
  console.log(555555555555);
 if (res.code == 200) {
  console.log(1111);
  // console.log(res.data);
 } else {
   ElMessage.warning(res.msg)
          router.push("/login")
 }
});

// request.get("/LoadGlass/SelectAll").then((res) => {
//           if (res.code == 200) {
//           console.log(res.data);
//           } else {
//           ElMessage.warning(res.msg)
//           router.push("/login")
//           }
//           });

interface User {
  id: string
@@ -404,6 +424,7 @@
}
#parent{
  position: relative;
  width: 1500px;
}
#overlay{
  position: absolute;

 UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue

@@ -60,7 +60,7 @@
    CanvaDraws(id,Datas,StoveCount) {
        //var StoveCount=43;//炉数
        var ArrangementMode='linefeed';//排布方式：linefeed(换行) /Wholeline  整行
        var RowMaxCount=4;//每行最多显示的图数
        var RowMaxCount=3;//每行最多显示的图数
        var StoveWidth=3000; //实际炉宽 2850
        var StoveLength=5500;//实际炉长 5000
        var StoveColor='#CFC8C5';//炉子背景颜色