更新

严智鑫

2024-04-09 12d798d734a23a32519d5942dc2addff595304c4

更新

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

@@ -1,7 +1,7 @@
package com.mes;

import com.mes.common.PlcTools.S7object;
import com.mes.mapper.SelectInfo;
import com.mes.mapper.PpMapper;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;

 CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java

@@ -1,6 +1,6 @@
package com.mes.controller;

import com.mes.mapper.SelectInfo;
import com.mes.mapper.PpMapper;

import java.util.List;
import java.util.Map;
@@ -9,7 +9,7 @@
import org.springframework.web.bind.annotation.*;
import com.mes.common.Result;
import com.mes.entity.Tempered;
import com.mes.service.pp.SelectdppService;
import com.mes.service.pp.PpService;
import com.mes.service.hangzhoumes.*;

@RestController
@@ -20,37 +20,50 @@


    @Autowired
    private SelectdppService SelectppService;
    private PpService ppService;

    @Autowired
    private hangzhoumesService hangzhoumesService;
    private HangzhoumesService hangzhoumesService;

    @GetMapping("/SelectTerritoryInfo") // 查询钢化版图信息-根据 工程号
    @ResponseBody
    public Result SelectTerritoryInfo(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
        List<Tempered> h = SelectppService.SelectTemperedTerritory(ProcessId);
        List<Tempered> h = ppService.selectTemperedTerritory(ProcessId);
        return Result.seccess(h);
    }

    @GetMapping("/CutTerritory") // 查询切割版图信息-根据 工程号
    @ResponseBody
    public Result CutTerritory(String ProcessId) {
        List<Map> h = SelectppService.SelectCutTerritory(ProcessId);
        List<Map> h = ppService.selectCutTerritory(ProcessId);
        return Result.seccess(h);
    }

    @GetMapping("/SelectCutTerritory") // 识别显示  当前版图 
    @GetMapping("/CurrentCutTerritory") // 识别显示  当前版图 
    @ResponseBody
    public Result SelectCutTerritory(String ProcessId) {
        List<Map> h = SelectppService.SelectCutTerritory("P24032508");
    public Result CurrentCutTerritory() {
        List<Map> h = ppService.selectCutTerritory();
        return Result.seccess(h);
    }

    @GetMapping("/SelectCutTerritory") // 识别显示  特定版图 
    @ResponseBody
    public Result SelectCutTerritory(String TerritoryId) {
        List<Map> h = ppService.selectCutTerritory(TerritoryId);
        return Result.seccess(h);
    }

    @GetMapping("/IdentControls") //   识别操作：   破损/拿走     参数（ID，功能[0:破损，1：拿走]）
    @ResponseBody
    public Result Ident(@RequestParam(name = "IdentId", required = false) String ProcessId,@RequestParam(name = "ControlsId", required = false) String ControlsId) {
        List<Map> h = ppService.selectCutTerritory("P24032508");
        return Result.seccess(h);
    }

    @GetMapping("/SelectCageInfo") // 查询笼内信息 
    @ResponseBody
    public Result SelectCageInfo(String ProcessId) {
        List<Map> h = SelectppService.SelectCutTerritory("P24032508");
        List<Map> h = hangzhoumesService.SelectCageInfo();
        return Result.seccess(h);
    }


 CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/Logic.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java

@@ -4,7 +4,8 @@
import com.mes.entity.EdgStorageCageDetails;
import com.mes.entity.GlassInfo;
import com.mes.entity.Tempered;
import com.mes.mapper.SelectInfo;
import com.mes.mapper.HangzhouMesMapper;
import com.mes.mapper.PpMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -12,30 +13,25 @@
import java.util.Map;

@Service
@DS("hangzhoumes")
public class hangzhoumesService {
public class HangzhoumesService {

    @Autowired
    private SelectInfo SelectInfo;

    private HangzhouMesMapper hangzhouMesMapper;
    //根据编号 查找玻璃小片信息
    public GlassInfo getUserInfo(String process_id){
        return SelectInfo.SelectGlassId(process_id);
        return hangzhouMesMapper.selectGlassId(process_id);
    }
    // //识别信息
    // public List<Map> SelectCutTerritory(String process_id){
    //     return SelectInfo.SelectCutTerritory(process_id);
    // }

    //理片缓存 笼内信息
    public List<EdgStorageCageDetails> SelectCageInfo(){
        return SelectInfo.SelectCachInfo();
    public List<Map> SelectCageInfo(){
        return hangzhouMesMapper.selectCachInfo();
    }

    //磨边小片信息
    public List<Map> SelectEdgInfo(String line){

        return SelectInfo.SelectEdgInfo(line);
        return hangzhouMesMapper.selectEdgInfo(line);
    }

    
}


 CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java

File was deleted

 TemperingGlassModule/target/classes/application.yml

@@ -2,31 +2,17 @@
server:
  port: 8080
  servlet:
   context-path: /mesModuleTools
    context-path: /mesModuleTools

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
          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

        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