parent: dcc79955 | 补丁 | 提交 | ignore whitespace
zhangyong
2024-11-26 31a6849672a6ccac2289fc3bd8fbacdd13c99634 
Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
15个文件已修改
312 ■■■■■ 已修改文件
UI-Project/index.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/App.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/zh.js 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Returns/upreturns.vue 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Returns/upreturns2.vue 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 UI-Project/index.html


@@ -7,7 +7,7 @@


    <title>北玻</title>


  </head>


  <body>


    <div id="app"></div>


    <div id="app" style="width: 100vw;height: 100vh;"></div>


    <script type="module" src="/src/main.js"></script>


  </body>


</html>




 UI-Project/src/App.vue


@@ -6,17 +6,17 @@


import DevicePixelRatio from '@/utils/evicePixelRatio.js';




// 定义一个函数来调整 body 的缩放比例


function bodyScale() {


  const deviceheight = document.documentElement.clientHeight;


  const scale = deviceheight / 740;


  document.body.style.zoom = scale;


}


// function bodyScale() {


//   const deviceheight = document.documentElement.clientHeight;


//   const scale = deviceheight / 740;


//   document.body.style.zoom = scale;


// }




// 在组件挂载时执行


onMounted(() => {


  new DevicePixelRatio().init();


  bodyScale();


});


// onMounted(() => {


//   new DevicePixelRatio().init();


//   bodyScale();


// });


</script>


<style scoped>


/* 你的样式内容 */




 UI-Project/src/lang/zh.js


@@ -634,6 +634,7 @@


          createtime: '创建时间',


          all: '全选',


          removalmethod: '请选择除膜方式',


          removalmethodp: '除膜方式',


          removalmethoda: '除膜方式：',


          noremoval: '不除膜',


          coarselyground: '粗磨',




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


@@ -67,7 +67,7 @@


const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;


const handleMessage = (data: any) => {


  tableDataa.value = data.list[0].slice(0, 2);


  tableDatab.value = data.list[0].slice(2, 4);


  // tableDatab.value = data.list[0].slice(2, 4);


};


onBeforeUnmount(() => {


  closeWebSocket();


@@ -96,7 +96,8 @@


    const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {


      stationCell: 5,


      engineerId: selectedProjectNo.value,


      filmRemove: filmRemove.value,


      // filmRemove: filmRemove.value,


      filmRemove: parseInt(filmRemove.value, 10),


    })


    window.localStorage.setItem('engineeringId', selectedProjectNo.value)


    window.localStorage.setItem('filmRemove', filmRemove.value)


@@ -121,8 +122,8 @@


  let engineeringId = window.localStorage.getItem('engineeringId')


  if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {


    try {


      const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {


        // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {


      // const response = await request.post('/loadGlass/engineering/engineering/pause', {


      const response = await request.post('/loadGlass/engineering/engineering/changeTask', {


        stationCell: 5,


        filmRemove: filmRemove,


        engineerId: engineeringId,


@@ -145,11 +146,13 @@


// 暂停


const handleup = async () => {


  try {


    let filmRemove = window.localStorage.getItem('filmRemove')


    let engineeringId = window.localStorage.getItem('engineeringId')


    console.log(engineeringId);


    if (engineeringId !== '') {


      const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {


      const response = await request.post('/loadGlass/engineering/engineering/pause', {


        stationCell: 5,


        filmRemove: filmRemove,


        engineerId: engineeringId,


        state: 0,


      })


@@ -236,6 +239,28 @@


    ElMessage.error(t('basicData.glassnull'));


  }


};




function getStatusType2(filmRemove) {


  switch (filmRemove) {


    case 0:


      return 'success';


    case 1:


      return 'info';


    case 2:


      return 'warning';


  }


}




function getStatusText2(filmRemove) {


  switch (filmRemove) {


    case 0:


      return t('Mounting.noremoval');//完成


    case 1:


      return t('Mounting.coarselyground');//新建


    case 2:


      return t('Mounting.finegrinding');//执行中


  }


}


</script>


<template>


  <div style="height: 500px;">


@@ -278,47 +303,59 @@


    <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>


    <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">


      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">


    <el-table


    height="350"


     ref="table" 


     :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"


      :data="tableData"


    >


      <el-table-column prop="layoutSequence" :label="$t('Mounting.project')" width="100" align="center"/>


      <el-table-column prop="engineeringId" :label="$t('Mounting.width')" width="200" align="center"/>


      <el-table-column prop="width" :label="$t('Mounting.height')" align="center"/>


      <el-table-column prop="height" :label="$t('Mounting.thickness')" align="center"/>


      <el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>


      <el-table-column :label="$t('Mounting.projectnumber')" align="center">  


      <template #default="{ row }">  


        <!-- 这里总是显示 1 -->  


        <span>{{ 1 }}</span>  


      </template>  


    </el-table-column>  


      <el-table-column


          align="center"


            :label="$t('Mounting.state')"


        <el-table


            height="350"


            ref="table"


            :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"


            :data="tableData"


        >


          <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center"/>


          <el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center"/>


          <el-table-column prop="height" :label="$t('Mounting.height')" align="center"/>


          <el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center"/>


          <el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>


          <el-table-column :label="$t('Mounting.projectnumber')" align="center">


            <template #default="{ row }">


              <!-- 这里总是显示 1 -->


              <span>{{ 1 }}</span>


            </template>


          </el-table-column>


          <el-table-column


              align="center"


              :label="$t('Mounting.state')"


            min-width="80"


            prop="state"


          >


          <template #default="scope">  


          <el-tag  


            :type="scope.row.state === 100 ? 'success' : 'warning'"  


            @click="toggleEnableState(scope.row)"  


          >  


            {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}


          </el-tag>  


        </template> 


          </el-table-column>


      <el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>


    </el-table>


          <template #default="scope">


            <el-tag


                :type="scope.row.state === 100 ? 'success' : 'warning'"


                @click="toggleEnableState(scope.row)"


            >


              {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}


            </el-tag>


          </template>


      </el-table-column>


          <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->


          <!-- <el-table-column


              align="center"


              :label="$t('Mounting.removalmethodp')"


              prop="filmRemove"


          >


            <template #default="scope">


              <el-tag :type="getStatusType2(scope.row.filmRemove)">


                {{ getStatusText2(scope.row.filmRemove) }}


              </el-tag>


            </template>


          </el-table-column> -->


          <!-- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/> -->


        </el-table>


      </div>


    </el-card>


    <div style="display: flex;">


      <div style="width: 49%;float: left;margin-left: 300px;">


        <div style="display: flex;">


          <img src="../../assets/shangpianji.png" alt=""


               style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">


               style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">


          <el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"


                    :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"


          >




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


@@ -66,8 +66,8 @@


let socket = null;


const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;


const handleMessage = (data: any) => {


  tableDataa.value = data.list[0].slice(0, 2);


  tableDatab.value = data.list[0].slice(2, 4);


  // tableDataa.value = data.list[0].slice(0, 2);


  tableDataa.value = data.list[0].slice(2, 4);


};


onBeforeUnmount(() => {


  closeWebSocket();


@@ -96,7 +96,8 @@


    const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {


      stationCell: 6,


      engineerId: selectedProjectNo.value,


      filmRemove: filmRemove.value,


      // filmRemove: filmRemove.value,


      filmRemove: parseInt(filmRemove.value, 10),


    })


    window.localStorage.setItem('engineeringId', selectedProjectNo.value)


    window.localStorage.setItem('filmRemove', filmRemove.value)


@@ -121,10 +122,10 @@


  let engineeringId = window.localStorage.getItem('engineeringId')


  if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {


    try {


      const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {


      const response = await request.post('/loadGlass/engineering/engineering/pause', {


        // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {


        stationCell: 6,


        filmRemove: filmRemove,


        // stationCell: 6,


        // filmRemove: filmRemove,


        engineerId: engineeringId,


        state: 1,


      })


@@ -148,8 +149,8 @@


    let engineeringId = window.localStorage.getItem('engineeringId')


    console.log(engineeringId);


    if (engineeringId !== '') {


      const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {


        stationCell: 6,


      const response = await request.post('/loadGlass/engineering/engineering/pause', {


        // stationCell: 6,


        engineerId: engineeringId,


        state: 0,


      })


@@ -236,6 +237,28 @@


    ElMessage.error(t('basicData.glassnull'));


  }


};




function getStatusType2(filmRemove) {


  switch (filmRemove) {


    case 0:


      return 'success';


    case 1:


      return 'info';


    case 2:


      return 'warning';


  }


}




function getStatusText2(filmRemove) {


  switch (filmRemove) {


    case 0:


      return t('Mounting.noremoval');//完成


    case 1:


      return t('Mounting.coarselyground');//新建


    case 2:


      return t('Mounting.finegrinding');//执行中


  }


}


</script>


<template>


  <div style="height: 500px;">


@@ -301,16 +324,29 @@


            min-width="80"


            prop="state"


          >


          <template #default="scope">  


          <el-tag  


            :type="scope.row.state === 100 ? 'success' : 'warning'"  


            @click="toggleEnableState(scope.row)"  


          >  


            {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}


          </el-tag>  


        </template> 


          </el-table-column>


          <template #default="scope">


            <el-tag


                :type="scope.row.state === 100 ? 'success' : 'warning'"


                @click="toggleEnableState(scope.row)"


            >


              {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}


            </el-tag>


          </template>


      </el-table-column>


      <el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>


      <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->


      <el-table-column


          align="center"


          :label="$t('Mounting.removalmethodp')"


          prop="filmRemove"


      >


        <template #default="scope">


          <el-tag :type="getStatusType2(scope.row.filmRemove)">


            {{ getStatusText2(scope.row.filmRemove) }}


          </el-tag>


        </template>


      </el-table-column>


      <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/>


    </el-table>


      </div>


    </el-card>


@@ -318,7 +354,7 @@


      <div style="width: 49%;float: left;margin-left: 300px;">


        <div style="display: flex;">


          <img src="../../assets/shangpianji.png" alt=""


               style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">


               style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">


          <el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"


                    :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"


          >


@@ -328,8 +364,8 @@


            <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>


            <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>


          </el-table>


        </div>


      </div>


    </div>


  </div>


      <!-- <div style="width: 48%;float: right;">


        <div style="display: flex;">


          <img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">


@@ -398,7 +434,7 @@


      </div>


    </template>


  </el-dialog>


    </div>


        </div>


  <el-dialog v-model="dialogFormVisible" top="24vh" width="70%">


    <div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">


      <el-form-item :label="$t('Mounting.loadingline')" :required="true">




 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java


@@ -189,6 +189,15 @@


     */


    private Date updateTime;




//    /**


//     * 除膜方式


//     */


//    private Integer filmRemove;


//


//    /**


//     * 设备


//     */


//    private Integer stationCell;


    /**


     * 预留，使用需注明


     */




 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java


@@ -62,5 +62,14 @@


     */


    private Integer state;




//    /**


//     * 除膜方式


//     */


//    private Integer filmRemove;


//


//    /**


//     * 设备


//     */


//    private Integer stationCell;




}




 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java


@@ -54,11 +54,11 @@


    @ResponseBody


    public  Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {


        boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());


        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;


//        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;


        if(work){


            return Result.build(200,"成功",glass);


            return Result.build(200, "成功", null);


        }else {


            return Result.build(100,"成功",glass);


            return Result.build(100, "成功", null);


        }


    }




@@ -69,7 +69,7 @@


        log.info("engineeringId:{}", engineering);


        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());


        if (upPattenUsage != null) {


            boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState(), engineering.getFilmRemove(), engineering.getStationCell());


            boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());


            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();


            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);


            return Result.build(200, "已保存过", work);


@@ -85,7 +85,7 @@


            engineeringService.saveEngineering(listEngineering);


            log.info("更改pp表状态为已领取");


            //将engineering表状态为正在上片


            boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState(), engineering.getFilmRemove(), engineering.getStationCell());


            boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());


            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();


            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);


            if (work) {




 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java


@@ -107,5 +107,4 @@


     */


    private String notes;






}




 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java


@@ -98,7 +98,8 @@


    public Engineering selectInitiate(Integer state) {


        //查询是否有开始上片的工程任务


        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();


        wrapper.eq("state", state);


        wrapper.eq("state", state)


                .last("limit 1");


        return engineeringMapper.selectOne(wrapper);


    }




@@ -119,14 +120,10 @@


    public boolean pauseTask(String engineerId, Integer state) {


        //暂停正在进行工程


        LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());


        pauseWrapper.set(Engineering::getState, 0);


        pauseWrapper.eq(Engineering::getState, 1);


        pauseWrapper.set(Engineering::getState, state);


        pauseWrapper.eq(Engineering::getEngineerId, engineerId);


        return pauseWrapper.update();


    }




    @Override


    public boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell) {


        return false;


    }




}




 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java


@@ -50,17 +50,19 @@


    @PostMapping("/selectUpPattenUsage") //查询现在上片机的玻璃信息


    @ResponseBody


    public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {


        List<UpPattenUsage> upPattenUsages=null;


        List<UpPattenUsage> upPattenUsages = null;


        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());


        if(upPattenUsage == null){


        if (upPattenUsage == null) {


//            return Result.build(200, "失败无数据", null);


//            upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());


            upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());


        }else {


            upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);


        } else {


            upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage);


        }




        if (!upPattenUsages.isEmpty()) {


            return Result.build(200, "成功", upPattenUsages);


        }else {


        } else {


            return Result.build(100, "失败", upPattenUsages);


        }






 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java


@@ -38,13 +38,17 @@


      * 更新上片表状态


      */


     void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state);




     /**


      * 判断此工程是否已保存过


      *


      * @return UpPattenUsage


      */


     UpPattenUsage selectedEngineering(String engineeringId);


     UpPattenUsage selectedTaskEngineering(String engineeringId);




     /**


      * 查询正在执行的上片任务


      *


      * @return UpPattenUsage


      */


     UpPattenUsage selectOverTask();


@@ -56,10 +60,17 @@




     /**


      * 更改上片玻璃状态


      *


      * @return UpPattenUsage


      */


     Boolean updateGlassState(UpPattenUsage upPattenUsage);




     List<Engineering> setRawGlassTaskRequest(Engineering request);




//     List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);




//     UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell);




     UpPattenUsage selectedEngineering(String engineerId);


}






 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java


@@ -56,7 +56,10 @@


    @Override


    public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {


        LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();


        wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId());


        wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId());


//                .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())


//                .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());




        return this.list(wrapper);


    }




@@ -104,16 +107,25 @@


    @Override


    public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {


        upPattenUsage.setState(state);


        boolean updateSuccess=this.updateById(upPattenUsage);


        log.info("更新状态{}",updateSuccess);


        boolean updateSuccess = this.updateById(upPattenUsage);


        log.info("更新状态{}", updateSuccess);


        //更新状态


    }




    @Override


    public UpPattenUsage selectedEngineering(String engineeringId) {


        QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();


        wrapper.eq("engineering_id",engineeringId)


    public UpPattenUsage selectedTaskEngineering(String engineeringId) {


        return null;


    }




    @Override


    public UpPattenUsage selectedEngineering(String engineerId) {


        QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();


        wrapper.eq("engineering_id", engineerId)


//                .eq("station_cell", stationCell)


//                .eq("film_remove", filmRemove)


                .last("limit 1");


        log.info("查询预览参数");


        log.info("查询预览参数{}", this.getOne(wrapper));


        return this.getOne(wrapper);


    }






 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml


@@ -5,7 +5,7 @@


      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.


      datasource:


        hangzhoumes:


          url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8&allowMultiQueries=true


          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




 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml


@@ -2,7 +2,7 @@


  port: 8083


spring:


  profiles:


    active: yw


    active: dev


  application:


    name: loadGlass


  liquibase:


@@ -13,11 +13,4 @@


    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl


kangaroohy:


  milo:


    enabled: false


    primary: default


    config:


      default:


        endpoint: opc.tcp://192.168.0.39:49320


        security-policy: basic256sha256


        username: admin


        password: 1qaz2wsx3edc4rfv


    enabled: false